summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-30 17:16:25 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-07-01 11:00:14 -0700
commite0284653b700652e30f0d2f4ec8449056a60c2d9 (patch)
tree15c96c71569568642972f597324b22e24bb75b48 /res/layout
parent5b3c3c00b0a280e29f3767878913f80274bd4993 (diff)
downloadpackages_apps_Settings-e0284653b700652e30f0d2f4ec8449056a60c2d9.zip
packages_apps_Settings-e0284653b700652e30f0d2f4ec8449056a60c2d9.tar.gz
packages_apps_Settings-e0284653b700652e30f0d2f4ec8449056a60c2d9.tar.bz2
Update Search Suggestions and Results Panel
- fix overdraw use as less backgrounds as possible - make it look like the Dashboard with padding left and right See bug: #15384992 Setting Dashboard - padding updates Change-Id: I30ff33e51bc3c73e888d45f0ce6e16784eb6721c
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/dashboard.xml3
-rw-r--r--res/layout/search_panel.xml26
-rw-r--r--res/layout/settings_main.xml1
3 files changed, 19 insertions, 11 deletions
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 391e3e2..c9be94d 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -19,8 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay"
- android:clipToPadding="false"
- android:background="@color/dashboard_background_color">
+ android:clipToPadding="false">
<LinearLayout
android:id="@+id/dashboard_container"
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 5e8d587..64b5c20 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -17,10 +17,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dashboard"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/search_panel_padding_start"
- android:paddingEnd="@dimen/search_panel_padding_end"
- android:background="@color/dashboard_background_color">
+ android:layout_height="match_parent">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -31,14 +28,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:orientation="vertical"
- android:elevation="@dimen/search_panel_elevation">
+ android:orientation="vertical">
+ <!-- Padding is included in the background -->
<ListView android:id="@+id/list_suggestions"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/white"
+ 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:scrollbarStyle="outsideOverlay"
android:headerDividersEnabled="false"
+ android:background="@drawable/search_panel_list_background"
+ android:elevation="@dimen/search_panel_elevation"
/>
</LinearLayout>
@@ -50,11 +53,18 @@
android:orientation="vertical"
android:layout_weight="1">
+ <!-- Padding is included in the background -->
<ListView android:id="@+id/list_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/white"
+ 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:scrollbarStyle="outsideOverlay"
android:headerDividersEnabled="false"
+ android:background="@drawable/search_panel_list_background"
+ android:elevation="@dimen/search_panel_elevation"
/>
</LinearLayout>
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index a06096a..0cc018e 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -40,7 +40,6 @@
android:id="@+id/prefs"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/white"
/>
</LinearLayout>