Merge "Remove MediaHost incorrect size wtf" into tm-qpr-dev am: 971d90e75e am: 30ddac98c3

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

Change-Id: If2f2368b8f0d4723ab24e995a52e6d2f3f0fe721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2023-03-01 12:47:28 +00:00
committed by Automerger Merge Worker

View File

@@ -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