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

Clean up task affinity.

Browse Source 
If activity is launched through external intent, back button should just
go back to previous screen.

Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug: 112254258
Fixes: 111864355
Test: manual
This commit is contained in:
Fan Zhang
2018-07-27 16:16:43 -07:00
parent 5a4269d21e
commit ff3652e0a3
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -731,7 +731,6 @@
android:label="@string/zen_mode_settings_title" android:label="@string/zen_mode_settings_title"
android:icon="@drawable/ic_notifications" android:icon="@drawable/ic_notifications"
android:exported="true" android:exported="true"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_SETTINGS" /> <action android:name="android.settings.ZEN_MODE_SETTINGS" />
@@ -933,7 +932,6 @@
android:label="@string/night_display_title" android:label="@string/night_display_title"
android:enabled="@*android:bool/config_nightDisplayAvailable" android:enabled="@*android:bool/config_nightDisplayAvailable"
android:icon="@drawable/ic_settings_night_display" android:icon="@drawable/ic_settings_night_display"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -2620,7 +2618,6 @@
<activity <activity
android:name="Settings$ZenAccessSettingsActivity" android:name="Settings$ZenAccessSettingsActivity"
android:label="@string/manage_zen_access_title" android:label="@string/manage_zen_access_title"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" /> <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />