Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev

This commit is contained in:
John Spurlock
2013-09-16 13:20:49 +00:00
committed by Android (Google) Code Review

View File

@ -1378,6 +1378,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true); setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
} }
private void releaseFocus() {
WindowManager.LayoutParams lp =
(WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams();
lp.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
lp.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
mWindowManager.updateViewLayout(mStatusBarWindow, lp);
}
public void animateCollapsePanels() { public void animateCollapsePanels() {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
} }
@ -1389,6 +1397,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
+ " flags=" + flags); + " flags=" + flags);
} }
// release focus immediately to kick off focus change transition
releaseFocus();
if ((flags & CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL) == 0) { if ((flags & CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL) == 0) {
mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL); mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL);
mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL); mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL);