Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update wallet button size for large screens, reduce keyguard bottom text margin" into sc-dev am: 9027059bb3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14843818

Change-Id: I32b7902d7568e8cd4561d67f8ec83e74ea5ce186
This commit is contained in:
Nick Chameyev
2021-06-07 20:40:43 +00:00
committed by Automerger Merge Worker
parent 6da5b20f1b 9027059bb3
commit d9c2557306
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -80,8 +80,8 @@
<ImageView <ImageView
android:id="@+id/wallet_button" android:id="@+id/wallet_button"
android:layout_height="@dimen/keyguard_affordance_height" android:layout_height="@dimen/keyguard_affordance_wallet_height"
android:layout_width="@dimen/keyguard_affordance_width" android:layout_width="@dimen/keyguard_affordance_wallet_width"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:scaleType="center" android:scaleType="center"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"

2
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -68,8 +68,6 @@
phone hints. --> phone hints. -->
<dimen name="edge_tap_area_width">80dp</dimen> <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. --> <!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">2dp</dimen> <dimen name="system_icons_keyguard_padding_end">2dp</dimen>

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -895,6 +895,10 @@
<!-- The width/height of the keyguard bottom area icon view on keyguard. --> <!-- The width/height of the keyguard bottom area icon view on keyguard. -->
<dimen name="keyguard_affordance_height">48dp</dimen> <dimen name="keyguard_affordance_height">48dp</dimen>
<dimen name="keyguard_affordance_width">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_horizontal_offset">32dp</dimen>
<dimen name="keyguard_affordance_vertical_offset">32dp</dimen> <dimen name="keyguard_affordance_vertical_offset">32dp</dimen>
<!-- Value should be at least sum of 'keyguard_affordance_width' + <!-- Value should be at least sum of 'keyguard_affordance_width' +
@@ -906,7 +910,7 @@
<dimen name="keyguard_lock_width">42dp</dimen> <dimen name="keyguard_lock_width">42dp</dimen>
<dimen name="keyguard_lock_padding">20dp</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 --> <!-- The text size for battery level -->
<dimen name="battery_level_text_size">12sp</dimen> <dimen name="battery_level_text_size">12sp</dimen>

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -368,8 +368,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
updateLeftAffordanceIcon(); updateLeftAffordanceIcon();
lp = mWalletButton.getLayoutParams(); lp = mWalletButton.getLayoutParams();
lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width);
lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width);
mWalletButton.setLayoutParams(lp); mWalletButton.setLayoutParams(lp);
mIndicationPadding = getResources().getDimensionPixelSize( mIndicationPadding = getResources().getDimensionPixelSize(