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

Merge "Set explicit back target for history" into rvc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2020-04-20 17:40:18 +00:00
committed by Android (Google) Code Review
parent 1be2666d11 6c8451a89f
commit bb979153ed
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -1200,7 +1200,8 @@
<activity <activity
android:name=".notification.history.NotificationHistoryActivity" 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"> <intent-filter android:priority="1">
<action android:name="android.settings.NOTIFICATION_HISTORY" /> <action android:name="android.settings.NOTIFICATION_HISTORY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -2530,6 +2531,7 @@
<activity <activity
android:name="Settings$ConfigureNotificationSettingsActivity" android:name="Settings$ConfigureNotificationSettingsActivity"
android:label="@string/configure_notification_settings" android:label="@string/configure_notification_settings"
android:taskAffinity="com.android.settings.notification"
android:exported="true"> android:exported="true">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.NOTIFICATION_SETTINGS" /> <action android:name="android.settings.NOTIFICATION_SETTINGS" />

15
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -23,6 +23,7 @@ import android.app.ActivityManager;
import android.app.INotificationManager; import android.app.INotificationManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
@@ -191,6 +192,20 @@ public class NotificationHistoryActivity extends Activity {
super.onDestroy(); 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() { private void bindSwitch() {
if (mSwitchBar != null) { if (mSwitchBar != null) {
mSwitchBar.setSwitchBarText(R.string.notification_history_toggle, mSwitchBar.setSwitchBarText(R.string.notification_history_toggle,