diff options
| author | Nancy Chen <nancychen@google.com> | 2014-07-29 01:02:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-29 01:02:35 +0000 |
| commit | 5bfa8626d5169738025c8dabe9bc8360323bb96b (patch) | |
| tree | b4ab064e07df24d9005642f631e57bb9e0fb66aa /res | |
| parent | 3c14c500c986d8c35e7c13079a092a4137309933 (diff) | |
| parent | 6f83298f28de7b6deaafeda765e84890a397b6d0 (diff) | |
am 6f83298f: am 1698e1ae: am 01aef896: Merge "Shift actionbar title to the 72dp line." into lmp-dev
* commit '6f83298f28de7b6deaafeda765e84890a397b6d0':
Shift actionbar title to the 72dp line.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f09e1062a..5b8c0df4e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -90,6 +90,7 @@ <dimen name="tab_height">43dp</dimen> <!-- actionbar height + tab height --> <dimen name="actionbar_and_tab_height">107dp</dimen> + <dimen name="actionbar_contentInsetStart">72dp</dimen> <!-- Margin to the left and right of the search box. --> <dimen name="search_margin_horizontal">8dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4f4cb18ff..9601a4b9e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -123,12 +123,15 @@ <item name="android:height">@dimen/action_bar_height</item> <!-- Empty icon --> <item name="android:icon">@android:color/transparent</item> - <item name="android:contentInsetStart">0px</item> + <!-- Shift the title text to the right --> + <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item> </style> <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle"> <item name="android:displayOptions"></item> <item name="android:height">@dimen/action_bar_height_large</item> + <!-- Override ActionBar title offset to keep search box aligned left --> + <item name="android:contentInsetStart">0px</item> </style> <!-- Text in the action bar at the top of the screen --> |