Merge "Fix 6483412: Disable search from navbar while SUW is running" into jb-dev

Author: Jim Miller

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

@@ -763,7 +763,7 @@ protected void updateExpansionStates() {
     protected abstract void tick(IBinder key, StatusBarNotification n, boolean firstTime);
     protected abstract void updateExpandedViewPos(int expandedPosition);
     protected abstract int getExpandedViewMaxHeight();
-    protected abstract boolean isStatusBarExpanded();
+    protected abstract boolean shouldDisableNavbarGestures();
 
     protected boolean isTopNotification(ViewGroup parent, NotificationData.Entry entry) {
         return parent.indexOfChild(entry.row) == 0;

packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java

@@ -53,7 +53,7 @@ public void setOrientation(int orientation) {
     }
 
     public boolean onInterceptTouchEvent(MotionEvent event) {
-        if (mBar.isStatusBarExpanded()) {
+        if (mBar.shouldDisableNavbarGestures()) {
             return false;
         }
         switch (event.getAction()) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -2111,8 +2111,8 @@ protected void haltTicker() {
     }
 
     @Override
-    protected boolean isStatusBarExpanded() {
-        return mExpanded;
+    protected boolean shouldDisableNavbarGestures() {
+        return mExpanded || (mDisabled & StatusBarManager.DISABLE_HOME) != 0;
     }
 }
 

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

@@ -1620,8 +1620,9 @@ protected void updateExpandedViewPos(int expandedPosition) {
     }
 
     @Override
-    protected boolean isStatusBarExpanded() {
-        return mNotificationPanel.getVisibility() == View.VISIBLE;
+    protected boolean shouldDisableNavbarGestures() {
+        return mNotificationPanel.getVisibility() == View.VISIBLE
+                || (mDisabled & StatusBarManager.DISABLE_HOME) != 0;
     }
 }