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

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

Merge "Fix 6474712: Disable the google gesture on prime while notifications are open" into jb-dev

parents 01119de9 670d9dd2

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

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,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 boolean isTopNotification(ViewGroup parent, NotificationData.Entry entry) {

        return parent.indexOfChild(entry.row) == 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ public class DelegateViewHelper { 
    }



    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (mBar.isStatusBarExpanded()) {

            return false;

        }

        switch (event.getAction()) {

            case MotionEvent.ACTION_DOWN:

                mDownPoint[0] = event.getX();

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

+5 −0
Original line number Diff line number Diff line
@@ -2109,5 +2109,10 @@ public class PhoneStatusBar extends BaseStatusBar { 
    protected void haltTicker() {

        mTicker.halt();

    }



    @Override

    protected boolean isStatusBarExpanded() {

        return mExpanded;

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,11 @@ public class TabletStatusBar extends BaseStatusBar implements 
    @Override

    protected void updateExpandedViewPos(int expandedPosition) {

    }



    @Override

    protected boolean isStatusBarExpanded() {

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

    }

}