Merge "Remove atraces from RemeasuringLinearLayout" into tm-qpr-dev am: 6cf3dab11b am: 3374b69597
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20462730 Change-Id: Ifc6281f14d57a6e53a25e1638060ec3a03c711ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -18,7 +18,6 @@ package com.android.internal.widget;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.content.Context;
|
||||
import android.os.Trace;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
@@ -55,7 +54,6 @@ public class RemeasuringLinearLayout extends LinearLayout {
|
||||
|
||||
@Override
|
||||
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||
Trace.beginSection("RemeasuringLinearLayout#onMeasure");
|
||||
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
||||
int count = getChildCount();
|
||||
int height = 0;
|
||||
@@ -88,6 +86,5 @@ public class RemeasuringLinearLayout extends LinearLayout {
|
||||
}
|
||||
mMatchParentViews.clear();
|
||||
setMeasuredDimension(getMeasuredWidth(), height);
|
||||
Trace.endSection();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user