Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9c25573 authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "Update wallet button size for large screens, reduce keyguard bottom... 

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

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

Change-Id: I32b7902d7568e8cd4561d67f8ec83e74ea5ce186
parents 6da5b20f 9027059b

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/values-sw600dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -895,6 +895,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' +
@@ -906,7 +910,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>

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

+2 −2
Original line number Diff line number Diff line
@@ -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(