diff options
| author | timhypeng <timhypeng@google.com> | 2020-12-08 06:30:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 06:30:36 +0000 |
| commit | 6b6e9b2b7e3cc64149da78389bc9ffaddbd5f17d (patch) | |
| tree | 7f125a68e41d7ba81cb314ba447d338e91b3a86e /packages/SystemUI/src | |
| parent | 0e6dd319e9483b33ce0a3331d7de307e5cb637d6 (diff) | |
| parent | 07e1fa7bcc628aad217d8bca2a21491764074406 (diff) | |
Add dismiss timing for Media Output Dialog am: 07e1fa7bcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109613
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I097e8560b8be80fafe0b6efa9b9e482a59924a52
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java | 10 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java index e3e399b2aee2..2faf56a5022c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java @@ -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(); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 6fe11ed1792b..06a92272692d 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -88,6 +88,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; @@ -470,6 +471,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 */); }); |