commit 0641ab3dd0282edc272f425a245ede63a78dd222
author Wei Liu <luciferleo@google.com> Fri Sep 05 16:52:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 16:52:20 2014 +0000
tree cd1768cf8981e842244b9d3fe9bbef9fab68134c
parent 4576f597078ade77c38a6432d8ae4edc85446db5
parent 636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df

am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185

* commit '636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df':
  Add clear_top flag to settings action intent. Bug: 17200185

policy/src/com/android/internal/policy/impl/GlobalActions.java

diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index 371fa0f..1a25d90 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -388,7 +388,7 @@
             @Override
             public void onPress() {
                 Intent intent = new Intent(Settings.ACTION_SETTINGS);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 mContext.startActivity(intent);
             }