Dynamically checks if screen lock suggestion is needed
Fixes a bug where if you upgrade a device with screen lock,
screen lock suggestion would show (upgrade such as N->N developer
builds) or from a user test case like M->N
bug:26844580
Change-Id: Ic779ff28f5895e407c2c96771dbbc622e6026a7f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3764b95..5cdd5fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1607,33 +1607,35 @@
android:value="true" />
</activity>
- <activity-alias android:name=".suggestion.ChooseLockGeneric"
- android:icon="@drawable/ic_settings_security"
- android:targetActivity=".ChooseLockGeneric">
+ <activity android:name=".Settings$ScreenLockSuggestionActivity"
+ android:icon="@drawable/ic_settings_security">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
</intent-filter>
+ <meta-data android:name="com.android.settings.dismiss"
+ android:value="0,30" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/suggested_lock_settings_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/suggested_lock_settings_summary" />
- </activity-alias>
+ </activity>
- <activity-alias android:name=".suggestion.FingerprintEnrollIntroduction"
- android:icon="@drawable/ic_settings_security"
- android:targetActivity=".fingerprint.FingerprintEnrollIntroduction">
+ <activity android:name=".Settings$FingerprintEnrollSuggestionActivity"
+ android:icon="@drawable/ic_settings_security">
<intent-filter android:priority="2">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
</intent-filter>
+ <meta-data android:name="com.android.settings.dismiss"
+ android:value="0,30" />
<meta-data android:name="com.android.settings.require_feature"
android:value="android.hardware.fingerprint" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/suggested_lock_settings_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/suggested_lock_settings_summary" />
- </activity-alias>
+ </activity>
<activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
android:label="@string/lockpassword_choose_lock_generic_header"