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

Commit 7d22baba authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-2762060c253b4c4db3c4db805c2e5b6e",... 

Merge changes from topics "presubmit-am-2762060c253b4c4db3c4db805c2e5b6e", "presubmit-am-3d21c3ff86734d9ba296b2671441db03", "presubmit-am-681cf6c0b8f240f59da390f09a7ef2ed", "presubmit-am-82dac8e1bb1747dcb76dbda3f29e55c9", "presubmit-am-c01cdff8b5e44804ab8a37c5cdc295d5" into tm-dev am: a8fafc5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128845

Change-Id: I98f69d03d6357303beaaabc3cec9014c50999b94
parents 007d9090 a8fafc5a

core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java

+25 −25
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ final class ButtonDispatcher { 
        }

    };



    public ButtonDispatcher(int id) {

    ButtonDispatcher(int id) {

        mId = id;

    }
@@ -125,8 +125,8 @@ final class ButtonDispatcher { 


    public void setImageDrawable(KeyButtonDrawable drawable) {

        mImageDrawable = drawable;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            if (mViews.get(i) instanceof ButtonInterface) {

                ((ButtonInterface) mViews.get(i)).setImageDrawable(mImageDrawable);

            }
@@ -143,8 +143,8 @@ final class ButtonDispatcher { 
        }



        mVisibility = visibility;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setVisibility(mVisibility);

        }

    }
@@ -188,8 +188,8 @@ final class ButtonDispatcher { 
            int nextAlpha = (int) (alpha * 255);

            if (prevAlpha != nextAlpha) {

                mAlpha = nextAlpha / 255f;

                final int N = mViews.size();

                for (int i = 0; i < N; i++) {

                final int numViews = mViews.size();

                for (int i = 0; i < numViews; i++) {

                    mViews.get(i).setAlpha(mAlpha);

                }

            }
@@ -198,8 +198,8 @@ final class ButtonDispatcher { 


    public void setDarkIntensity(float darkIntensity) {

        mDarkIntensity = darkIntensity;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            if (mViews.get(i) instanceof ButtonInterface) {

                ((ButtonInterface) mViews.get(i)).setDarkIntensity(darkIntensity);

            }
@@ -208,8 +208,8 @@ final class ButtonDispatcher { 


    public void setDelayTouchFeedback(boolean delay) {

        mDelayTouchFeedback = delay;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            if (mViews.get(i) instanceof ButtonInterface) {

                ((ButtonInterface) mViews.get(i)).setDelayTouchFeedback(delay);

            }
@@ -218,55 +218,55 @@ final class ButtonDispatcher { 


    public void setOnClickListener(View.OnClickListener clickListener) {

        mClickListener = clickListener;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setOnClickListener(mClickListener);

        }

    }



    public void setOnTouchListener(View.OnTouchListener touchListener) {

        mTouchListener = touchListener;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setOnTouchListener(mTouchListener);

        }

    }



    public void setLongClickable(boolean isLongClickable) {

        mLongClickable = isLongClickable;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setLongClickable(mLongClickable);

        }

    }



    public void setOnLongClickListener(View.OnLongClickListener longClickListener) {

        mLongClickListener = longClickListener;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setOnLongClickListener(mLongClickListener);

        }

    }



    public void setOnHoverListener(View.OnHoverListener hoverListener) {

        mOnHoverListener = hoverListener;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setOnHoverListener(mOnHoverListener);

        }

    }



    public void setAccessibilityDelegate(AccessibilityDelegate delegate) {

        mAccessibilityDelegate = delegate;

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            mViews.get(i).setAccessibilityDelegate(delegate);

        }

    }



    public void setTranslation(int x, int y, int z) {

        final int N = mViews.size();

        for (int i = 0; i < N; i++) {

        final int numViews = mViews.size();

        for (int i = 0; i < numViews; i++) {

            final View view = mViews.get(i);

            view.setTranslationX(x);

            view.setTranslationY(y);

core/java/android/inputmethodservice/navigationbar/DeadZone.java

+8 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ final class DeadZone { 
        }

    };



    public DeadZone(NavigationBarView view) {

    DeadZone(NavigationBarView view) {

        mNavigationBarView = view;

        onConfigurationChanged(Surface.ROTATION_0);

    }
@@ -92,13 +92,15 @@ final class DeadZone { 
    }



    private float getSize(long now) {

        if (mSizeMax == 0)

        if (mSizeMax == 0) {

            return 0;

        }

        long dt = (now - mLastPokeTime);

        if (dt > mHold + mDecay)

        if (dt > mHold + mDecay) {

            return mSizeMin;

        if (dt < mHold)

        } else if (dt < mHold) {

            return mSizeMax;

        }

        return (int) lerp(mSizeMax, mSizeMin, (float) (dt - mHold) / mDecay);

    }
@@ -177,8 +179,9 @@ final class DeadZone { 


    private void poke(MotionEvent event) {

        mLastPokeTime = event.getEventTime();

        if (DEBUG)

        if (DEBUG) {

            Log.v(TAG, "poked! size=" + getSize(mLastPokeTime));

        }

        if (mShouldFlash) mNavigationBarView.postInvalidate();

    }

core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java

+23 −23
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ final class KeyButtonDrawable extends Drawable { 
        }

    };



    public KeyButtonDrawable(Drawable d, @ColorInt int lightColor, @ColorInt int darkColor,

    KeyButtonDrawable(Drawable d, @ColorInt int lightColor, @ColorInt int darkColor,

            boolean horizontalFlip, Color ovalBackgroundColor) {

        this(d, new ShadowDrawableState(lightColor, darkColor,

                d instanceof AnimatedVectorDrawable, horizontalFlip, ovalBackgroundColor));
@@ -433,8 +433,8 @@ final class KeyButtonDrawable extends Drawable { 
        final boolean mSupportsAnimation;

        final Color mOvalBackgroundColor;



        public ShadowDrawableState(@ColorInt int lightColor, @ColorInt int darkColor,

                boolean animated, boolean horizontalFlip, Color ovalBackgroundColor) {

        ShadowDrawableState(@ColorInt int lightColor, @ColorInt int darkColor, boolean animated,

                boolean horizontalFlip, Color ovalBackgroundColor) {

            mLightColor = lightColor;

            mDarkColor = darkColor;

            mSupportsAnimation = animated;

core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java

+8 −8
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ final class KeyButtonRipple extends Drawable { 


    private Type mType = Type.ROUNDED_RECT;



    public KeyButtonRipple(Context ctx, View targetView, @DimenRes int maxWidthResource) {

    KeyButtonRipple(Context ctx, View targetView, @DimenRes int maxWidthResource) {

        mMaxWidthResource = maxWidthResource;

        mMaxWidth = ctx.getResources().getDimensionPixelSize(maxWidthResource);

        mTargetView = targetView;

core/java/android/inputmethodservice/navigationbar/KeyButtonView.java

+6 −5
Original line number Diff line number Diff line
@@ -272,12 +272,13 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
                : KeyButtonRipple.Type.ROUNDED_RECT);

    }



    @Override

    public void playSoundEffect(int soundConstant) {

        if (!mPlaySounds) return;

        mAudioManager.playSoundEffect(soundConstant);

    }



    public void sendEvent(int action, int flags) {

    private void sendEvent(int action, int flags) {

        sendEvent(action, flags, SystemClock.uptimeMillis());

    }
@@ -309,8 +310,8 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
            switch (action) {

                case KeyEvent.ACTION_DOWN:

                    handled = ims.onKeyDown(ev.getKeyCode(), ev);

                    mTracking = handled && ev.getRepeatCount() == 0 &&

                            (ev.getFlags() & KeyEvent.FLAG_START_TRACKING) != 0;

                    mTracking = handled && ev.getRepeatCount() == 0

                            && (ev.getFlags() & KeyEvent.FLAG_START_TRACKING) != 0;

                    break;

                case KeyEvent.ACTION_UP:

                    handled = ims.onKeyUp(ev.getKeyCode(), ev);