commit 0b0e6fc3a0ff0271b362f165415e3a19d3e01f97
author Sunny Shao <sunnyshao@google.com> Tue Jun 18 13:32:05 2019 +0800
committer Raff Tsai <rafftsai@google.com> Tue Jun 18 06:00:46 2019 +0000
tree 6281d5a8ce3ea08ea78973bcfe2e629a0cbb8f3e
parent f81813006e26016e91f64a06c4297c555e5fc2d5

Fix settings back button return to previous launched page

QuickSetting use FLAG_ACTIVITY_NEW_TASK flag to launch setting page. It shares the same
taskid with Settings. That's why user press BACK key will return the previous settings
page. Now add the new taskAffinity in Settings homepage to fix this problem.

Fixes: 135018024
Test: manual & robotest
Change-Id: Ic73645e9afe5415691f0696c5ae33a9eacda6d50

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b070a6..07dd1dd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -118,6 +118,7 @@
         <activity android:name=".homepage.SettingsHomepageActivity"
                   android:label="@string/settings_label_launcher"
                   android:theme="@style/Theme.Settings.Home"
+                  android:taskAffinity="com.android.settings.root"
                   android:launchMode="singleTask">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SETTINGS" />
@@ -142,6 +143,7 @@
         <!-- Alias for launcher activity only, as this belongs to each profile. -->
         <activity-alias android:name="Settings"
                 android:label="@string/settings_label_launcher"
+                android:taskAffinity="com.android.settings.root"
                 android:launchMode="singleTask"
                 android:targetActivity=".homepage.SettingsHomepageActivity">
             <intent-filter>