Merge "Set explicit back target for history" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
bb979153ed
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user