PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-qpr-dev am: 7c1b1fc934

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24399253

Change-Id: I204498f1e2f580d5d8f7ce8a64e904a780b9e25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chang
2023-09-19 15:51:56 +00:00
committed by Automerger Merge Worker
parent c7ea38203a 7c1b1fc934
commit 0e850e9d73
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -659,6 +659,7 @@
<activity android:name="Settings$FaceSettingsActivity" <activity android:name="Settings$FaceSettingsActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="true" android:exported="true"
android:theme="@style/Theme.Settings.NoActionBar"
android:icon="@drawable/ic_face_header"> android:icon="@drawable/ic_face_header">
<intent-filter> <intent-filter>
<action android:name="android.settings.FACE_SETTINGS" /> <action android:name="android.settings.FACE_SETTINGS" />
@@ -673,6 +674,7 @@
<activity android:name="Settings$FaceSettingsInternalActivity" <activity android:name="Settings$FaceSettingsInternalActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="false" android:exported="false"
android:theme="@style/Theme.Settings.NoActionBar"
android:icon="@drawable/ic_face_header" android:icon="@drawable/ic_face_header"
android:taskAffinity="com.android.settings.root"> android:taskAffinity="com.android.settings.root">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"