Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5b2d487 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 47a4a50d b4238e0c

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

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
    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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class DelegateViewHelper { 
    }



    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

+2 −2
Original line number Diff line number Diff line
@@ -2111,8 +2111,8 @@ public class PhoneStatusBar extends BaseStatusBar { 
    }



    @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

+3 −2
Original line number Diff line number Diff line
@@ -1620,8 +1620,9 @@ public class TabletStatusBar extends BaseStatusBar implements 
    }



    @Override

    protected boolean isStatusBarExpanded() {

        return mNotificationPanel.getVisibility() == View.VISIBLE;

    protected boolean shouldDisableNavbarGestures() {

        return mNotificationPanel.getVisibility() == View.VISIBLE

                || (mDisabled & StatusBarManager.DISABLE_HOME) != 0;

    }

}