Merge "Tint suggestion icons" into oc-dr1-dev

diff --combined AndroidManifest.xml
index 8759554,2f42c8f..80a31fd
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -812,6 -812,7 +812,7 @@@
                         android:resource="@string/wallpaper_suggestion_summary" />
              <meta-data android:name="com.android.settings.dismiss"
                         android:value="3,7,30" />
+             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
          </activity>
  
          <activity android:name=".support.NewDeviceIntroSuggestionActivity"
@@@ -1461,6 -1462,8 +1462,8 @@@
              </intent-filter>
              <meta-data android:name="com.android.settings.title"
                  android:resource="@string/vision_settings_suggestion_title" />
+             <meta-data android:name="com.android.settings.icon_tintable"
+                 android:value="true" />
              <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                  android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
              <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@@ -1575,6 -1578,7 +1578,7 @@@
                         android:resource="@string/notification_suggestion_title" />
              <meta-data android:name="com.android.settings.summary"
                         android:resource="@string/notification_suggestion_summary" />
+             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
          </activity>
  
          <activity android:name=".notification.RedactionInterstitial"
@@@ -1595,6 -1599,24 +1599,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"/>
@@@ -1614,30 -1636,6 +1618,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"
@@@ -1688,6 -1686,7 +1692,7 @@@
                         android:resource="@string/suggested_lock_settings_title" />
              <meta-data android:name="com.android.settings.summary"
                         android:resource="@string/suggested_lock_settings_summary" />
+             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
          </activity>
  
          <activity android:name=".Settings$FingerprintEnrollSuggestionActivity"