diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-03 20:50:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-03 20:50:47 +0000 |
| commit | ea011659fd835262b9218b751ca6608c3e717778 (patch) | |
| tree | 481543b7d0ee75ba1db8c0d31a1f8719ead99d62 /car_product | |
| parent | cfc4946aa250b5aac4c3539aeb5ae51717545f87 (diff) | |
| parent | 5272d607448058e456ae64d095dda36556beaf91 (diff) | |
| download | Car-ea011659fd835262b9218b751ca6608c3e717778.tar.gz | |
Merge "I/O Keyguard: increase vertical margin of center pad for tall screen" into pi-dev
Diffstat (limited to 'car_product')
4 files changed, 22 insertions, 2 deletions
diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml index f7c587fcdc..d664ada739 100644 --- a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml +++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml @@ -60,6 +60,7 @@ android:id="@+id/lockPatternView" android:layout_width="@dimen/keyguard_pattern_dimension" android:layout_height="@dimen/keyguard_pattern_dimension" + android:layout_marginVertical="@dimen/pin_pattern_pad_margin_vertical" android:layout_gravity="center_horizontal" android:gravity="center" /> diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml index a9141fd530..4b32148750 100644 --- a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml +++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml @@ -75,7 +75,7 @@ android:id="@+id/container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/num_pad_margin_top" + android:layout_marginVertical="@dimen/pin_pattern_pad_margin_vertical" android:columnCount="3"> <!-- Row 1 --> diff --git a/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-h1000dp/dimens.xml b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-h1000dp/dimens.xml new file mode 100644 index 0000000000..24f1ee32c9 --- /dev/null +++ b/car_product/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-h1000dp/dimens.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018s, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License") + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <dimen name="pin_pattern_pad_margin_vertical">178dp</dimen> +</resources> 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 955c43ea8f..14919cac0f 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 @@ -20,11 +20,11 @@ <dimen name="num_pad_key_width">120dp</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="keyguard_pin_prompt_text_size">24sp</dimen> <dimen name="pin_entry_height">@dimen/num_pad_key_height</dimen> <dimen name="divider_height">1dp</dimen> <dimen name="key_enter_margin_top">128dp</dimen> <dimen name="keyguard_pattern_dimension">350dp</dimen> <dimen name="password_field_width">350dp</dimen> + <dimen name="pin_pattern_pad_margin_vertical">0dp</dimen> </resources> |