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

Commit e140a43f authored by timhypeng's avatar timhypeng
Browse files

Add dismiss timing for Media Output Dialog 

-Dismiss dialog when losing window focus
-Dismiss dialog when launch Volume Panel in Volume dialog

Bug: 155822415
Test: atest MediaControlPanelTest
Change-Id: I666550354cef27703d19b736f74c3d58635041ad
parent 4ceacb30

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java

+9 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ import com.android.systemui.statusbar.phone.SystemUIDialog; 
 * Base dialog for media output UI

 * Base dialog for media output UI

 */

 */

public abstract class MediaOutputBaseDialog extends SystemUIDialog implements

public abstract class MediaOutputBaseDialog extends SystemUIDialog implements

        MediaOutputController.Callback {

        MediaOutputController.Callback, Window.Callback {





    private static final String TAG = "MediaOutputDialog";

    private static final String TAG = "MediaOutputDialog";
@@ -210,4 +210,12 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements 
    public void dismissDialog() {

    public void dismissDialog() {

        dismiss();

        dismiss();

    }

    }



    @Override

    public void onWindowFocusChanged(boolean hasFocus) {

        super.onWindowFocusChanged(hasFocus);

        if (!hasFocus && isShowing()) {

            dismiss();

        }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ import com.android.settingslib.Utils; 
import com.android.systemui.Dependency;

import com.android.systemui.Dependency;

import com.android.systemui.Prefs;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.VolumeDialog;

import com.android.systemui.plugins.VolumeDialog;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.plugins.VolumeDialogController;
@@ -519,6 +520,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);

                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);

                Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);

                Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                Dependency.get(MediaOutputDialogFactory.class).dismiss();

                Dependency.get(ActivityStarter.class).startActivity(intent,

                Dependency.get(ActivityStarter.class).startActivity(intent,

                        true /* dismissShade */);

                        true /* dismissShade */);

            });

            });