Merge "Fix fingerprint suggestion icon color." into pi-dev

am: 6590f6948d

Change-Id: Iacdf068f690d31c3e37a91e9cacb7a3810b4a9ef
This commit is contained in:
android-build-team Robot
2018-04-30 15:30:20 -07:00
committed by android-build-merger

View File

@@ -1763,6 +1763,7 @@
android:resource="@string/suggested_fingerprint_lock_settings_title" /> android:resource="@string/suggested_fingerprint_lock_settings_title" />
<meta-data android:name="com.android.settings.summary" <meta-data android:name="com.android.settings.summary"
android:resource="@string/suggested_fingerprint_lock_settings_summary" /> android:resource="@string/suggested_fingerprint_lock_settings_summary" />
<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
</activity> </activity>
<activity android:name=".password.ChooseLockGeneric$InternalActivity" <activity android:name=".password.ChooseLockGeneric$InternalActivity"