Make Google search panel go away when receiving phone call

chethaase · chethaase · commit ff20b0c0ef34 · 2012-05-25T13:38:10.000-07:00
Issue #6557847 "Google" launcher icon stuck in ring slider after getting incoming call

Change-Id: If77f66fd241af7fbfe6228498b07fd1cfcef36bd
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1049,6 +1049,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
`@@ -1049,6 +1049,8 @@ public void animateCollapse(boolean excludeRecents, float velocityMultiplier) {`
`1049`	`1049`	`mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL);`
`1050`	`1050`	`mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL);`
`1051`	`1051`	`}`
	`1052`	`+ mHandler.removeMessages(MSG_CLOSE_SEARCH_PANEL);`
	`1053`	`+ mHandler.sendEmptyMessage(MSG_CLOSE_SEARCH_PANEL);`
`1052`	`1054`
`1053`	`1055`	`if (!mExpandedVisible) {`
`1054`	`1056`	`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`