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

Commit dfc53c20 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add temporary logging for stuck nav button feedback" into rvc-dev am:... 

Merge "Add temporary logging for stuck nav button feedback" into rvc-dev am: f587b12e am: 676bfaba am: 50d2b09f

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

Change-Id: Iba983f3e85cd4e5849959903a408ab0f83ab9be2
parents 6288e6e2 50d2b09f

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java

+9 −4
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.graphics.PixelFormat; 
import android.graphics.RecordingCanvas;

import android.graphics.RecordingCanvas;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.os.Handler;

import android.util.Log;

import android.view.RenderNodeAnimator;

import android.view.RenderNodeAnimator;

import android.view.View;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewConfiguration;
@@ -220,7 +221,7 @@ public class KeyButtonRipple extends Drawable { 




    @Override

    @Override

    public void jumpToCurrentState() {

    public void jumpToCurrentState() {

        cancelAnimations();

        cancelAnimations("jumpToCurrentState");

    }

    }





    @Override

    @Override
@@ -234,6 +235,7 @@ public class KeyButtonRipple extends Drawable { 
    }

    }





    public void setPressed(boolean pressed) {

    public void setPressed(boolean pressed) {

        Log.d("b/63783866", "KeyButtonRipple.setPressed: pressed=" + pressed);

        if (mDark != mLastDark && pressed) {

        if (mDark != mLastDark && pressed) {

            mRipplePaint = null;

            mRipplePaint = null;

            mLastDark = mDark;

            mLastDark = mDark;
@@ -253,7 +255,8 @@ public class KeyButtonRipple extends Drawable { 
        mHandler.removeCallbacksAndMessages(null);

        mHandler.removeCallbacksAndMessages(null);

    }

    }





    private void cancelAnimations() {

    private void cancelAnimations(String reason) {

        Log.d("b/63783866", "KeyButtonRipple.cancelAnimations: reason=" + reason);

        mVisible = false;

        mVisible = false;

        mTmpArray.addAll(mRunningAnimations);

        mTmpArray.addAll(mRunningAnimations);

        int size = mTmpArray.size();

        int size = mTmpArray.size();
@@ -284,7 +287,7 @@ public class KeyButtonRipple extends Drawable { 
    }

    }





    private void enterSoftware() {

    private void enterSoftware() {

        cancelAnimations();

        cancelAnimations("enterSoftware");

        mVisible = true;

        mVisible = true;

        mGlowAlpha = getMaxGlowAlpha();

        mGlowAlpha = getMaxGlowAlpha();

        ObjectAnimator scaleAnimator = ObjectAnimator.ofFloat(this, "glowScale",

        ObjectAnimator scaleAnimator = ObjectAnimator.ofFloat(this, "glowScale",
@@ -370,7 +373,8 @@ public class KeyButtonRipple extends Drawable { 
    }

    }





    private void enterHardware() {

    private void enterHardware() {

        cancelAnimations();

        Log.d("b/63783866", "enterHardware");

        cancelAnimations("enterHardware");

        mVisible = true;

        mVisible = true;

        mDrawingHardwareGlow = true;

        mDrawingHardwareGlow = true;

        setExtendStart(CanvasProperty.createFloat(getExtendSize() / 2));

        setExtendStart(CanvasProperty.createFloat(getExtendSize() / 2));
@@ -422,6 +426,7 @@ public class KeyButtonRipple extends Drawable { 
    }

    }





    private void exitHardware() {

    private void exitHardware() {

        Log.d("b/63783866", "exitHardware");

        mPaintProp = CanvasProperty.createPaint(getRipplePaint());

        mPaintProp = CanvasProperty.createPaint(getRipplePaint());

        final RenderNodeAnimator opacityAnim = new RenderNodeAnimator(mPaintProp,

        final RenderNodeAnimator opacityAnim = new RenderNodeAnimator(mPaintProp,

                RenderNodeAnimator.PAINT_ALPHA, 0);

                RenderNodeAnimator.PAINT_ALPHA, 0);

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -441,6 +441,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 




    @Override

    @Override

    public void abortCurrentGesture() {

    public void abortCurrentGesture() {

        Log.d("b/63783866", "KeyButtonView.abortCurrentGesture");

        setPressed(false);

        setPressed(false);

        mRipple.abortDelayedRipple();

        mRipple.abortDelayedRipple();

        mGestureAborted = true;

        mGestureAborted = true;