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

Commit 5004ac06 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: f587b12e 

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

Change-Id: I6f3d66163ab951b63fd425704e082dfa89fa1000
parents ebfefd8c f587b12e

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

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

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.util.Log;

import android.view.RenderNodeAnimator;

import android.view.View;

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


    @Override

    public void jumpToCurrentState() {

        cancelAnimations();

        cancelAnimations("jumpToCurrentState");

    }



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



    public void setPressed(boolean pressed) {

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

        if (mDark != mLastDark && pressed) {

            mRipplePaint = null;

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

    }



    private void cancelAnimations() {

    private void cancelAnimations(String reason) {

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

        mVisible = false;

        mTmpArray.addAll(mRunningAnimations);

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



    private void enterSoftware() {

        cancelAnimations();

        cancelAnimations("enterSoftware");

        mVisible = true;

        mGlowAlpha = getMaxGlowAlpha();

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



    private void enterHardware() {

        cancelAnimations();

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

        cancelAnimations("enterHardware");

        mVisible = true;

        mDrawingHardwareGlow = true;

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



    private void exitHardware() {

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

        mPaintProp = CanvasProperty.createPaint(getRipplePaint());

        final RenderNodeAnimator opacityAnim = new RenderNodeAnimator(mPaintProp,

                RenderNodeAnimator.PAINT_ALPHA, 0);

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

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


    @Override

    public void abortCurrentGesture() {

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

        setPressed(false);

        mRipple.abortDelayedRipple();

        mGestureAborted = true;