PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move trust agent toggles to developer options"

Browse Source
This commit is contained in:
Vishwath Mohan
2019-02-05 20:28:31 +00:00
committed by Android (Google) Code Review
parent 4c49ae1f7f 8f53ad0f37
commit 9ba7136334
8 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -820,9 +820,9 @@
<string name="lockdown_settings_summary">Display power button option that turns off Smart Lock, fingerprint unlocking, and notifications on the lock screen</string>
<!-- Text shown for the title of the extend unlock mode option for trust agents [CHAR LIMIT=40] -->
<string name="trust_agents_extend_unlock_title">SmartLock only extends unlock</string>
<string name="trust_agents_extend_unlock_title">Trust agents only extend unlock</string>
<!-- Text shown for the description of the extend unlock mode option [CHAR LIMIT=NONE] -->
<string name="trust_agents_extend_unlock_summary">If enabled, SmartLock will keep your device unlocked for longer, but can no longer unlock a locked device.</string>
<string name="trust_agents_extend_unlock_summary">If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device.</string>
<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>

11
res/xml/development_settings.xml
View File

@@ -114,6 +114,17 @@
android:key="quick_settings_tiles"
android:title="@string/quick_settings_developer_tiles"
android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
<!-- Configure trust agent behavior -->
<SwitchPreference
android:key="security_setting_trust_agents_extend_unlock"
android:title="@string/trust_agents_extend_unlock_title"
android:summary="@string/trust_agents_extend_unlock_summary" />
<SwitchPreference
android:key="security_setting_trust_lost_locks_screen"
android:title="@string/trust_lost_locks_screen_title"
android:summary="@string/trust_lost_locks_screen_summary" />
</PreferenceCategory>
<PreferenceCategory

13
res/xml/screen_lock_settings.xml
View File

@@ -40,17 +40,4 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
<!-- Temporarily available to evaluate extend unlock mode for SmartLock -->
<SwitchPreference
android:key="security_setting_trust_agents_extend_unlock"
android:title="@string/trust_agents_extend_unlock_title"
android:summary="@string/trust_agents_extend_unlock_summary"
settings:controller="com.android.settings.security.trustagent.TrustAgentsExtendUnlockPreferenceController" />
<SwitchPreference
android:key="security_setting_trust_lost_locks_screen"
android:title="@string/trust_lost_locks_screen_title"
android:summary="@string/trust_lost_locks_screen_summary"
settings:controller="com.android.settings.security.trustagent.TrustLostLocksScreenPreferenceController" />
</PreferenceScreen>