commit 34a181aceb3e49397584c1f768a75593b15c55ed
author Maurice Lam <yukl@google.com> Tue Jun 20 20:00:54 2017 -0700
committer Maurice Lam <yukl@google.com> Wed Jun 21 17:17:48 2017 -0700
tree 7211fc72e12a02d7811bbdb25e97d7e2f4d9cf52
parent 6dfafa5d95a9abeb33f81d0dcd062f606b03d83c

Create add more fingerprint suggestion for setup

Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.

Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbf1eae..33d9e19 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1583,24 +1583,6 @@
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:theme="@style/GlifTheme.Light"/>
 
-        <activity
-            android:name=".Settings$FingerprintSuggestionActivity"
-            android:label="@string/security_settings_fingerprint_preference_title"
-            android:icon="@drawable/ic_suggestion_fingerprint">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                android:value="5,9,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/suggestion_additional_fingerprints" />
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/suggestion_additional_fingerprints_summary" />
-        </activity>
-
         <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
@@ -1620,6 +1602,30 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".fingerprint.FingerprintSuggestionActivity"
+            android:exported="true"
+            android:permission="android.permission.MANAGE_FINGERPRINT"
+            android:icon="@drawable/ic_suggestion_fingerprint"
+            android:theme="@style/GlifTheme.Light">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FINGERPRINT_ENROLL" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                android:value="5,9,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/suggestion_additional_fingerprints" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/suggestion_additional_fingerprints_summary" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
+        </activity>
+
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name=".password.ConfirmLockPattern$InternalActivity"
             android:exported="false"