summaryrefslogtreecommitdiffstats
path: root/res/layout/redaction_interstitial.xml
diff options
context:
space:
mode:
authorAlex Chau <alexchau@google.com>2015-06-12 11:45:08 +0100
committerAlex Chau <alexchau@google.com>2015-06-18 16:00:16 +0100
commitccade402782d9b39331ada3859aa00893132e5c9 (patch)
treec6d556809b431bf73a1392cfc813ef61bcb671fe /res/layout/redaction_interstitial.xml
parent2c55f738c4336a3f379f94f4142c20a473ae3a9a (diff)
downloadpackages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.zip
packages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.tar.gz
packages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.tar.bz2
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and notification setup page (after settings a screenlock) - If a notification settings is disabled, the next least secure setting will be chosen - Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be profile, it will not be reflected in both settings page. This is because it does not affect the owner (user 0), as mentioned in DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER - Skip RedactionInterstitial if there is <= 1 options for the user - Tested with both Setup wizard and settings case, both pattern and password, as well as toggling the policy on and off Bug: 19307118 Bug: 17099898 Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Diffstat (limited to 'res/layout/redaction_interstitial.xml')
-rw-r--r--res/layout/redaction_interstitial.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index 6f0ba2e..14e57f8 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -33,6 +33,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" />
<RadioGroup
+ android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"