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: 979fb7ea81 am: b494793420

Browse Source 
Change-Id: I0a712bbbda3f3574eda2052371065b16b5a76f2d
This commit is contained in:
TreeHugger Robot
2020-03-24 03:43:22 +00:00
committed by Automerger Merge Worker
parent 7ec84bf245 b494793420
commit 0f59a18c42
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.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);