diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/dashboard.xml | 29 | ||||
| -rw-r--r-- | res/layout/search_result_item.xml (renamed from res/layout/search_result.xml) | 0 | ||||
| -rw-r--r-- | res/layout/search_results.xml | 33 | ||||
| -rw-r--r-- | res/layout/settings_main.xml | 91 |
4 files changed, 78 insertions, 75 deletions
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml index 87bd973..8a29289 100644 --- a/res/layout/dashboard.xml +++ b/res/layout/dashboard.xml @@ -24,33 +24,10 @@ android:layout_gravity="center" android:orientation="vertical"> - <TextView android:id="@+id/dash_text" + <ListView android:id="@id/android:list" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/dashboard_wip" - android:padding="16dp" - android:layout_weight="0" - android:background="#ffcccccc" - android:textSize="16sp" - /> - - <EditText android:id="@+id/edittext_query" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/query_hint_text" - android:layout_weight="0"/> - - <FrameLayout android:id="@+id/dashboard" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <ListView android:id="@+id/list_results" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - - </FrameLayout> + android:layout_height="match_parent" + android:background="@color/background_drawer" /> </LinearLayout> diff --git a/res/layout/search_result.xml b/res/layout/search_result_item.xml index 6fa6d98..6fa6d98 100644 --- a/res/layout/search_result.xml +++ b/res/layout/search_result_item.xml diff --git a/res/layout/search_results.xml b/res/layout/search_results.xml new file mode 100644 index 0000000..a833404 --- /dev/null +++ b/res/layout/search_results.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/dashboard" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:orientation="vertical"> + + <ListView android:id="@+id/list_results" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + </LinearLayout> + +</FrameLayout> diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml index 8b98794..db732dc 100644 --- a/res/layout/settings_main.xml +++ b/res/layout/settings_main.xml @@ -17,65 +17,58 @@ */ --> -<android.support.v4.widget.DrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_height="match_parent" android:layout_width="match_parent"> - <android.preference.PreferenceFrameLayout android:id="@+id/prefs" - android:layout_width="match_parent" + <LinearLayout + android:orientation="vertical" android:layout_height="match_parent" - android:layout_weight="1" - /> + android:layout_width="match_parent"> - <RelativeLayout android:id="@+id/button_bar" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_weight="0" - android:visibility="gone"> + <android.preference.PreferenceFrameLayout + android:id="@+id/prefs" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + </LinearLayout> - <Button android:id="@+id/back_button" + <RelativeLayout android:id="@+id/button_bar" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_weight="0" + android:visibility="gone"> + + <Button android:id="@+id/back_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:layout_alignParentStart="true" + android:text="@*android:string/back_button_label" + /> + <LinearLayout + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true"> + + <Button android:id="@+id/skip_button" android:layout_width="150dip" android:layout_height="wrap_content" android:layout_margin="5dip" - android:layout_alignParentStart="true" - android:text="@*android:string/back_button_label" + android:text="@*android:string/skip_button_label" + android:visibility="gone" /> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true"> - - <Button android:id="@+id/skip_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:text="@*android:string/skip_button_label" - android:visibility="gone" - /> - <Button android:id="@+id/next_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:text="@*android:string/next_button_label" - /> - </LinearLayout> - </RelativeLayout> - - </LinearLayout> - - <ListView android:id="@+id/headers_drawer" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@color/background_drawer"/> + <Button android:id="@+id/next_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@*android:string/next_button_label" + /> + </LinearLayout> + </RelativeLayout> -</android.support.v4.widget.DrawerLayout> +</LinearLayout> |