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

Commit 00e8a2fa authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Conslidate @MainHandler and similar to @Main (and similar). 

@MainHandler, @MainLooper, @MainResources -> @Main
@BgHandler, @BgLooper -> @Background.

Also, move the providers for Handlers and Loopers into the
ConcurrencyModule.

Bug: 146510722
Test: atest SystemUITests
Change-Id: I991735e1fdca397784427409a2ae696a7374f584
parent d9c43431

packages/CarSystemUI/src/com/android/systemui/car/CarDeviceProvisionedControllerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.provider.Settings; 


import com.android.systemui.Dependency;

import com.android.systemui.broadcast.BroadcastDispatcher;

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl;



import javax.inject.Inject;
@@ -54,7 +54,7 @@ public class CarDeviceProvisionedControllerImpl extends DeviceProvisionedControl 
    private final ContentResolver mContentResolver;



    @Inject

    public CarDeviceProvisionedControllerImpl(Context context, @MainHandler Handler mainHandler,

    public CarDeviceProvisionedControllerImpl(Context context, @Main Handler mainHandler,

            BroadcastDispatcher broadcastDispatcher) {

        super(context, mainHandler, broadcastDispatcher);

        mContentResolver = context.getContentResolver();

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.systemui.R; 
import com.android.systemui.SystemUI;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.CarDeviceProvisionedListener;

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

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

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;
@@ -93,7 +93,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
            DeviceProvisionedController deviceProvisionedController,

            CommandQueue commandQueue,

            Lazy<FacetButtonTaskStackListener> facetButtonTaskStackListenerLazy,

            @MainHandler Handler mainHandler,

            @Main Handler mainHandler,

            Lazy<KeyguardStateController> keyguardStateControllerLazy,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            SuperStatusBarViewFactory superStatusBarViewFactory,

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.widget.TextView; 


import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.R;

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

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



import javax.inject.Inject;

import javax.inject.Singleton;
@@ -68,7 +68,7 @@ class CarTrustAgentUnlockDialogHelper extends BroadcastReceiver{ 
    private OnHideListener mOnHideListener;



    @Inject

    CarTrustAgentUnlockDialogHelper(Context context, @MainResources Resources resources,

    CarTrustAgentUnlockDialogHelper(Context context, @Main Resources resources,

            UserManager userManager, WindowManager windowManager) {

        mContext = context;

        mResources = resources;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import androidx.recyclerview.widget.GridLayoutManager; 
import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.R;

import com.android.systemui.car.CarServiceProvider;

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

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

import com.android.systemui.statusbar.car.CarTrustAgentUnlockDialogHelper.OnHideListener;

import com.android.systemui.statusbar.car.UserGridRecyclerView.UserRecord;
@@ -78,7 +78,7 @@ public class FullscreenUserSwitcher { 
    @Inject

    public FullscreenUserSwitcher(

            Context context,

            @MainResources Resources resources,

            @Main Resources resources,

            UserManager userManager,

            CarServiceProvider carServiceProvider,

            CarTrustAgentUnlockDialogHelper carTrustAgentUnlockDialogHelper) {

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.internal.telephony.TelephonyIntents; 
import com.android.settingslib.WirelessUtils;

import com.android.systemui.Dependency;

import com.android.systemui.R;

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

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

import com.android.systemui.keyguard.WakefulnessLifecycle;



import java.util.List;
@@ -608,7 +608,7 @@ public class CarrierTextController { 
        private boolean mShowMissingSim;



        @Inject

        public Builder(Context context, @MainResources Resources resources) {

        public Builder(Context context, @Main Resources resources) {

            mContext = context;

            mSeparator = resources.getString(

                    com.android.internal.R.string.kg_text_message_separator);