Merge "Fix settings back button return to previous launched page"
This commit is contained in:
committed by
Android (Google) Code Review
commit
7a3e9a9020
@@ -118,6 +118,7 @@
|
|||||||
<activity android:name=".homepage.SettingsHomepageActivity"
|
<activity android:name=".homepage.SettingsHomepageActivity"
|
||||||
android:label="@string/settings_label_launcher"
|
android:label="@string/settings_label_launcher"
|
||||||
android:theme="@style/Theme.Settings.Home"
|
android:theme="@style/Theme.Settings.Home"
|
||||||
|
android:taskAffinity="com.android.settings.root"
|
||||||
android:launchMode="singleTask">
|
android:launchMode="singleTask">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.SETTINGS" />
|
<action android:name="android.settings.SETTINGS" />
|
||||||
@@ -142,6 +143,7 @@
|
|||||||
<!-- Alias for launcher activity only, as this belongs to each profile. -->
|
<!-- Alias for launcher activity only, as this belongs to each profile. -->
|
||||||
<activity-alias android:name="Settings"
|
<activity-alias android:name="Settings"
|
||||||
android:label="@string/settings_label_launcher"
|
android:label="@string/settings_label_launcher"
|
||||||
|
android:taskAffinity="com.android.settings.root"
|
||||||
android:launchMode="singleTask"
|
android:launchMode="singleTask"
|
||||||
android:targetActivity=".homepage.SettingsHomepageActivity">
|
android:targetActivity=".homepage.SettingsHomepageActivity">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
Reference in New Issue
Block a user