Merge "Fix history task stack" into rvc-dev (7d1cfa4d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -1200,8 +1200,7 @@

		<activity
		android:name=".notification.history.NotificationHistoryActivity"
		android:label="@string/notification_history_title"
		android:taskAffinity="com.android.settings.notification">
		android:label="@string/notification_history_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NOTIFICATION_HISTORY" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -2534,7 +2533,6 @@
		<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" />

+0 −14

Original line number	Diff line number	Diff line
		@@ -200,20 +200,6 @@ 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,