summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2018-01-29 16:06:51 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-29 16:06:51 +0000
commit0b922f2dd87be32cdbfedc550d3231a7041a9743 (patch)
tree30b552209d8d268a290976d2d162c4e7d4b40946
parent1e1c4fc8023c651a3e7b5cafd22f797e47d86b94 (diff)
parent38cbc885d183f7b683c42714565fd95222207a3d (diff)
Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71
am: 38cbc885d1 Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a
-rw-r--r--packages/SystemUI/res/layout/back.xml4
-rw-r--r--packages/SystemUI/res/layout/recent_apps.xml4
-rw-r--r--packages/SystemUI/res/values-sw600dp/dimens.xml3
3 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/back.xml b/packages/SystemUI/res/layout/back.xml
index 43bec91ad053..6843db9313d4 100644
--- a/packages/SystemUI/res/layout/back.xml
+++ b/packages/SystemUI/res/layout/back.xml
@@ -24,8 +24,8 @@
systemui:keyCode="4"
android:scaleType="fitCenter"
android:contentDescription="@string/accessibility_back"
- android:paddingTop="15dp"
- android:paddingBottom="15dp"
+ android:paddingTop="@dimen/home_padding"
+ android:paddingBottom="@dimen/home_padding"
android:paddingStart="@dimen/navigation_key_padding"
android:paddingEnd="@dimen/navigation_key_padding"
/>
diff --git a/packages/SystemUI/res/layout/recent_apps.xml b/packages/SystemUI/res/layout/recent_apps.xml
index c84d28051286..6b08cea7705f 100644
--- a/packages/SystemUI/res/layout/recent_apps.xml
+++ b/packages/SystemUI/res/layout/recent_apps.xml
@@ -23,8 +23,8 @@
android:layout_weight="0"
android:scaleType="fitCenter"
android:contentDescription="@string/accessibility_recent"
- android:paddingTop="15dp"
- android:paddingBottom="15dp"
+ android:paddingTop="@dimen/home_padding"
+ android:paddingBottom="@dimen/home_padding"
android:paddingStart="@dimen/navigation_key_padding"
android:paddingEnd="@dimen/navigation_key_padding"
/>
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index c8ffe8fb5ad0..a16ea7081277 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -98,4 +98,7 @@
<!-- The offsets the tasks animate from when recents is launched while docking -->
<dimen name="recents_task_stack_animation_launched_while_docking_offset">192dp</dimen>
+
+ <!-- Home button padding for sizing -->
+ <dimen name="home_padding">0dp</dimen>
</resources>