LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Sample Device Admin

Browse Source 
Adds options to exercise the newly added KEYGUARD_DISABLE_REMOTE_INPUT
and not so newly added KEYGUARD_DISABLE_FINGERPRINT.

Change-Id: I0e2a05f2a668b7d8ceacde3abcf5f8c80cb4bdb9
Fixes: 26981262
This commit is contained in:
Adrian Roos
2016-05-11 15:49:57 -04:00
parent ce9efcc800
commit 1052d438de
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/ApiDemos/res/values/strings.xml
View File

@@ -765,6 +765,8 @@
<string name="disable_keyguard_notifications">Disable keyguard notifications</string>
<string name="disable_keyguard_unredacted_notifications">Disable keyguard unredacted notifications</string>
<string name="disable_keyguard_trust_agents">Disable keyguard Trust Agents</string>
<string name="disable_keyguard_fingerprint">Disable keyguard Fingerprint</string>
<string name="disable_keyguard_remote_input">Disable keyguard Remote Input</string>
<string name="keyguard_widgets_disabled">Keyguard widgets disabled</string>
<string name="keyguard_widgets_enabled">Keyguard widgets enabled</string>
<string name="keyguard_secure_camera_disabled">Keyguard secure camera disabled</string>
@@ -775,6 +777,10 @@
<string name="keyguard_unredacted_notifications_enabled">Keyguard unredacted notifications enabled</string>
<string name="keyguard_trust_agents_disabled">Keyguard Trust Agents disabled</string>
<string name="keyguard_trust_agents_enabled">Keyguard Trust Agents enabled</string>
<string name="keyguard_fingerprint_disabled">Keyguard Fingerprint disabled</string>
<string name="keyguard_fingerprint_enabled">Keyguard Fingerprint enabled</string>
<string name="keyguard_remote_input_disabled">Keyguard Remote Input disabled</string>
<string name="keyguard_remote_input_enabled">Keyguard Remote Input enabled</string>
<string name="camera_disabled">Device cameras disabled</string>
<string name="camera_enabled">Device cameras enabled</string>
<string name="password_controls_category">Password controls</string>

8
samples/ApiDemos/res/xml/device_admin_general.xml
View File

@@ -51,6 +51,14 @@
android:key="key_disable_unredacted"
android:title="@string/disable_keyguard_unredacted_notifications" />
<CheckBoxPreference
android:key="key_disable_fingerprint"
android:title="@string/disable_keyguard_fingerprint" />
<CheckBoxPreference
android:key="key_disable_remote_input"
android:title="@string/disable_keyguard_remote_input" />
<CheckBoxPreference
android:key="key_disable_trust_agents"
android:title="@string/disable_keyguard_trust_agents" />

30
samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
View File

@@ -80,6 +80,8 @@ public class DeviceAdminSample extends PreferenceActivity {
private static final String KEY_DISABLE_KEYGUARD_WIDGETS = "key_disable_keyguard_widgets";
private static final String KEY_DISABLE_KEYGUARD_SECURE_CAMERA
= "key_disable_keyguard_secure_camera";
private static final String KEY_DISABLE_FINGERPRINT = "key_disable_fingerprint";
private static final String KEY_DISABLE_REMOTE_INPUT = "key_disable_remote_input";
private static final String KEY_CATEGORY_QUALITY = "key_category_quality";
private static final String KEY_SET_PASSWORD = "key_set_password";
@@ -282,6 +284,8 @@ public class DeviceAdminSample extends PreferenceActivity {
private CheckBoxPreference mDisableKeyguardUnredactedCheckbox;
private EditTextPreference mTrustAgentComponent;
private EditTextPreference mTrustAgentFeatures;
private CheckBoxPreference mDisableKeyguardFingerprintCheckbox;
private CheckBoxPreference mDisableKeyguardRemoteInputCheckbox;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -309,6 +313,14 @@ public class DeviceAdminSample extends PreferenceActivity {
(CheckBoxPreference) findPreference(KEY_DISABLE_UNREDACTED);
mDisableKeyguardUnredactedCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardFingerprintCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_FINGERPRINT);
mDisableKeyguardFingerprintCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardRemoteInputCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_REMOTE_INPUT);
mDisableKeyguardRemoteInputCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardTrustAgentCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_TRUST_AGENTS);
mDisableKeyguardTrustAgentCheckbox.setOnPreferenceChangeListener(this);
@@ -348,6 +360,10 @@ public class DeviceAdminSample extends PreferenceActivity {
DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS : 0;
flags |= mDisableKeyguardTrustAgentCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS : 0;
flags |= mDisableKeyguardFingerprintCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT : 0;
flags |= mDisableKeyguardRemoteInputCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT : 0;
return flags;
}
@@ -384,6 +400,8 @@ public class DeviceAdminSample extends PreferenceActivity {
|| preference == mDisableKeyguardNotificationCheckbox
|| preference == mDisableKeyguardUnredactedCheckbox
|| preference == mDisableKeyguardTrustAgentCheckbox
|| preference == mDisableKeyguardFingerprintCheckbox
|| preference == mDisableKeyguardRemoteInputCheckbox
|| preference == mTrustAgentComponent
|| preference == mTrustAgentFeatures) {
postUpdateDpmDisableFeatures();
@@ -453,6 +471,18 @@ public class DeviceAdminSample extends PreferenceActivity {
: R.string.keyguard_trust_agents_enabled);
mDisableKeyguardTrustAgentCheckbox.setSummary(keyguardEnableTrustAgentSummary);
String keyguardEnableFingerprintSummary = getString(
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0 ?
R.string.keyguard_fingerprint_disabled
: R.string.keyguard_fingerprint_enabled);
mDisableKeyguardFingerprintCheckbox.setSummary(keyguardEnableFingerprintSummary);
String keyguardEnableRemoteInputSummary = getString(
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT) != 0 ?
R.string.keyguard_remote_input_disabled
: R.string.keyguard_remote_input_enabled);
mDisableKeyguardRemoteInputCheckbox.setSummary(keyguardEnableRemoteInputSummary);
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
final boolean trustDisabled =
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0;