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

Commit 1744218e authored by Juan Sebastian Martinez's avatar Juan Sebastian Martinez Committed by Android (Google) Code Review
Browse files

Merge "Cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION on... 

Merge "Cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION on CentralSurfacesCommandQueueCallbacks" into main
parents 05470397 4f0a94c2

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java

+5 −19
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.statusbar.phone;



import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING;
@@ -42,25 +41,23 @@ import androidx.annotation.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

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

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.res.R;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.camera.CameraIntents;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.DisplayId;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.recents.ScreenPinningRequest;

import com.android.systemui.res.R;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.CameraLauncher;

import com.android.systemui.shade.QuickSettingsController;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.disableflags.DisableFlagsLogger;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -97,7 +94,6 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 
    private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    private final StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager;

    private final PowerManager mPowerManager;

    private final VibratorHelper mVibratorHelper;

    private final Optional<Vibrator> mVibratorOptional;

    private final DisableFlagsLogger mDisableFlagsLogger;

    private final int mDisplayId;
@@ -108,8 +104,6 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 
    private final Lazy<CameraLauncher> mCameraLauncherLazy;

    private final QuickSettingsController mQsController;

    private final QSHost mQSHost;

    private final FeatureFlags mFeatureFlags;



    private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES =

            VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK);
@@ -139,15 +133,13 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 
            NotificationStackScrollLayoutController notificationStackScrollLayoutController,

            StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,

            PowerManager powerManager,

            VibratorHelper vibratorHelper,

            Optional<Vibrator> vibratorOptional,

            DisableFlagsLogger disableFlagsLogger,

            @DisplayId int displayId,

            Lazy<CameraLauncher> cameraLauncherLazy,

            UserTracker userTracker,

            QSHost qsHost,

            ActivityStarter activityStarter,

            FeatureFlags featureFlags) {

            ActivityStarter activityStarter) {

        mCentralSurfaces = centralSurfaces;

        mQsController = quickSettingsController;

        mContext = context;
@@ -168,14 +160,12 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 
        mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;

        mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager;

        mPowerManager = powerManager;

        mVibratorHelper = vibratorHelper;

        mVibratorOptional = vibratorOptional;

        mDisableFlagsLogger = disableFlagsLogger;

        mDisplayId = displayId;

        mCameraLauncherLazy = cameraLauncherLazy;

        mUserTracker = userTracker;

        mQSHost = qsHost;

        mFeatureFlags = featureFlags;



        mVibrateOnOpening = resources.getBoolean(R.bool.config_vibrateOnIconAnimation);

        mCameraLaunchGestureVibrationEffect = getCameraGestureVibrationEffect(
@@ -544,12 +534,8 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 


    @VisibleForTesting

    void vibrateOnNavigationKeyDown() {

        if (mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) {

        mShadeViewController.performHapticFeedback(

                HapticFeedbackConstants.GESTURE_START

        );

        } else {

            mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);

        }

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java

+2 −22
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.statusbar.phone; 


import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;
@@ -30,7 +28,6 @@ import android.app.ActivityManager; 
import android.app.StatusBarManager;

import android.os.PowerManager;

import android.os.UserHandle;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.testing.AndroidTestingRunner;

import android.view.HapticFeedbackConstants;
@@ -42,7 +39,6 @@ import com.android.internal.logging.testing.FakeMetricsLogger; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.QSHost;
@@ -53,7 +49,6 @@ import com.android.systemui.shade.QuickSettingsController; 
import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.disableflags.DisableFlagsLogger;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -94,14 +89,12 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { 
    @Mock private DozeServiceHost mDozeServiceHost;

    @Mock private NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    @Mock private PowerManager mPowerManager;

    @Mock private VibratorHelper mVibratorHelper;

    @Mock private Vibrator mVibrator;

    @Mock private StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager;

    @Mock private Lazy<CameraLauncher> mCameraLauncherLazy;

    @Mock private UserTracker mUserTracker;

    @Mock private QSHost mQSHost;

    @Mock private ActivityStarter mActivityStarter;

    private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();



    CentralSurfacesCommandQueueCallbacks mSbcqCallbacks;
@@ -131,15 +124,13 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { 
                mNotificationStackScrollLayoutController,

                mStatusBarHideIconsForBouncerManager,

                mPowerManager,

                mVibratorHelper,

                Optional.of(mVibrator),

                new DisableFlagsLogger(),

                DEFAULT_DISPLAY,

                mCameraLauncherLazy,

                mUserTracker,

                mQSHost,

                mActivityStarter,

                mFeatureFlags);

                mActivityStarter);



        when(mUserTracker.getUserHandle()).thenReturn(

                UserHandle.of(ActivityManager.getCurrentUser()));
@@ -192,18 +183,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { 
    }



    @Test

    public void vibrateOnNavigationKeyDown_oneWayHapticsDisabled_usesVibrate() {

        mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false);



        mSbcqCallbacks.vibrateOnNavigationKeyDown();



        verify(mVibratorHelper).vibrate(VibrationEffect.EFFECT_TICK);

    }



    @Test

    public void vibrateOnNavigationKeyDown_oneWayHapticsEnabled_usesPerformHapticFeedback() {

        mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);



    public void vibrateOnNavigationKeyDown_usesPerformHapticFeedback() {

        mSbcqCallbacks.vibrateOnNavigationKeyDown();



        verify(mShadeViewController).performHapticFeedback(