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

Commit c88c25cd authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Fix HearingDevices QS tile dialog screen when opened in external display 

Bug: 422988741
Flag: com.android.systemui.shade_window_goes_around
Test: OpenHearingDevicesQSDialogOnOtherDisplay
Change-Id: If63274557512c2da0ff374f6c8970408d978ef91
parent 73a41ca0

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;