commit 3a1a3a2be9d1514f6040abd834e936616a60326b
author Wei Liu <luciferleo@google.com> Fri Sep 05 17:35:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 17:35:17 2014 +0000
tree f9d9218dcd11b18a9e0d3e783aa19f447df3d83d
parent ae76e4c99c01f7cf05c4c9bb46b1c1ae2a14f43c
parent efb1f406456d85dd161cfae8a91502e549a24570

am 930eade0: am 07aaab0c: am ea237b13: am 0641ab3d: am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185

* commit '930eade07fdff6c803d4bffe576f76206db6a142':
  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 41695c1..7b41391 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -413,7 +413,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);
             }