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

Commit 2dce229a authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Add wtf log for UMO being cut" into tm-qpr-dev am: 6ed51a94 

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



Change-Id: I1c8d180f7a5067ca5b46d959c07583a871a129c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 005b238a 6ed51a94

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

+11 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.IntDef 
import android.content.Context

import android.content.res.Configuration

import android.graphics.Rect

import android.util.Log

import android.util.MathUtils

import android.view.View

import android.view.ViewGroup
@@ -48,6 +49,8 @@ import com.android.systemui.util.animation.UniqueObjectHostView 
import com.android.systemui.util.traceSection

import javax.inject.Inject



private val TAG: String = MediaHierarchyManager::class.java.simpleName



/**

 * Similarly to isShown but also excludes views that have 0 alpha

 */
@@ -964,6 +967,14 @@ class MediaHierarchyManager @Inject constructor( 
                        top,

                        left + currentBounds.width(),

                        top + currentBounds.height())



                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