Merge "Make Google search panel go away when receiving phone call" into jb-dev

chethaase · Android (Google) Code Review · commit a27551dde853 · 2012-05-25T15:49:47.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1053,6 +1053,8 @@ public void animateCollapse(boolean excludeRecents, float velocityMultiplier) {
             mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL);
             mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL);
         }
+        mHandler.removeMessages(MSG_CLOSE_SEARCH_PANEL);
+        mHandler.sendEmptyMessage(MSG_CLOSE_SEARCH_PANEL);
 
         if (!mExpandedVisible) {
             return;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -1013,6 +1013,8 @@ private void animateCollapse(boolean excludeRecents) {
         mHandler.sendEmptyMessage(MSG_CLOSE_INPUT_METHODS_PANEL);
         mHandler.removeMessages(MSG_CLOSE_COMPAT_MODE_PANEL);
         mHandler.sendEmptyMessage(MSG_CLOSE_COMPAT_MODE_PANEL);
+        mHandler.removeMessages(MSG_CLOSE_SEARCH_PANEL);
+        mHandler.sendEmptyMessage(MSG_CLOSE_SEARCH_PANEL);
     }
 
     @Override // CommandQueue

Original file line number	Diff line number	Diff line change
`@@ -1053,6 +1053,8 @@ public void animateCollapse(boolean excludeRecents, float velocityMultiplier) {`
`1053`	`1053`	`mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL);`
`1054`	`1054`	`mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL);`
`1055`	`1055`	`}`
	`1056`	`+ mHandler.removeMessages(MSG_CLOSE_SEARCH_PANEL);`
	`1057`	`+ mHandler.sendEmptyMessage(MSG_CLOSE_SEARCH_PANEL);`
`1056`	`1058`
`1057`	`1059`	`if (!mExpandedVisible) {`
`1058`	`1060`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1013,6 +1013,8 @@ private void animateCollapse(boolean excludeRecents) {`
`1013`	`1013`	`mHandler.sendEmptyMessage(MSG_CLOSE_INPUT_METHODS_PANEL);`
`1014`	`1014`	`mHandler.removeMessages(MSG_CLOSE_COMPAT_MODE_PANEL);`
`1015`	`1015`	`mHandler.sendEmptyMessage(MSG_CLOSE_COMPAT_MODE_PANEL);`
	`1016`	`+ mHandler.removeMessages(MSG_CLOSE_SEARCH_PANEL);`
	`1017`	`+ mHandler.sendEmptyMessage(MSG_CLOSE_SEARCH_PANEL);`
`1016`	`1018`	`}`
`1017`	`1019`
`1018`	`1020`	`@Override // CommandQueue`