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

Commit daa8512b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use injected main thread handler in LightBarTransitionsController" into main

parents c9d0538f 16b71aef

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LightBarTransitionsControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public class LightBarTransitionsControllerTest extends SysuiTestCase { 
    @Mock

    private StatusBarStateController mStatusBarStateController;

    @Mock

    private Handler mMainHandler;

    @Mock

    private Handler mBgHandler;



    private LightBarTransitionsController mLightBarTransitionsController;
@@ -67,7 +69,7 @@ public class LightBarTransitionsControllerTest extends SysuiTestCase { 
    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mLightBarTransitionsController = new LightBarTransitionsController(mContext,

        mLightBarTransitionsController = new LightBarTransitionsController(mContext, mMainHandler,

                mBgHandler, mApplier, new CommandQueue(mContext, new FakeDisplayTracker(mContext)),

                mKeyguardStateController, mStatusBarStateController);

    }

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

+7 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.app.animation.Interpolators; 
import com.android.internal.policy.GestureNavigationSettingsObserver;

import com.android.systemui.Dumpable;

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

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

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

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

import com.android.systemui.statusbar.CommandQueue;
@@ -94,7 +95,7 @@ public class LightBarTransitionsController implements Dumpable { 


    private final Callback mCallback;



    private final Handler mHandler;

    private final Handler mMainHandler;

    private final DarkIntensityApplier mApplier;

    private final KeyguardStateController mKeyguardStateController;

    private final StatusBarStateController mStatusBarStateController;
@@ -125,13 +126,14 @@ public class LightBarTransitionsController implements Dumpable { 
    @AssistedInject

    public LightBarTransitionsController(

            Context context,

            @Main Handler mainHandler,

            @Background Handler bgHandler,

            @Assisted DarkIntensityApplier applier,

            CommandQueue commandQueue,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController) {

        mApplier = applier;

        mHandler = new Handler();

        mMainHandler = mainHandler;

        mKeyguardStateController = keyguardStateController;

        mStatusBarStateController = statusBarStateController;

        mCommandQueue = commandQueue;
@@ -142,7 +144,7 @@ public class LightBarTransitionsController implements Dumpable { 
        mContext = context;

        mDisplayId = mContext.getDisplayId();

        mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver(

                mHandler, bgHandler, mContext, this::onNavigationSettingsChanged);

                mMainHandler, bgHandler, mContext, this::onNavigationSettingsChanged);

        mGestureNavigationSettingsObserver.register();

        onNavigationSettingsChanged();

    }
@@ -201,8 +203,8 @@ public class LightBarTransitionsController implements Dumpable { 
            mTransitionDeferring = true;

            mTransitionDeferringStartTime = startTime;

            mTransitionDeferringDuration = duration;

            mHandler.removeCallbacks(mTransitionDeferringDoneRunnable);

            mHandler.postAtTime(mTransitionDeferringDoneRunnable, startTime);

            mMainHandler.removeCallbacks(mTransitionDeferringDoneRunnable);

            mMainHandler.postAtTime(mTransitionDeferringDoneRunnable, startTime);

        }

        mTransitionPending = false;

    }