Fix 2579923: Make changing lock screen method more discoverable.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.
Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.
In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.
Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.
Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3499a42..78c0f5b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -491,8 +491,7 @@
android:theme="@android:style/Theme.NoTitleBar">
</activity>
- <activity android:name="ChooseLockGeneric"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name="ChooseLockGeneric">
<intent-filter>
<action android:name="android.app.action.SET_NEW_PASSWORD" />
<category android:name="android.intent.category.DEFAULT" />
@@ -500,12 +499,14 @@
</activity>
<activity android:name="ChooseLockPattern"
- android:label="@string/lockpattern_change_lock_pattern_label">
+ android:label="@string/lockpattern_change_lock_pattern_label"
+ android:exported="false">
</activity>
<activity android:name="ChooseLockPassword"
android:label="@string/lockpattern_change_lock_pin_label"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="false">
</activity>
<activity android:name="ChooseLockPatternTutorial"