aboutsummaryrefslogtreecommitdiff
path: root/car_product
diff options
context:
space:
mode:
authorJian Jin <jinjian@google.com>2018-04-19 17:37:13 -0700
committerJian Jin <jinjian@google.com>2018-04-19 17:55:20 -0700
commit2d3b384c5d02d60bbb45298a31dab84ec7eb610c (patch)
treef43e4e5c054e1b577b4630e5811fc437a42a7df0 /car_product
parent39ee59a735181709526eed03e69b1934e4317002 (diff)
downloadCar-2d3b384c5d02d60bbb45298a31dab84ec7eb610c.tar.gz
Bugfix: [BigDog] PIN pad overlapping with Input field
Change-Id: I16bf8bfc12ff90c15ede2fe04222dc4d97e50169 Fixes: 77874609 Test: Tested on both Mojave and emulator in portrait mode
Diffstat (limited to 'car_product')
-rw-r--r--car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-land/keyguard_pin_view.xml (renamed from car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-sw600dp/keyguard_pin_view.xml)0
-rw-r--r--car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml6
-rw-r--r--car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/styles.xml7
3 files changed, 3 insertions, 10 deletions
diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-sw600dp/keyguard_pin_view.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
index 730c21fda2..730c21fda2 100644
--- a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-sw600dp/keyguard_pin_view.xml
+++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
index dcc403dcda..955c43ea8f 100644
--- a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -18,11 +18,9 @@
<dimen name="num_pad_margin_left">112dp</dimen>
<dimen name="num_pad_margin_right">144dp</dimen>
<dimen name="num_pad_key_width">120dp</dimen>
- <dimen name="num_pad_key_height">100dp</dimen>
- <dimen name="num_pad_key_margin">24dp</dimen>
+ <dimen name="num_pad_key_height">80dp</dimen>
+ <dimen name="num_pad_key_margin">12dp</dimen>
<dimen name="num_pad_margin_top">48dp</dimen>
- <dimen name="num_pad_key_digit_size">48sp</dimen>
- <dimen name="num_pad_key_text_size">24sp</dimen>
<dimen name="keyguard_pin_prompt_text_size">24sp</dimen>
<dimen name="pin_entry_height">@dimen/num_pad_key_height</dimen>
<dimen name="divider_height">1dp</dimen>
diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/styles.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/styles.xml
index c1e9622e26..f5c6ece8df 100644
--- a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/styles.xml
@@ -28,11 +28,6 @@
<style name="Widget.TextView.NumPadKey" parent="@android:style/Widget.TextView">
<!-- Only replaces the text size. -->
- <item name="android:textSize">@dimen/num_pad_key_digit_size</item>
- </style>
-
- <style name="Widget.TextView.NumPadKey.Klondike" parent="Widget.TextView.NumPadKey">
- <!-- Only replaces the text size. -->
- <item name="android:textSize">@dimen/num_pad_key_text_size</item>
+ <item name="android:textSize">@dimen/car_body1_size</item>
</style>
</resources>