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

Commit b25fe0a8 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge changes I9029ad1a,I59c45fd1 into main 

* changes:
  Add testHomeLongPressOverride
  Speed up Home ripple if Launcher has requested override.
parents 3397af24 542ba7af

packages/SystemUI/shared/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java

+31 −3
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.os.Looper;

import android.os.Trace;

import android.view.RenderNodeAnimator;

import android.view.View;
@@ -48,6 +49,7 @@ public class KeyButtonRipple extends Drawable { 
    private static final float GLOW_MAX_ALPHA_DARK = 0.1f;

    private static final int ANIMATION_DURATION_SCALE = 350;

    private static final int ANIMATION_DURATION_FADE = 450;

    private static final int ANIMATION_DURATION_FADE_FAST = 80;

    private static final Interpolator ALPHA_OUT_INTERPOLATOR =

            new PathInterpolator(0f, 0f, 0.8f, 1f);
@@ -71,6 +73,9 @@ public class KeyButtonRipple extends Drawable { 
    private boolean mLastDark;

    private boolean mDark;

    private boolean mDelayTouchFeedback;

    private boolean mSpeedUpNextFade;

    // When non-null, this runs the next time this ripple is drawn invisibly.

    private Runnable mOnInvisibleRunnable;



    private final Interpolator mInterpolator = new LogInterpolator();

    private boolean mSupportHardware;
@@ -112,6 +117,18 @@ public class KeyButtonRipple extends Drawable { 
        mDelayTouchFeedback = delay;

    }



    /** Next time we fade out (pressed==false), use a shorter duration than the standard. */

    public void speedUpNextFade() {

        mSpeedUpNextFade = true;

    }



    /**

     *  @param onInvisibleRunnable run after we are next drawn invisibly. Only used once.

     */

    void setOnInvisibleRunnable(Runnable onInvisibleRunnable) {

        mOnInvisibleRunnable = onInvisibleRunnable;

    }



    public void setType(Type type) {

        mType = type;

    }
@@ -161,6 +178,11 @@ public class KeyButtonRipple extends Drawable { 
        } else {

            drawSoftware(canvas);

        }



        if (!mPressed && !mVisible && mOnInvisibleRunnable != null) {

            new Handler(Looper.getMainLooper()).post(mOnInvisibleRunnable);

            mOnInvisibleRunnable = null;

        }

    }



    @Override
@@ -270,7 +292,7 @@ public class KeyButtonRipple extends Drawable { 
        return true;

    }



    public void setPressed(boolean pressed) {

    private void setPressed(boolean pressed) {

        if (mDark != mLastDark && pressed) {

            mRipplePaint = null;

            mLastDark = mDark;
@@ -350,7 +372,7 @@ public class KeyButtonRipple extends Drawable { 
    private void exitSoftware() {

        ObjectAnimator alphaAnimator = ObjectAnimator.ofFloat(this, "glowAlpha", mGlowAlpha, 0f);

        alphaAnimator.setInterpolator(ALPHA_OUT_INTERPOLATOR);

        alphaAnimator.setDuration(ANIMATION_DURATION_FADE);

        alphaAnimator.setDuration(getFadeDuration());

        alphaAnimator.addListener(mAnimatorListener);

        alphaAnimator.start();

        mRunningAnimations.add(alphaAnimator);
@@ -414,6 +436,12 @@ public class KeyButtonRipple extends Drawable { 
        return Math.min(size, mMaxWidth);

    }



    private int getFadeDuration() {

        int duration = mSpeedUpNextFade ? ANIMATION_DURATION_FADE_FAST : ANIMATION_DURATION_FADE;

        mSpeedUpNextFade = false;

        return duration;

    }



    private void enterHardware() {

        endAnimations("enterHardware", true /* cancel */);

        mVisible = true;
@@ -471,7 +499,7 @@ public class KeyButtonRipple extends Drawable { 
        mPaintProp = CanvasProperty.createPaint(getRipplePaint());

        final RenderNodeAnimator opacityAnim = new RenderNodeAnimator(mPaintProp,

                RenderNodeAnimator.PAINT_ALPHA, 0);

        opacityAnim.setDuration(ANIMATION_DURATION_FADE);

        opacityAnim.setDuration(getFadeDuration());

        opacityAnim.setInterpolator(ALPHA_OUT_INTERPOLATOR);

        opacityAnim.addListener(mAnimatorListener);

        opacityAnim.addListener(mExitHwTraceAnimator);

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+11 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,17 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        args.putInt(

                AssistManager.INVOCATION_TYPE_KEY,

                AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);

        // If Launcher has requested to override long press home, add a delay for the ripple.

        // TODO(b/304146255): Remove this delay once we can exclude 3-button nav from screenshot.

        boolean delayAssistInvocation = mAssistManagerLazy.get().shouldOverrideAssist(

                AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);

        // In practice, I think v should always be a KeyButtonView, but just being safe.

        if (delayAssistInvocation && v instanceof KeyButtonView) {

            ((KeyButtonView) v).setOnRippleInvisibleRunnable(

                    () -> mAssistManagerLazy.get().startAssist(args));

        } else {

            mAssistManagerLazy.get().startAssist(args);

        }

        mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::awakenDreams);

        mView.abortCurrentGesture();

        return true;

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import com.android.app.animation.Interpolators; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settingslib.Utils;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.res.R;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.buttons.ButtonDispatcher;

import com.android.systemui.navigationbar.buttons.ContextualButton;
@@ -73,6 +72,7 @@ import com.android.systemui.navigationbar.buttons.NearestTouchFrame; 
import com.android.systemui.navigationbar.buttons.RotationContextButton;

import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;

import com.android.systemui.recents.Recents;

import com.android.systemui.res.R;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.shared.rotation.FloatingRotationButton;

packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java

+13 −1
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.logging.UiEventLoggerImpl;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.Dependency;

import com.android.systemui.res.R;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.res.R;

import com.android.systemui.shared.system.QuickStepContract;



public class KeyButtonView extends ImageView implements ButtonInterface {
@@ -439,11 +440,22 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
        if (mCode != KeyEvent.KEYCODE_UNKNOWN) {

            sendEvent(KeyEvent.ACTION_UP, KeyEvent.FLAG_CANCELED);

        }

        // When aborting long-press home and Launcher has requested to override it, fade out the

        // ripple more quickly.

        if (mCode == KeyEvent.KEYCODE_HOME && Dependency.get(AssistManager.class)

                .shouldOverrideAssist(AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS)) {

            mRipple.speedUpNextFade();

        }

        setPressed(false);

        mRipple.abortDelayedRipple();

        mGestureAborted = true;

    }



    /** Run when the ripple for this button is next invisible. Only used once. */

    public void setOnRippleInvisibleRunnable(Runnable onRippleInvisibleRunnable) {

        mRipple.setOnInvisibleRunnable(onRippleInvisibleRunnable);

    }



    @Override

    public void setDarkIntensity(float darkIntensity) {

        mDarkIntensity = darkIntensity;

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java

+34 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; 
import static android.view.WindowInsets.Type.ime;



import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_BUTTON_LONG_PRESS_DURATION_MS;

import static com.android.systemui.assist.AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS;

import static com.android.systemui.navigationbar.NavigationBar.NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
@@ -42,6 +43,7 @@ import static org.mockito.Matchers.eq; 
import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -86,6 +88,7 @@ import com.android.systemui.keyguard.WakefulnessLifecycle; 
import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.buttons.ButtonDispatcher;

import com.android.systemui.navigationbar.buttons.DeadZone;

import com.android.systemui.navigationbar.buttons.KeyButtonView;

import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.recents.OverviewProxyService;
@@ -120,6 +123,7 @@ import org.junit.Before; 
import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;
@@ -143,6 +147,8 @@ public class NavigationBarTest extends SysuiTestCase { 
    @Mock

    ButtonDispatcher mHomeButton;

    @Mock

    KeyButtonView mHomeButtonView;

    @Mock

    ButtonDispatcher mRecentsButton;

    @Mock

    ButtonDispatcher mAccessibilityButton;
@@ -294,11 +300,38 @@ public class NavigationBarTest extends SysuiTestCase { 


    @Test

    public void testHomeLongPress() {

        when(mAssistManager.shouldOverrideAssist(INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS))

                .thenReturn(false);



        mNavigationBar.init();

        mNavigationBar.onViewAttached();

        mNavigationBar.onHomeLongClick(mNavigationBar.getView());

        mNavigationBar.onHomeLongClick(mHomeButtonView);



        verify(mUiEventLogger, times(1)).log(NAVBAR_ASSIST_LONGPRESS);

        verify(mAssistManager).startAssist(any());

    }



    @Test

    public void testHomeLongPressOverride() {

        when(mAssistManager.shouldOverrideAssist(INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS))

                .thenReturn(true);



        mNavigationBar.init();

        mNavigationBar.onViewAttached();

        mNavigationBar.onHomeLongClick(mHomeButtonView);



        verify(mUiEventLogger, times(1)).log(NAVBAR_ASSIST_LONGPRESS);



        ArgumentCaptor<Runnable> onRippleInvisibleRunnableCaptor = ArgumentCaptor.forClass(

                Runnable.class);

        // startAssist is not called initially

        verify(mAssistManager, never()).startAssist(any());

        // but a Runnable is added for when the ripple is invisible

        verify(mHomeButtonView).setOnRippleInvisibleRunnable(

                onRippleInvisibleRunnableCaptor.capture());

        // and when that runs, startAssist is called

        onRippleInvisibleRunnableCaptor.getValue().run();

        verify(mAssistManager).startAssist(any());

    }



    @Test