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

Commit 4c3cc7d4 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 928c8877: am c6a2fa8c: Merge "Disable assist gesture when keyguard is active" into jb-dev 

* commit '928c8877':
  Disable assist gesture when keyguard is active
parents 777b5981 928c8877

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

+5 −0
Original line number Diff line number Diff line
@@ -953,4 +953,9 @@ public abstract class BaseStatusBar extends SystemUI implements 
        }

        return false;

    }



    public boolean inKeyguardRestrictedInputMode() {

        KeyguardManager km = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        return km.inKeyguardRestrictedInputMode();

    }

}

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

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



    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (mSourceView == null || mDelegateView == null || mBar.shouldDisableNavbarGestures()) {

        if (mSourceView == null || mDelegateView == null

                || mBar.shouldDisableNavbarGestures() || mBar.inKeyguardRestrictedInputMode()) {

            return false;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ public class PhoneStatusBar extends BaseStatusBar { 
        public boolean onTouch(View v, MotionEvent event) {

            switch(event.getAction()) {

            case MotionEvent.ACTION_DOWN:

                if (!shouldDisableNavbarGestures()) {

                if (!shouldDisableNavbarGestures() && !inKeyguardRestrictedInputMode()) {

                    mHandler.removeCallbacks(mShowSearchPanel);

                    mHandler.postDelayed(mShowSearchPanel, mShowSearchHoldoff);

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class TabletStatusBar extends BaseStatusBar implements 
        public boolean onTouch(View v, MotionEvent event) {

            switch(event.getAction()) {

                case MotionEvent.ACTION_DOWN:

                    if (!shouldDisableNavbarGestures()) {

                    if (!shouldDisableNavbarGestures() && !inKeyguardRestrictedInputMode()) {

                        mHandler.removeCallbacks(mShowSearchPanel);

                        mHandler.postDelayed(mShowSearchPanel, mShowSearchHoldoff);

                    }