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

Merge "Indicate that a TrustAgent kept the phone unlocked" into qt-dev

Browse Source
This commit is contained in:
Lucas Dupin
2019-04-18 17:28:38 +00:00
committed by Android (Google) Code Review
parent cc0e418aae 859f2c84af
commit f1abb75702
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values/strings.xml
View File

@@ -1290,10 +1290,7 @@
activity.</string>
<!-- Indication on the keyguard that appears when a trust agents unlocks the device. [CHAR LIMIT=40] -->
<string name="keyguard_indication_trust_granted">Unlocked for <xliff:g id="user_name" example="John Doe">%1$s</xliff:g></string>
<!-- Indication on the keyguard that appears when a trust agent is active and available. [CHAR LIMIT=40] -->
<string name="keyguard_indication_trust_managed"><xliff:g id="trust_agent" example="Smart Lock">%1$s</xliff:g> is running</string>
<string name="keyguard_indication_trust_unlocked">Kept unlocked by TrustAgent</string>
<!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
<string name="keyguard_indication_trust_disabled">Device will stay locked until you manually unlock</string>

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

@@ -236,8 +236,8 @@ public class KeyguardIndicationController implements StateListener {
*
* @return {@code null} or an empty string if a trust indication text should not be shown.
*/
protected String getTrustGrantedIndication() {
return null;
private String getTrustGrantedIndication() {
return mContext.getString(R.string.keyguard_indication_trust_unlocked);
}
/**
@@ -245,7 +245,7 @@ public class KeyguardIndicationController implements StateListener {
*
* @return {@code null} or an empty string if a trust managed text should not be shown.
*/
protected String getTrustManagedIndication() {
private String getTrustManagedIndication() {
return null;
}