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

Commit 2e2acdc6 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge changes I0d5d51a6,I009b5e22,I2ab24449 into tm-qpr-dev am: 786b3af7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19758718



Change-Id: I7433a160c335e2ec03e4a8aa9dcf328c3f5f3be1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f370406a 786b3af7

packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java

+6 −3
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothAdapter; 
import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;

import com.android.systemui.CoreStartable;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;
@@ -61,6 +60,7 @@ import java.util.List; 
import java.util.Set;



import javax.inject.Inject;

import javax.inject.Provider;



/** */

@SysUISingleton
@@ -106,6 +106,8 @@ public class KeyboardUI extends CoreStartable implements InputManager.OnTabletMo 


    protected volatile Context mContext;



    private final Provider<LocalBluetoothManager> mBluetoothManagerProvider;



    private boolean mEnabled;

    private String mKeyboardName;

    private CachedBluetoothDeviceManager mCachedDeviceManager;
@@ -122,8 +124,9 @@ public class KeyboardUI extends CoreStartable implements InputManager.OnTabletMo 
    private int mState;



    @Inject

    public KeyboardUI(Context context) {

    public KeyboardUI(Context context, Provider<LocalBluetoothManager> bluetoothManagerProvider) {

        super(context);

        this.mBluetoothManagerProvider = bluetoothManagerProvider;

    }



    @Override
@@ -181,7 +184,7 @@ public class KeyboardUI extends CoreStartable implements InputManager.OnTabletMo 
            return;

        }



        LocalBluetoothManager bluetoothManager = Dependency.get(LocalBluetoothManager.class);

        LocalBluetoothManager bluetoothManager = mBluetoothManagerProvider.get();

        if (bluetoothManager == null)  {

            if (DEBUG) {

                Slog.e(TAG, "Failed to retrieve LocalBluetoothManager instance");

packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java

+7 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.util.Pair; 
import com.android.internal.messages.nano.SystemMessageProto;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.systemui.CoreStartable;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.UiBackground;
@@ -76,20 +75,22 @@ public class InstantAppNotifier extends CoreStartable 
    private final Executor mUiBgExecutor;

    private final ArraySet<Pair<String, Integer>> mCurrentNotifs = new ArraySet<>();

    private final CommandQueue mCommandQueue;

    private KeyguardStateController mKeyguardStateController;

    private final KeyguardStateController mKeyguardStateController;



    @Inject

    public InstantAppNotifier(Context context, CommandQueue commandQueue,

            @UiBackground Executor uiBgExecutor) {

    public InstantAppNotifier(

            Context context,

            CommandQueue commandQueue,

            @UiBackground Executor uiBgExecutor,

            KeyguardStateController keyguardStateController) {

        super(context);

        mCommandQueue = commandQueue;

        mUiBgExecutor = uiBgExecutor;

        mKeyguardStateController = keyguardStateController;

    }



    @Override

    public void start() {

        mKeyguardStateController = Dependency.get(KeyguardStateController.class);



        // listen for user / profile change.

        try {

            ActivityManager.getService().registerUserSwitchObserver(mUserSwitchListener, TAG);

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

+9 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.widget.LinearLayout.LayoutParams; 
import androidx.annotation.VisibleForTesting;



import com.android.internal.statusbar.StatusBarIcon;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.demomode.DemoModeCommandReceiver;
@@ -137,11 +136,12 @@ public interface StatusBarIconController { 
                LinearLayout linearLayout,

                FeatureFlags featureFlags,

                StatusBarPipelineFlags statusBarPipelineFlags,

                Provider<WifiViewModel> wifiViewModelProvider) {

                Provider<WifiViewModel> wifiViewModelProvider,

                DarkIconDispatcher darkIconDispatcher) {

            super(linearLayout, featureFlags, statusBarPipelineFlags, wifiViewModelProvider);

            mIconHPadding = mContext.getResources().getDimensionPixelSize(

                    R.dimen.status_bar_icon_padding);

            mDarkIconDispatcher = Dependency.get(DarkIconDispatcher.class);

            mDarkIconDispatcher = darkIconDispatcher;

        }



        @Override
@@ -198,20 +198,24 @@ public interface StatusBarIconController { 
            private final FeatureFlags mFeatureFlags;

            private final StatusBarPipelineFlags mStatusBarPipelineFlags;

            private final Provider<WifiViewModel> mWifiViewModelProvider;

            private final DarkIconDispatcher mDarkIconDispatcher;



            @Inject

            public Factory(

                    FeatureFlags featureFlags,

                    StatusBarPipelineFlags statusBarPipelineFlags,

                    Provider<WifiViewModel> wifiViewModelProvider) {

                    Provider<WifiViewModel> wifiViewModelProvider,

                    DarkIconDispatcher darkIconDispatcher) {

                mFeatureFlags = featureFlags;

                mStatusBarPipelineFlags = statusBarPipelineFlags;

                mWifiViewModelProvider = wifiViewModelProvider;

                mDarkIconDispatcher = darkIconDispatcher;

            }



            public DarkIconManager create(LinearLayout group) {

                return new DarkIconManager(

                        group, mFeatureFlags, mStatusBarPipelineFlags, mWifiViewModelProvider);

                        group, mFeatureFlags, mStatusBarPipelineFlags, mWifiViewModelProvider,

                        mDarkIconDispatcher);

            }

        }

    }

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

+6 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
    @Before

    public void setup() {

        injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES);

        mDependency.injectMockDependency(DarkIconDispatcher.class);

    }



    @Test
@@ -75,7 +74,8 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
                layout,

                mock(FeatureFlags.class),

                mock(StatusBarPipelineFlags.class),

                () -> mock(WifiViewModel.class));

                () -> mock(WifiViewModel.class),

                mock(DarkIconDispatcher.class));

        testCallOnAdd_forManager(manager);

    }
@@ -116,8 +116,10 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
                LinearLayout group,

                FeatureFlags featureFlags,

                StatusBarPipelineFlags statusBarPipelineFlags,

                Provider<WifiViewModel> wifiViewModelProvider) {

            super(group, featureFlags, statusBarPipelineFlags, wifiViewModelProvider);

                Provider<WifiViewModel> wifiViewModelProvider,

                DarkIconDispatcher darkIconDispatcher) {

            super(group, featureFlags, statusBarPipelineFlags, wifiViewModelProvider,

                    darkIconDispatcher);

        }



        @Override