diff options
4 files changed, 9 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 80b7d1f8970f..e40138e1f49c 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -80,8 +80,8 @@ <ImageView android:id="@+id/wallet_button" - android:layout_height="@dimen/keyguard_affordance_height" - android:layout_width="@dimen/keyguard_affordance_width" + android:layout_height="@dimen/keyguard_affordance_wallet_height" + android:layout_width="@dimen/keyguard_affordance_wallet_width" android:layout_gravity="bottom|end" android:scaleType="center" android:tint="?android:attr/textColorPrimary" diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 3be73ba8df25..9f8e6364e55d 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -68,8 +68,6 @@ phone hints. --> <dimen name="edge_tap_area_width">80dp</dimen> - <dimen name="keyguard_indication_margin_bottom">90dp</dimen> - <!-- Margin on the right side of the system icon group on Keyguard. --> <dimen name="system_icons_keyguard_padding_end">2dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 05f2f6727a73..11cd5a35f002 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -892,6 +892,10 @@ <!-- The width/height of the keyguard bottom area icon view on keyguard. --> <dimen name="keyguard_affordance_height">48dp</dimen> <dimen name="keyguard_affordance_width">48dp</dimen> + + <dimen name="keyguard_affordance_wallet_height">48dp</dimen> + <dimen name="keyguard_affordance_wallet_width">48dp</dimen> + <dimen name="keyguard_affordance_horizontal_offset">32dp</dimen> <dimen name="keyguard_affordance_vertical_offset">32dp</dimen> <!-- Value should be at least sum of 'keyguard_affordance_width' + @@ -903,7 +907,7 @@ <dimen name="keyguard_lock_width">42dp</dimen> <dimen name="keyguard_lock_padding">20dp</dimen> - <dimen name="keyguard_indication_margin_bottom">40dp</dimen> + <dimen name="keyguard_indication_margin_bottom">32dp</dimen> <!-- The text size for battery level --> <dimen name="battery_level_text_size">12sp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 4d8e7de37606..8e3aed43d1af 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -368,8 +368,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateLeftAffordanceIcon(); lp = mWalletButton.getLayoutParams(); - lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); - lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width); mWalletButton.setLayoutParams(lp); mIndicationPadding = getResources().getDimensionPixelSize( |