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

Commit 77668c73 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

systemui: respect navigation rings configuration 



Don't launch assist intent if the navigation ring item doesn't define a configuration for
that item. Instead just cancel the animation.

Change-Id: Ic5b4f40ad6d2eccdf138a94307fb1dd38868de76
JIRA: CYAN-6808
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 3d118b55

packages/SystemUI/src/com/android/systemui/SearchPanelView.java

+2 −1
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ public class SearchPanelView extends FrameLayout implements StatusBarPanel, 
                break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_CANCEL:

                if (mDraggedFarEnough) {

                if (mDraggedFarEnough && (mTargetActivities[mCircle.mIntersectIndex] != null &&

                        !ACTION_NONE.equals(mTargetActivities[mCircle.mIntersectIndex]))) {

                    if (mCircle.isAnimationRunning(true  /* enterAnimation */)) {

                        mLaunchPending = true;

                        mCircle.setAnimatingOut(true);