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

Add test harness for new keyguard features:

Browse Source 
- disable all notifications on secure keyguard
- disable unredacted notifications on secure keyguard
- disable TrustAgents

Change-Id: I864a103263996dcd491ff77f744bff8398af9cc8
This commit is contained in:
Jim Miller
2014-04-21 13:36:18 -07:00
parent 693f2b6904
commit 1d8e0796c5
3 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -743,10 +743,19 @@
<string name="disable_camera">Disable all device cameras</string>
<string name="disable_keyguard_widgets">Disable keyguard widgets</string>
<string name="disable_keyguard_secure_camera">Disable keyguard secure camera</string>
<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="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>
<string name="keyguard_secure_camera_enabled">Keyguard secure camera enabled</string>
<string name="keyguard_secure_notifications_disabled">Keyguard notifications disabled</string>
<string name="keyguard_secure_notifications_enabled">Keyguard notifications enabled</string>
<string name="keyguard_unredacted_notifications_disabled">Keyguard unredacted notifications disabled</string>
<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="camera_disabled">Device cameras disabled</string>
<string name="camera_enabled">Device cameras enabled</string>
<string name="password_controls_category">Password controls</string>

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

@@ -43,6 +43,18 @@
android:key="key_disable_keyguard_secure_camera"
android:title="@string/disable_keyguard_secure_camera" />
<CheckBoxPreference
android:key="key_disable_notifications"
android:title="@string/disable_keyguard_notifications" />
<CheckBoxPreference
android:key="key_disable_unredacted"
android:title="@string/disable_keyguard_unredacted_notifications" />
<CheckBoxPreference
android:key="key_disable_trust_agents"
android:title="@string/disable_keyguard_trust_agents" />
</PreferenceCategory>
</PreferenceScreen>

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

@@ -68,6 +68,9 @@ public class DeviceAdminSample extends PreferenceActivity {
// The following keys are used to find each preference item
private static final String KEY_ENABLE_ADMIN = "key_enable_admin";
private static final String KEY_DISABLE_CAMERA = "key_disable_camera";
private static final String KEY_DISABLE_NOTIFICATIONS = "key_disable_notifications";
private static final String KEY_DISABLE_UNREDACTED = "key_disable_unredacted";
private static final String KEY_DISABLE_TRUST_AGENTS = "key_disable_trust_agents";
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";
@@ -128,6 +131,11 @@ public class DeviceAdminSample extends PreferenceActivity {
return mDPM.isAdminActive(mDeviceAdminSample);
}
@Override
protected boolean isValidFragment(String fragmentName) {
return GeneralFragment.class.getName().equals(fragmentName);
}
/**
* Common fragment code for DevicePolicyManager access. Provides two shared elements:
*
@@ -250,6 +258,9 @@ public class DeviceAdminSample extends PreferenceActivity {
private CheckBoxPreference mDisableCameraCheckbox;
private CheckBoxPreference mDisableKeyguardWidgetsCheckbox;
private CheckBoxPreference mDisableKeyguardSecureCameraCheckbox;
private CheckBoxPreference mDisableKeyguardNotificationCheckbox;
private CheckBoxPreference mDisableKeyguardTrustAgentCheckbox;
private CheckBoxPreference mDisableKeyguardUnredactedCheckbox;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -257,14 +268,29 @@ public class DeviceAdminSample extends PreferenceActivity {
addPreferencesFromResource(R.xml.device_admin_general);
mEnableCheckbox = (CheckBoxPreference) findPreference(KEY_ENABLE_ADMIN);
mEnableCheckbox.setOnPreferenceChangeListener(this);
mDisableCameraCheckbox = (CheckBoxPreference) findPreference(KEY_DISABLE_CAMERA);
mDisableCameraCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardWidgetsCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_KEYGUARD_WIDGETS);
mDisableKeyguardWidgetsCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardSecureCameraCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_KEYGUARD_SECURE_CAMERA);
mDisableKeyguardSecureCameraCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardNotificationCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_NOTIFICATIONS);
mDisableKeyguardNotificationCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardUnredactedCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_UNREDACTED);
mDisableKeyguardUnredactedCheckbox.setOnPreferenceChangeListener(this);
mDisableKeyguardTrustAgentCheckbox =
(CheckBoxPreference) findPreference(KEY_DISABLE_TRUST_AGENTS);
mDisableKeyguardTrustAgentCheckbox.setOnPreferenceChangeListener(this);
}
// At onResume time, reload UI with current values as required
@@ -287,6 +313,12 @@ public class DeviceAdminSample extends PreferenceActivity {
DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_ALL : 0;
flags |= mDisableKeyguardSecureCameraCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA : 0;
flags |= mDisableKeyguardNotificationCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS : 0;
flags |= mDisableKeyguardUnredactedCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS : 0;
flags |= mDisableKeyguardTrustAgentCheckbox.isChecked() ?
DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS : 0;
return flags;
}
@@ -317,7 +349,10 @@ public class DeviceAdminSample extends PreferenceActivity {
mDPM.setCameraDisabled(mDeviceAdminSample, value);
reloadSummaries();
} else if (preference == mDisableKeyguardWidgetsCheckbox
|| preference == mDisableKeyguardSecureCameraCheckbox) {
|| preference == mDisableKeyguardSecureCameraCheckbox
|| preference == mDisableKeyguardNotificationCheckbox
|| preference == mDisableKeyguardUnredactedCheckbox
|| preference == mDisableKeyguardTrustAgentCheckbox) {
mDPM.setKeyguardDisabledFeatures(mDeviceAdminSample, createKeyguardDisabledFlag());
reloadSummaries();
}
@@ -342,6 +377,24 @@ public class DeviceAdminSample extends PreferenceActivity {
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0 ?
R.string.keyguard_secure_camera_disabled : R.string.keyguard_secure_camera_enabled);
mDisableKeyguardSecureCameraCheckbox.setSummary(keyguardSecureCameraSummary);
String keyguardSecureNotificationsSummary = getString(
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) != 0 ?
R.string.keyguard_secure_notifications_disabled
: R.string.keyguard_secure_notifications_enabled);
mDisableKeyguardNotificationCheckbox.setSummary(keyguardSecureNotificationsSummary);
String keyguardUnredactedSummary = getString(
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) != 0
? R.string.keyguard_unredacted_notifications_disabled
: R.string.keyguard_unredacted_notifications_enabled);
mDisableKeyguardUnredactedCheckbox.setSummary(keyguardUnredactedSummary);
String keyguardEnableTrustAgentSummary = getString(
(disabled & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0 ?
R.string.keyguard_trust_agents_disabled
: R.string.keyguard_trust_agents_enabled);
mDisableKeyguardTrustAgentCheckbox.setSummary(keyguardEnableTrustAgentSummary);
}
/** Updates the device capabilities area (dis/enabling) as the admin is (de)activated */
@@ -349,6 +402,9 @@ public class DeviceAdminSample extends PreferenceActivity {
mDisableCameraCheckbox.setEnabled(enabled);
mDisableKeyguardWidgetsCheckbox.setEnabled(enabled);
mDisableKeyguardSecureCameraCheckbox.setEnabled(enabled);
mDisableKeyguardNotificationCheckbox.setEnabled(enabled);
mDisableKeyguardUnredactedCheckbox.setEnabled(enabled);
mDisableKeyguardTrustAgentCheckbox.setEnabled(enabled);
}
}