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

Commit 5d082e89 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: f1abb757

Change-Id: Ia2aa85b93aa62d38986743edacc79c9a853e2b2e
parents d9819ada f1abb757
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -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>
+3 −3
Original line number Diff line number Diff line
@@ -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;
    }