diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-03 20:33:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-03 20:33:54 +0000 |
| commit | 9b9c97e7505bca802547f81de8aff5b1d55176f6 (patch) | |
| tree | f5908bb1b127e3e9a8289994774d831ee9779c3d /res | |
| parent | 1eb528318cdeb5c5ff1be469435538dad133882b (diff) | |
| parent | d15de56ba1443ab5285b2de6411190dafdc1a869 (diff) | |
| download | packages_apps_Settings-9b9c97e7505bca802547f81de8aff5b1d55176f6.zip packages_apps_Settings-9b9c97e7505bca802547f81de8aff5b1d55176f6.tar.gz packages_apps_Settings-9b9c97e7505bca802547f81de8aff5b1d55176f6.tar.bz2 | |
Merge "Update Recents Searches and Search Results padding" into lmp-preview-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/search_panel.xml | 10 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 |
3 files changed, 20 insertions, 4 deletions
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml index 8837bc9..1242c73 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="@*android:dimen/preference_fragment_padding_side" - android:paddingEnd="@*android:dimen/preference_fragment_padding_side" + android:paddingStart="@dimen/search_results_padding_start" + android:paddingEnd="@dimen/search_results_padding_end" android:background="@color/dashboard_background_color"> <LinearLayout android:layout_width="match_parent" @@ -35,10 +35,11 @@ <TextView android:layout_width="wrap_content" android:layout_height="@dimen/dashboard_category_title_height" + android:paddingStart="@dimen/search_title_padding_start" android:singleLine="true" android:ellipsize="marquee" android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" + android:textAppearance="@style/TextAppearance.RecentsTitle" android:textAlignment="viewStart" android:text="@string/search_recents_queries_label" /> @@ -59,10 +60,11 @@ <TextView android:layout_width="wrap_content" android:layout_height="@dimen/dashboard_category_title_height" + android:paddingStart="@dimen/search_title_padding_start" android:singleLine="true" android:ellipsize="marquee" android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" + android:textAppearance="@style/TextAppearance.ResultTitle" android:textAlignment="viewStart" android:text="@string/search_results_label" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 90611dc..4e4fa8e 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -108,4 +108,11 @@ <!-- ActionBar contentInsetStart --> <dimen name="actionbar_contentInsetStart">68dp</dimen> + <!-- Search Results padding in its container --> + <dimen name="search_results_padding_start">1dp</dimen> + <dimen name="search_results_padding_end">1dp</dimen> + + <!-- Search title (recent / results) padding start --> + <dimen name="search_title_padding_start">12dp</dimen> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2c82662..79ed972 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -274,4 +274,11 @@ <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Quantum.Small"> </style> + <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle"> + </style> + + <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle"> + </style> + + </resources> |