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

Commit 6c8451a8 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Set explicit back target for history 

Test: manual
Fixes: 153554906
Change-Id: Ic3198afae878e3cfbfbfa7e72b1c71a6f4e74a2e
parent 608bd693

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,8 @@ 


        <activity

            android:name=".notification.history.NotificationHistoryActivity"

            android:label="@string/notification_history_title">

            android:label="@string/notification_history_title"

            android:taskAffinity="com.android.settings.notification">

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

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -2530,6 +2531,7 @@ 
        <activity

            android:name="Settings$ConfigureNotificationSettingsActivity"

            android:label="@string/configure_notification_settings"

            android:taskAffinity="com.android.settings.notification"

            android:exported="true">

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

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

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+15 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.ActivityManager; 
import android.app.INotificationManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.os.RemoteException;
@@ -191,6 +192,20 @@ public class NotificationHistoryActivity extends Activity { 
        super.onDestroy();

    }



    @Override

    public void onBackPressed() {

        handleBackPressed();

    }



    private void handleBackPressed() {

        if (getFragmentManager().getBackStackEntryCount() > 1) {

            super.onBackPressed();

        } else {

            startActivity(new Intent(Settings.ACTION_NOTIFICATION_SETTINGS));

            finish();

        }

    }



    private void bindSwitch() {

        if (mSwitchBar != null) {

            mSwitchBar.setSwitchBarText(R.string.notification_history_toggle,