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

Commit faeee1c2 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Set text color in the KeyguardIndication" into udc-dev am: 2e03f9f5 

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



Change-Id: Ib0bc157c037baa79160d78b9b28d82f5dba034c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 436345fb 2e03f9f5

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+10 −6
Original line number Diff line number Diff line
@@ -869,12 +869,9 @@ public class KeyguardIndicationController { 
        // Walk down a precedence-ordered list of what indication

        // should be shown based on device state

        if (mDozing) {

            boolean useMisalignmentColor = false;

            mLockScreenIndicationView.setVisibility(View.GONE);

            mTopIndicationView.setVisibility(VISIBLE);

            // When dozing we ignore any text color and use white instead, because

            // colors can be hard to read in low brightness.

            mTopIndicationView.setTextColor(Color.WHITE);



            CharSequence newIndication;

            if (!TextUtils.isEmpty(mBiometricMessage)) {

                newIndication = mBiometricMessage; // note: doesn't show mBiometricMessageFollowUp
@@ -885,8 +882,8 @@ public class KeyguardIndicationController { 
                mIndicationArea.setVisibility(GONE);

                return;

            } else if (!TextUtils.isEmpty(mAlignmentIndication)) {

                useMisalignmentColor = true;

                newIndication = mAlignmentIndication;

                mTopIndicationView.setTextColor(mContext.getColor(R.color.misalignment_text_color));

            } else if (mPowerPluggedIn || mEnableBatteryDefender) {

                newIndication = computePowerIndication();

            } else {
@@ -896,7 +893,14 @@ public class KeyguardIndicationController { 


            if (!TextUtils.equals(mTopIndicationView.getText(), newIndication)) {

                mWakeLock.setAcquired(true);

                mTopIndicationView.switchIndication(newIndication, null,

                mTopIndicationView.switchIndication(newIndication,

                        new KeyguardIndication.Builder()

                                .setMessage(newIndication)

                                .setTextColor(ColorStateList.valueOf(

                                        useMisalignmentColor

                                                ? mContext.getColor(R.color.misalignment_text_color)

                                                : Color.WHITE))

                                .build(),

                        true, () -> mWakeLock.setAcquired(false));

            }

            return;