Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-qpr-dev am: 7c1b1fc934
am: 0e850e9d73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24399253 Change-Id: Icb44d81e49551a43374eceadc709a1c1d680c8a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -645,6 +645,7 @@
|
||||
<activity android:name="Settings$FaceSettingsActivity"
|
||||
android:label="@string/security_settings_face_preference_title"
|
||||
android:exported="true"
|
||||
android:theme="@style/Theme.Settings.NoActionBar"
|
||||
android:icon="@drawable/ic_face_header">
|
||||
<intent-filter>
|
||||
<action android:name="android.settings.FACE_SETTINGS" />
|
||||
@@ -659,6 +660,7 @@
|
||||
<activity android:name="Settings$FaceSettingsInternalActivity"
|
||||
android:label="@string/security_settings_face_preference_title"
|
||||
android:exported="false"
|
||||
android:theme="@style/Theme.Settings.NoActionBar"
|
||||
android:icon="@drawable/ic_face_header"
|
||||
android:taskAffinity="com.android.settings.root">
|
||||
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||
|
Reference in New Issue
Block a user