diff options
| author | tim peng <timhypeng@google.com> | 2020-12-08 06:31:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 06:31:18 +0000 |
| commit | 818908122c78ff4b8c342459a76a8dfea028b8f4 (patch) | |
| tree | acdc06b88bb96909ee710a5c7f411e4555395ed1 /packages/SystemUI | |
| parent | 933a23c8746b2b92009062e6839d0069707a1335 (diff) | |
| parent | 7de579f1ce46f67018033287cc941c4d88d9d87e (diff) | |
Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 7de579f1ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13104443
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7e7d3fa26ec863da2cd05800062871685b83c55
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 44f0cced349a..990e092ec4cc 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -320,6 +320,9 @@ <style name="Animation.ShutdownUi" parent="@android:style/Animation.Toast"> </style> + <style name="Animation.MediaOutputDialog" parent="@android:style/Animation.InputMethod"> + </style> + <!-- Standard animations for hiding and showing the status bar. --> <style name="Animation.StatusBar"> </style> 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 dd9a808fb35b..745f36bfc7e5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java @@ -105,6 +105,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements window.setAttributes(lp); window.setContentView(mDialogView); window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + window.setWindowAnimations(R.style.Animation_MediaOutputDialog); mHeaderTitle = mDialogView.requireViewById(R.id.header_title); mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle); |