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

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

Merge "Fix HearingDevices QS tile dialog screen when opened in external display" into main

parents e324a45b c88c25cd

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java

+6 −1
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteracto 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.shared.QSSettingsPackageRepository;

import com.android.systemui.res.R;

import com.android.systemui.shade.domain.interactor.FakeShadeDialogContextInteractor;

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.phone.SystemUIDialogManager;

import com.android.systemui.util.concurrency.FakeExecutor;
@@ -111,6 +113,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
    private static final String TEST_PRESET_NAME = "test_preset";

    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

    private final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock());

    private final ShadeDialogContextInteractor mShadeDialogContextInteractor =

            new FakeShadeDialogContextInteractor(mContext);



    @Mock

    private SystemUIDialogManager mSystemUIDialogManager;
@@ -402,7 +406,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
                mAudioManager,

                mUiEventLogger,

                mQSSettingsPackageRepository,

                mInputRoutingFactory

                mInputRoutingFactory,

                mShadeDialogContextInteractor

        );

        mDialog = mDialogDelegate.createDialog();

    }

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+7 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.shared.QSSettingsPackageRepository;

import com.android.systemui.res.R;

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor;

import com.android.systemui.statusbar.phone.SystemUIDialog;



import dagger.assisted.Assisted;
@@ -127,6 +128,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
    private View mInputRoutingLayout;

    private Spinner mInputRoutingSpinner;

    private HearingDevicesInputRoutingController.Factory mInputRoutingControllerFactory;

    private final ShadeDialogContextInteractor mShadeDialogContextInteractor;

    private HearingDevicesInputRoutingController mInputRoutingController;

    private HearingDevicesSpinnerAdapter mInputRoutingAdapter;
@@ -179,7 +181,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
            AudioManager audioManager,

            HearingDevicesUiEventLogger uiEventLogger,

            QSSettingsPackageRepository qsSettingsPackageRepository,

            HearingDevicesInputRoutingController.Factory inputRoutingControllerFactory) {

            HearingDevicesInputRoutingController.Factory inputRoutingControllerFactory,

            ShadeDialogContextInteractor shadeDialogContextInteractor) {

        mShowPairNewDevice = showPairNewDevice;

        mSystemUIDialogFactory = systemUIDialogFactory;

        mActivityStarter = activityStarter;
@@ -193,11 +196,13 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
        mLaunchSourceId = launchSourceId;

        mQSSettingsPackageRepository = qsSettingsPackageRepository;

        mInputRoutingControllerFactory = inputRoutingControllerFactory;

        mShadeDialogContextInteractor = shadeDialogContextInteractor;

    }



    @Override

    public SystemUIDialog createDialog() {

        SystemUIDialog dialog = mSystemUIDialogFactory.create(this);

        SystemUIDialog dialog = mSystemUIDialogFactory.create(this,

                mShadeDialogContextInteractor.getContext());

        dismissDialogIfExists();

        mDialog = dialog;