Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94dfc am: be9bf94858

Browse Source 
Change-Id: I6b5ef9a2b6cac69a8a36cda015f9b6c1f8da11ad
This commit is contained in:
TreeHugger Robot
2020-03-24 02:47:13 +00:00
committed by Automerger Merge Worker
parent 65d8a029b2 be9bf94858
commit 3914d60616
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -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);