Merge "Add dismiss timing for Media Output Dialog" (a8c40563) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ import com.android.systemui.statusbar.phone.SystemUIDialog;
		* Base dialog for media output UI
		*/
		public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
		MediaOutputController.Callback {
		MediaOutputController.Callback, Window.Callback {

		private static final String TAG = "MediaOutputDialog";

		@@ -210,4 +210,12 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
		public void dismissDialog() {
		dismiss();
		}

		@Override
		public void onWindowFocusChanged(boolean hasFocus) {
		super.onWindowFocusChanged(hasFocus);
		if (!hasFocus && isShowing()) {
		dismiss();
		}
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ import com.android.settingslib.Utils;
		import com.android.systemui.Dependency;
		import com.android.systemui.Prefs;
		import com.android.systemui.R;
		import com.android.systemui.media.dialog.MediaOutputDialogFactory;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.VolumeDialog;
		import com.android.systemui.plugins.VolumeDialogController;
		@@ -519,6 +520,7 @@ public class VolumeDialogImpl implements VolumeDialog,
		Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
		Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);
		dismissH(DISMISS_REASON_SETTINGS_CLICKED);
		Dependency.get(MediaOutputDialogFactory.class).dismiss();
		Dependency.get(ActivityStarter.class).startActivity(intent,
		true /* dismissShade */);
		});