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

Commit 96792ed3 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Avoid duplicate text on keyguard indication" into rvc-dev am:... 

Merge "Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: be9bf948 am: 3914d606" into rvc-qpr-dev-plus-aosp
parents c9feaf18 9b47c20e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,7 @@ public class KeyguardIndicationController implements StateListener, 
                mTextView.switchIndication(com.android.internal.R.string.lockscreen_storage_locked);

                mTextView.switchIndication(com.android.internal.R.string.lockscreen_storage_locked);

                mTextView.setTextColor(mInitialTextColorState);

                mTextView.setTextColor(mInitialTextColorState);

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

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

                if (powerIndication != null) {

                if (powerIndication != null && !mTransientIndication.equals(powerIndication)) {

                    String indication = mContext.getResources().getString(

                    String indication = mContext.getResources().getString(

                            R.string.keyguard_indication_trust_unlocked_plugged_in,

                            R.string.keyguard_indication_trust_unlocked_plugged_in,

                            mTransientIndication, powerIndication);

                            mTransientIndication, powerIndication);