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

Merge "Update taskAffinity" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 21:39:05 +00:00
committed by Android (Google) Code Review
parent b8808e35a6 078af3396f
commit 383baeae86
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -1475,7 +1475,7 @@
<!-- Lock screen settings --> <!-- Lock screen settings -->
<activity android:name=".password.ConfirmDeviceCredentialActivity" <activity android:name=".password.ConfirmDeviceCredentialActivity"
android:exported="true" android:exported="true"
android:taskAffinity=".password.ConfirmDeviceCredentialActivity" android:taskAffinity="com.android.settings.workmode"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
@@ -1493,7 +1493,7 @@
android:exported="false" android:exported="false"
android:permission="android.permission.MANAGE_USERS" android:permission="android.permission.MANAGE_USERS"
android:resizeableActivity="false" android:resizeableActivity="false"
android:taskAffinity=".password.ConfirmDeviceCredentialActivity" android:taskAffinity="com.android.settings.workmode"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />
@@ -2810,6 +2810,7 @@
<activity android:name=".enterprise.ActionDisabledByAdminDialog" <activity android:name=".enterprise.ActionDisabledByAdminDialog"
android:theme="@style/Transparent" android:theme="@style/Transparent"
android:taskAffinity="com.android.settings.enterprise"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:launchMode="singleTop"> android:launchMode="singleTop">
<intent-filter android:priority="1"> <intent-filter android:priority="1">