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

Commit dcbfcc59 authored by Matt Pietal's avatar Matt Pietal
Browse files

Indication area text running into wallet 

If the wallet affordance is enabled, add padding to both sides of the
indication area to keep it centered and let the text wrap to the 2nd
line.

Fixes: 185467117
Test: manual (seeing charging message + wallet)
Change-Id: Id44b473faab2acb0f5446cf0ea890c2b2cc74e71
parent 650a27bf

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -871,7 +871,9 @@ 
    <dimen name="keyguard_affordance_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' +

         'keyguard_affordance_horizontal_offset' -->

    <dimen name="keyguard_indication_area_padding">82dp</dimen>



    <!-- The width/height of the unlock icon view on keyguard. -->

    <dimen name="keyguard_lock_height">42dp</dimen>

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

+11 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    private String mLeftButtonStr;

    private boolean mDozing;

    private int mIndicationBottomMargin;

    private int mIndicationPadding;

    private float mDarkAmount;

    private int mBurnInXOffset;

    private int mBurnInYOffset;
@@ -276,6 +277,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        mAccessibilityController = Dependency.get(AccessibilityController.class);

        mActivityIntentHelper = new ActivityIntentHelper(getContext());

        updateLeftAffordance();



        mIndicationPadding = getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_area_padding);

        updateWalletVisibility();

    }



    @Override
@@ -358,6 +363,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width);

        lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height);

        mWalletButton.setLayoutParams(lp);



        mIndicationPadding = getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_area_padding);

        updateWalletVisibility();

    }



    private void updateRightAffordanceIcon() {
@@ -433,9 +442,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    private void updateWalletVisibility() {

        if (mDozing || !mWalletEnabled || !mHasCard) {

            mWalletButton.setVisibility(GONE);

            mIndicationArea.setPadding(0, 0, 0, 0);

        } else {

            mWalletButton.setVisibility(VISIBLE);

            mWalletButton.setOnClickListener(this::onWalletClick);

            mIndicationArea.setPadding(mIndicationPadding, 0, mIndicationPadding, 0);

        }

    }