diff options
| author | Nancy Chen <nancychen@google.com> | 2014-07-28 18:16:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 18:16:38 +0000 |
| commit | f7ae9fcdfafef2547f7f6e5b0f95e73f9c81928b (patch) | |
| tree | 1904ae9d326d8ca27970e9fe4347bec67fcb4a20 /res | |
| parent | c035d8455cd2c304b9d9d4b1766992040128a6e7 (diff) | |
| parent | 55fffa95b26c2334c531f7597d4d16d09fbf4504 (diff) | |
am 55fffa95: Merge "Decreased height of action bars in dialer" into lmp-dev
* commit '55fffa95b26c2334c531f7597d4d16d09fbf4504':
Decreased height of action bars in dialer
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/lists_fragment.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index 987c61f99..face20e26 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -25,7 +25,7 @@ android:id="@+id/shortcut_card_list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="@dimen/action_bar_height" + android:paddingTop="@dimen/action_bar_height_large" android:background="@color/actionbar_background_color" android:clipToPadding="false" android:fadingEdge="none" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 267f0dfd4..f09e1062a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -85,7 +85,8 @@ <!-- Height of the actionBar - this is 8dps bigger than the platform standard to give more room to the search box--> - <dimen name="action_bar_height">64dp</dimen> + <dimen name="action_bar_height">56dp</dimen> + <dimen name="action_bar_height_large">64dp</dimen> <dimen name="tab_height">43dp</dimen> <!-- actionbar height + tab height --> <dimen name="actionbar_and_tab_height">107dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index bda26cdab..4f4cb18ff 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -128,6 +128,7 @@ <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle"> <item name="android:displayOptions"></item> + <item name="android:height">@dimen/action_bar_height_large</item> </style> <!-- Text in the action bar at the top of the screen --> |