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

Commit 0f59a18c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: 979fb7ea am: b4947934

Change-Id: I0a712bbbda3f3574eda2052371065b16b5a76f2d
parents 7ec84bf2 b4947934

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

+1 −1
Original line number 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.setTextColor(mInitialTextColorState);

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

                if (powerIndication != null) {

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

                    String indication = mContext.getResources().getString(

                            R.string.keyguard_indication_trust_unlocked_plugged_in,

                            mTransientIndication, powerIndication);