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

Commit 234c40af authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Remove MediaHost incorrect size wtf" into tm-qpr-dev am: 971d90e7 am:... 

Merge "Remove MediaHost incorrect size wtf" into tm-qpr-dev am: 971d90e7 am: 30ddac98 am: ed4c5e3e

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



Change-Id: Iffe4afeb1a9d91a608a9be22d33bd7610fcf8ab7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b38a10b ed4c5e3e

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt

+0 −12
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.net.Uri 
import android.os.Handler

import android.os.UserHandle

import android.provider.Settings

import android.util.Log

import android.util.MathUtils

import android.view.View

import android.view.ViewGroup
@@ -1056,17 +1055,6 @@ constructor( 
                    // This will either do a full layout pass and remeasure, or it will bypass

                    // that and directly set the mediaFrame's bounds within the premeasured host.

                    targetHost.addView(mediaFrame)



                    if (mediaFrame.childCount > 0) {

                        val child = mediaFrame.getChildAt(0)

                        if (mediaFrame.height < child.height) {

                            Log.wtf(

                                TAG,

                                "mediaFrame height is too small for child: " +

                                    "${mediaFrame.height} vs ${child.height}"

                            )

                        }

                    }

                }

                if (isCrossFadeAnimatorRunning) {

                    // When cross-fading with an animation, we only notify the media carousel of the