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

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

Merge "Fix 6299832: Add search target swipe action to navigation bar on phones"

parents 97c03cac e898ac59

core/java/android/view/WindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -428,6 +428,12 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_DREAM = FIRST_SYSTEM_WINDOW+23;



        /**

         * Window type: Navigation bar panel (when navigation bar is distinct from status bar)

         * @hide

         */

        public static final int TYPE_NAVIGATION_BAR_PANEL = FIRST_SYSTEM_WINDOW+24;



        /**

         * End of types of system windows.

         */

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.os.Vibrator;

import android.text.TextUtils;

import android.util.AttributeSet;
@@ -142,6 +141,7 @@ public class MultiWaveView extends View { 
    private int mTargetResourceId;

    private int mTargetDescriptionsResourceId;

    private int mDirectionDescriptionsResourceId;

    private boolean mAlwaysTrackFinger;



    public MultiWaveView(Context context) {

        this(context, null);
@@ -168,6 +168,7 @@ public class MultiWaveView extends View { 
        mTapRadius = mHandleDrawable.getWidth()/2;

        mOuterRing = new TargetDrawable(res,

                a.peekValue(R.styleable.MultiWaveView_waveDrawable).resourceId);

        mAlwaysTrackFinger = a.getBoolean(R.styleable.MultiWaveView_alwaysTrackFinger, false);



        // Read chevron animation drawables

        final int chevrons[] = { R.styleable.MultiWaveView_leftChevronDrawable,
@@ -634,7 +635,6 @@ public class MultiWaveView extends View { 
    @Override

    public boolean onTouchEvent(MotionEvent event) {

        final int action = event.getAction();



        boolean handled = false;

        switch (action) {

            case MotionEvent.ACTION_DOWN:
@@ -805,7 +805,7 @@ public class MultiWaveView extends View { 
        final float y = event.getY();

        final float dx = x - mWaveCenterX;

        final float dy = y - mWaveCenterY;

        if (dist2(dx,dy) <= getScaledTapRadiusSquared()) {

        if (mAlwaysTrackFinger || dist2(dx,dy) <= getScaledTapRadiusSquared()) {

            if (DEBUG) Log.v(TAG, "** Handle HIT");

            switchToState(STATE_FIRST_TOUCH, x, y);

            moveHandleTo(x, y, false);

core/res/res/drawable-hdpi/ic_lockscreen_google_activated.png

0 → 100644
+11.9 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_google_focused.png

0 → 100644
+21.7 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_google_normal.png

0 → 100644
+12 KiB
Loading image diff...