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

Commit c11cf1dd authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge changes Icc662b53,I16e3522a,I170ae0e2 into main 

* changes:
  Deprecate 2 methods
  Deprecate startExpandLatencyTracking
  Move performHapticFeedback to ShadeController
parents a71cfd64 c483a569

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+4 −6
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.dagger.SysUISingleton;

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

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.KeyguardWmStateRefactor;

import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -146,7 +145,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
    private static final long MAX_BACKOFF_MILLIS = 10 * 60 * 1000;



    private final Context mContext;

    private final FeatureFlags mFeatureFlags;

    private final SceneContainerFlags mSceneContainerFlags;

    private final Executor mMainExecutor;

    private final ShellInterface mShellInterface;
@@ -209,8 +207,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        @Override

        public void onStatusBarTouchEvent(MotionEvent event) {

            verifyCallerAndClearCallingIdentity("onStatusBarTouchEvent", () -> {

                // TODO move this logic to message queue

                if (event.getActionMasked() == ACTION_DOWN) {

                if (mSceneContainerFlags.isEnabled()) {

                    //TODO(b/329863123) implement latency tracking for shade scene

                    Log.i(TAG_OPS, "Scene container enabled. Latency tracking not started.");

                } else if (event.getActionMasked() == ACTION_DOWN) {

                    mShadeViewControllerLazy.get().startExpandLatencyTracking();

                }

                mHandler.post(() -> {
@@ -600,7 +600,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
            KeyguardUnlockAnimationController sysuiUnlockAnimationController,

            InWindowLauncherUnlockAnimationManager inWindowLauncherUnlockAnimationManager,

            AssistUtils assistUtils,

            FeatureFlags featureFlags,

            SceneContainerFlags sceneContainerFlags,

            DumpManager dumpManager,

            Optional<UnfoldTransitionProgressForwarder> unfoldTransitionProgressForwarder,
@@ -613,7 +612,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        }



        mContext = context;

        mFeatureFlags = featureFlags;

        mSceneContainerFlags = sceneContainerFlags;

        mMainExecutor = mainExecutor;

        mShellInterface = shellInterface;

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −1
Original line number Diff line number Diff line
@@ -3257,7 +3257,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mKeyguardStatusViewController.setStatusAccessibilityImportance(mode);

    }



    @Override

    public void performHapticFeedback(int constant) {

        mVibratorHelper.performHapticFeedback(mView, constant);

    }

packages/SystemUI/src/com/android/systemui/shade/ShadeController.java

+7 −0
Original line number Diff line number Diff line
@@ -232,6 +232,13 @@ public interface ShadeController extends CoreStartable { 
    /** Called when a launch animation ends. */

    void onLaunchAnimationEnd(boolean launchIsFullScreen);



    /**

     * Performs haptic feedback from a view with a haptic feedback constant.

     *

     * @param constant One of android.view.HapticFeedbackConstants

     */

    void performHapticFeedback(int constant);



    /** Sets the listener for when the visibility of the shade changes. */

    default void setVisibilityListener(ShadeVisibilityListener listener) {}

packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -63,4 +63,5 @@ open class ShadeControllerEmptyImpl @Inject constructor() : ShadeController { 
    override fun onStatusBarTouch(event: MotionEvent?) {}

    override fun onLaunchAnimationCancelled(isLaunchForActivity: Boolean) {}

    override fun onLaunchAnimationEnd(launchIsFullScreen: Boolean) {}

    override fun performHapticFeedback(constant: Int) {}

}

packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -270,6 +270,11 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { 
        }

    }



    @Override

    public void performHapticFeedback(int constant) {

        getNpvc().performHapticFeedback(constant);

    }



    @Override

    public void instantCollapseShade() {

        getNpvc().instantCollapse();