Add Screen pinning back to settings

Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
This commit is contained in:
Jason Monk
2014-07-18 09:55:41 -04:00
parent d7bdf17aba
commit 27d7ea56f3
8 changed files with 209 additions and 2 deletions

View File

@@ -23,10 +23,13 @@
<Preference android:key="sim_lock_settings"
android:title="@string/sim_lock_settings_category"
android:persistent="false">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.IccLockSettings"/>
</Preference>
</PreferenceCategory>
<PreferenceCategory android:title="@string/security_passwords_title"
@@ -35,6 +38,7 @@
<CheckBoxPreference android:key="show_password"
android:title="@string/show_password"
android:persistent="false"/>
</PreferenceCategory>
<PreferenceCategory android:key="device_admin_category"
@@ -58,11 +62,13 @@
android:summaryOff="@string/verify_applications_summary"
android:summaryOn="@string/verify_applications_summary"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory android:key="credentials_management"
android:title="@string/credentials_title"
android:persistent="false">
<Preference android:key="credential_storage_type"
android:title="@string/credential_storage_type"
style="?android:attr/preferenceInformationStyle"
@@ -78,28 +84,42 @@
android:title="@string/credentials_install"
android:summary="@string/credentials_install_summary"
android:persistent="false">
<intent android:action="android.credentials.INSTALL"
android:targetPackage="com.android.certinstaller"
android:targetClass="com.android.certinstaller.CertInstallerMain"/>
</Preference>
<Preference android:key="credentials_reset"
android:title="@string/credentials_reset"
android:summary="@string/credentials_reset_summary"
android:persistent="false">
<intent android:action="com.android.credentials.RESET"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.CredentialStorage"/>
</Preference>
</PreferenceCategory>
<PreferenceCategory android:key="advanced_security"
android:title="@string/advanced_security_title"
android:persistent="false">
<Preference android:key="manage_trust_agents"
android:title="@string/manage_trust_agents"
android:summary="@string/manage_trust_agents_summary"
android:persistent="false"
android:fragment="com.android.settings.AdvancedSecuritySettings"/>
<PreferenceScreen
android:key="screen_pinning_settings"
android:title="@string/screen_pinning_title"
android:summary="@string/switch_off_text"
android:fragment="com.android.settings.ScreenPinningSettings"/>
</PreferenceCategory>
</PreferenceScreen>