diff options
| author | Nancy Chen <nancychen@google.com> | 2014-07-29 00:23:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:37:54 +0000 |
| commit | 01aef89650cea6e1929ee7172b80134a183d30d7 (patch) | |
| tree | d4e2e19aec808eb909e20f8145ad3da5cd4ee22c /res | |
| parent | a49872bdfb2390706b057a9cb74c9c78ac5e2c17 (diff) | |
| parent | 5d5b6042a71ffc02e5f0bc6996348dd6ee96bb23 (diff) | |
Merge "Shift actionbar title to the 72dp line." into lmp-dev
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 --> |