Adds screen lock as a suggested activity
Also, fixes a bug where the suggested activity stayed on screen
after the component was disabled causing a crash.
bug:25246207
bug:26770556
Change-Id: I28d784cdc57e464e49887483690ab514ca3bc46a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c158511..ea1bc89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1562,6 +1562,34 @@
android:value="true" />
</activity>
+ <activity-alias android:name=".suggestion.ChooseLockGeneric"
+ android:icon="@drawable/ic_settings_security"
+ android:targetActivity=".ChooseLockGeneric">
+ <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.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-alias android:name=".suggestion.FingerprintEnrollIntroduction"
+ android:icon="@drawable/ic_settings_security"
+ android:targetActivity=".fingerprint.FingerprintEnrollIntroduction">
+ <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.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 android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true"