Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff3652e0 authored by Fan Zhang's avatar Fan Zhang
Browse files

Clean up task affinity. 

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
parent 5a4269d2

AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ 
            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
@@ -933,7 +932,6 @@ 
            android:label="@string/night_display_title"

            android:enabled="@*android:bool/config_nightDisplayAvailable"

            android:icon="@drawable/ic_settings_night_display"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -2620,7 +2618,6 @@ 
        <activity

            android:name="Settings$ZenAccessSettingsActivity"

            android:label="@string/manage_zen_access_title"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />