summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-08-27 08:46:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-27 08:46:04 -0700
commitc3032991983dad7b1dc71a1fc099f0b14df6cfbd (patch)
treedc32d6fba42195e04f14878c27fd0c8291ab93aa
parent8deae99ba17afcdd3a945481223524541903ed67 (diff)
parent88e517ec7178db457ad987e91c5430c6be6c0c85 (diff)
downloadframeworks_base-c3032991983dad7b1dc71a1fc099f0b14df6cfbd.zip
frameworks_base-c3032991983dad7b1dc71a1fc099f0b14df6cfbd.tar.gz
frameworks_base-c3032991983dad7b1dc71a1fc099f0b14df6cfbd.tar.bz2
Merge "Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into master"
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
index 91b583b..33acecb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
@@ -1485,7 +1485,7 @@ public class PhoneStatusBarService extends StatusBarService {
String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)
|| Intent.ACTION_SCREEN_OFF.equals(action)) {
- //collapse();
+ animateCollapse();
}
else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) {
updateResources();