summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-19 20:16:20 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-06-23 13:23:47 -0700
commit47a25e76409aec1ae29b983779addf39722377f6 (patch)
tree82deb74d751e703b1733962ef7bfcf9e1e7685a8 /res/layout
parent8b2655cfbb77ef696ad4cec0f8861889a2015917 (diff)
downloadpackages_apps_Settings-47a25e76409aec1ae29b983779addf39722377f6.zip
packages_apps_Settings-47a25e76409aec1ae29b983779addf39722377f6.tar.gz
packages_apps_Settings-47a25e76409aec1ae29b983779addf39722377f6.tar.bz2
Update Dashboard layout again
- follow UX spec - update also the Search Panels (suggestions / results) to follow the same specs See bug: #15384992 Setting Dashboard - padding updates Change-Id: I3d27a3b3d9779644f8ea123990a0c7bed8d4ba74
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/dashboard.xml7
-rw-r--r--res/layout/dashboard_category.xml7
-rw-r--r--res/layout/dashboard_tile.xml72
-rw-r--r--res/layout/search_panel.xml11
-rw-r--r--res/layout/search_panel_results_header.xml2
-rw-r--r--res/layout/search_panel_suggestions_header.xml2
-rw-r--r--res/layout/search_suggestion_item.xml2
-rw-r--r--res/layout/settings_main.xml5
8 files changed, 69 insertions, 39 deletions
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 7917c96..6c1ab8f 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -18,9 +18,6 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/dashboard_padding_start"
- android:paddingEnd="@dimen/dashboard_padding_end"
- android:paddingBottom="@dimen/dashboard_padding_bottom"
android:scrollbarStyle="outsideOverlay"
android:background="@color/dashboard_background_color">
@@ -28,6 +25,10 @@
android:id="@+id/dashboard_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="@dimen/dashboard_padding_start"
+ android:paddingEnd="@dimen/dashboard_padding_end"
+ android:paddingTop="@dimen/dashboard_padding_top"
+ android:paddingBottom="@dimen/dashboard_padding_bottom"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
/>
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index afa038b..0c4f9b6 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -18,12 +18,15 @@
android:id="@+id/category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="@android:color/white"
+ android:layout_marginBottom="8dip"
+ android:elevation="@dimen/dashboard_category_elevation">
<TextView android:id="@+id/category_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
- android:layout_marginStart="@dimen/dashboard_category_title_margin_start"
+ android:paddingStart="@dimen/dashboard_category_title_margin_start"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center_vertical"
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index a0049be..aa1d00e 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -17,7 +17,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height">
@@ -27,31 +27,49 @@
android:layout_height="@dimen/dashboard_tile_image_size"
android:scaleType="centerInside"
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
- android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
- />
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <TextView android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.TileTitle"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
-
- <TextView android:id="@+id/status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_alignStart="@android:id/title"
- android:textAppearance="@style/TextAppearance.Small"
- android:textColor="?android:attr/textColorSecondary"
- />
-
- </RelativeLayout>
+ android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:layout_weight="1">
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <View android:id="@+id/tile_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/dividerVertical" />
+
+ </LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index c892ff9..5e8d587 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -18,8 +18,8 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/search_results_padding_start"
- android:paddingEnd="@dimen/search_results_padding_end"
+ android:paddingStart="@dimen/search_panel_padding_start"
+ android:paddingEnd="@dimen/search_panel_padding_end"
android:background="@color/dashboard_background_color">
<LinearLayout android:layout_width="match_parent"
@@ -31,11 +31,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:elevation="@dimen/search_panel_elevation">
<ListView android:id="@+id/list_suggestions"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:headerDividersEnabled="false"
/>
</LinearLayout>
@@ -50,6 +53,8 @@
<ListView android:id="@+id/list_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:headerDividersEnabled="false"
/>
</LinearLayout>
diff --git a/res/layout/search_panel_results_header.xml b/res/layout/search_panel_results_header.xml
index 07f77a7..7b3f198 100644
--- a/res/layout/search_panel_results_header.xml
+++ b/res/layout/search_panel_results_header.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
diff --git a/res/layout/search_panel_suggestions_header.xml b/res/layout/search_panel_suggestions_header.xml
index 21500bc..d97c3cc 100644
--- a/res/layout/search_panel_suggestions_header.xml
+++ b/res/layout/search_panel_suggestions_header.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml
index 245b684..85a3381 100644
--- a/res/layout/search_suggestion_item.xml
+++ b/res/layout/search_suggestion_item.xml
@@ -28,7 +28,7 @@
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/search_title_padding_start"
+ android:layout_marginStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index ddbf2af..ea16d1c 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -32,7 +32,8 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
android:background="@drawable/switchbar_background"
- android:theme="@android:style/Theme.Material" />
+ android:theme="@android:style/Theme.Material"
+ />
<FrameLayout
android:id="@+id/prefs"
@@ -76,7 +77,9 @@
android:layout_margin="5dip"
android:text="@*android:string/next_button_label"
/>
+
</LinearLayout>
+
</RelativeLayout>
</LinearLayout>