diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-30 00:51:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 00:51:41 +0000 |
| commit | 40e9bd000efaa0ef0eb6199eda4e7909b8b9061b (patch) | |
| tree | 5563d5a8ae55d49a2b6637e54a7f74c9c3266585 | |
| parent | 7f4a7a114ffce8808345905755fbdfd96c07b57a (diff) | |
| parent | bc16c5ddac0aab9f4bf69913ca2b8877e9a7daf6 (diff) | |
| download | packages_apps_Settings-40e9bd000efaa0ef0eb6199eda4e7909b8b9061b.zip packages_apps_Settings-40e9bd000efaa0ef0eb6199eda4e7909b8b9061b.tar.gz packages_apps_Settings-40e9bd000efaa0ef0eb6199eda4e7909b8b9061b.tar.bz2 | |
am bc16c5dd: Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev
* commit 'bc16c5ddac0aab9f4bf69913ca2b8877e9a7daf6':
Update ActionBar for using contentInsetStart
| -rwxr-xr-x | res/values-sw600dp/dimens.xml | 5 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 9 | ||||
| -rw-r--r-- | res/values/themes.xml | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 0cef851..76ce998 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -44,5 +44,10 @@ <!-- SwitchBar padding start --> <dimen name="switchbar_padding_start">80dp</dimen> + <!-- SwitchBar padding end --> + <dimen name="switchbar_padding_end">80dp</dimen> + + <!-- ActionBar contentInsetStart --> + <dimen name="actionbar_contentInsetStart">80dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 460fb44..aa8ab5e 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -94,8 +94,11 @@ <dimen name="dashboard_category_title_height">48dp</dimen> <!-- SwitchBar padding start --> - <dimen name="switchbar_padding_start">72dp</dimen> - <!-- SwitchBar padding emd --> - <dimen name="switchbar_padding_end">@*android:dimen/preference_fragment_padding_side</dimen> + <dimen name="switchbar_padding_start">84dp</dimen> + <!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side --> + <dimen name="switchbar_padding_end">32dp</dimen> + + <!-- ActionBar contentInsetStart --> + <dimen name="actionbar_contentInsetStart">84dp</dimen> </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index c39910b..366492d 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -89,6 +89,12 @@ <!-- Used by the StatusBar and NavBar --> <item name="android:colorPrimaryDark">@color/actionbar_background_color</item> <item name="android:colorAccent">@color/quantum_orange_A200</item> + <!-- Redefine the ActionBar style for contentInsetStart --> + <item name="android:actionBarStyle">@style/Theme.ActionBar</item> + </style> + + <style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid"> + <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item> </style> </resources> |