summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-07-28 18:10:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-25 21:16:23 +0000
commit55fffa95b26c2334c531f7597d4d16d09fbf4504 (patch)
treeab7daacbc3f58dddd6f69662d844b53975881c11 /res/values
parentd8e5542a7ddba2e107b7f56b9761db1db942c722 (diff)
parentb8170de2a2d0e5cd3812720fe50616fae319413c (diff)
downloadandroid_packages_apps_Dialer-55fffa95b26c2334c531f7597d4d16d09fbf4504.tar.gz
android_packages_apps_Dialer-55fffa95b26c2334c531f7597d4d16d09fbf4504.tar.bz2
android_packages_apps_Dialer-55fffa95b26c2334c531f7597d4d16d09fbf4504.zip
Merge "Decreased height of action bars in dialer" into lmp-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml3
-rw-r--r--res/values/styles.xml1
2 files changed, 3 insertions, 1 deletions
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 -->