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

Commit 27bc8293 authored by Scott Warner's avatar Scott Warner Committed by Luca Stefani
Browse files

SystemUI: Fix showing duplicated charging status 

In commit 85e5a576 it was possible that plugging a device in,
then turning on the screen would show the charging status twice.
To fix, don't append the charging status to if there is a
transient notification.

Change-Id: Ic031fbaf9a99d044f50dc65e2b189773222ebe80
parent f75b3a3a

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

+1 −8
Original line number Diff line number Diff line
@@ -428,14 +428,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) {

                    String indication = mContext.getResources().getString(

                            R.string.keyguard_indication_trust_unlocked_plugged_in,

                            mTransientIndication, powerIndication);

                    mTextView.switchIndication(indication);

                } else {

                mTextView.switchIndication(mTransientIndication);

                }

                mTextView.setTextColor(mTransientTextColorState);

            } else if (!TextUtils.isEmpty(trustGrantedIndication)

                    && mKeyguardUpdateMonitor.getUserHasTrust(userId)) {