am bc5d9d22: Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread

Merge commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f' into gingerbread-plus-aosp

* commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f':
  Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
This commit is contained in:
Joe Onorato
2010-08-26 13:56:08 -07:00
committed by Android Git Automerger

View File

@@ -1540,7 +1540,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action) if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)
|| Intent.ACTION_SCREEN_OFF.equals(action)) { || Intent.ACTION_SCREEN_OFF.equals(action)) {
//collapse(); animateCollapse();
} }
else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) { else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) {
updateResources(); updateResources();