Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 7de579f1ce

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13104443

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7e7d3fa26ec863da2cd05800062871685b83c55
This commit is contained in:
tim peng
2020-12-08 06:31:18 +00:00
committed by Automerger Merge Worker
parent 933a23c874 7de579f1ce
commit 818908122c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/styles.xml
View File

@@ -320,6 +320,9 @@
<style name="Animation.ShutdownUi" parent="@android:style/Animation.Toast"> <style name="Animation.ShutdownUi" parent="@android:style/Animation.Toast">
</style> </style>
<style name="Animation.MediaOutputDialog" parent="@android:style/Animation.InputMethod">
</style>
<!-- Standard animations for hiding and showing the status bar. --> <!-- Standard animations for hiding and showing the status bar. -->
<style name="Animation.StatusBar"> <style name="Animation.StatusBar">
</style> </style>

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

@@ -105,6 +105,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
window.setAttributes(lp); window.setAttributes(lp);
window.setContentView(mDialogView); window.setContentView(mDialogView);
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
window.setWindowAnimations(R.style.Animation_MediaOutputDialog);
mHeaderTitle = mDialogView.requireViewById(R.id.header_title); mHeaderTitle = mDialogView.requireViewById(R.id.header_title);
mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle); mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle);