commit cd8f4291dc89310730dcd5aa145842ec69c695ef
author Sunny Goyal <sunnygoyal@google.com> Thu May 04 21:00:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 21:00:02 2017 +0000
tree 391b927ee3897de9bc21b1a7703d84314bc6ac3c
parent 825c3db194fea8f032b2b7c829cbfc5f03e2d9c4
parent 53f93b9c15886581b8c4f25b7376dc4638800e0d

Start settings activity in a new task, so that if the LauncherActivity finishes from behind, the task does not enter an inconsistant state
am: 53f93b9c15

Change-Id: I9a21552903d44b468d42efebbe60353b9b0c91a5

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0d1e9e1..d0c01f4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2571,6 +2571,7 @@
         Intent intent = new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
                 .setPackage(getPackageName());
         intent.setSourceBounds(getViewBounds(v));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent, getActivityLaunchOptions(v));
     }