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

Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Cohen
2012-10-13 19:23:48 -07:00
committed by Android (Google) Code Review
parent 32f9e8ffdd 61ccc162a0
commit 33387b1bee
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
View File

@@ -189,14 +189,16 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay {
}
public void setMessage(CharSequence msg, boolean important) {
if (!important) return;
mSecurityMessageContents = msg;
if (!important) {
mSecurityMessageContents = "";
} else {
mSecurityMessageContents = msg;
}
securityMessageChanged();
}
public void setMessage(int resId, boolean important) {
if (!important) return;
if (resId != 0) {
if (resId != 0 && important) {
mSecurityMessageContents = getContext().getResources().getText(resId);
} else {
mSecurityMessageContents = "";
@@ -205,8 +207,7 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay {
}
public void setMessage(int resId, boolean important, Object... formatArgs) {
if (!important) return;
if (resId != 0) {
if (resId != 0 && important) {
mSecurityMessageContents = getContext().getString(resId, formatArgs);
} else {
mSecurityMessageContents = "";