Merge "Trace ImageFloatingTextView and NotificationToplineView" into udc-qpr-dev (c39845ac) · Commits · e / os / android_frameworks_base

core/java/android/view/NotificationTopLineView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.Rect;
		import android.os.Trace;
		import android.util.AttributeSet;
		import android.widget.RemoteViews;

		@@ -106,6 +107,7 @@ public class NotificationTopLineView extends ViewGroup {

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		Trace.beginSection("NotificationTopLineView#onMeasure");
		final int givenWidth = MeasureSpec.getSize(widthMeasureSpec);
		final int givenHeight = MeasureSpec.getSize(heightMeasureSpec);
		final boolean wrapHeight = MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST;
		@@ -161,6 +163,7 @@ public class NotificationTopLineView extends ViewGroup {
		.finish();
		}
		setMeasuredDimension(givenWidth, wrapHeight ? maxChildHeight : givenHeight);
		Trace.endSection();
		}

		@Override

core/java/com/android/internal/widget/ImageFloatingTextView.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.widget;

		import android.annotation.Nullable;
		import android.content.Context;
		import android.os.Trace;
		import android.text.BoringLayout;
		import android.text.Layout;
		import android.text.StaticLayout;
		@@ -68,6 +69,7 @@ public class ImageFloatingTextView extends TextView {
		protected Layout makeSingleLayout(int wantWidth, BoringLayout.Metrics boring, int ellipsisWidth,
		Layout.Alignment alignment, boolean shouldEllipsize,
		TextUtils.TruncateAt effectiveEllipsize, boolean useSaved) {
		Trace.beginSection("ImageFloatingTextView#makeSingleLayout");
		TransformationMethod transformationMethod = getTransformationMethod();
		CharSequence text = getText();
		if (transformationMethod != null) {
		@@ -110,7 +112,9 @@ public class ImageFloatingTextView extends TextView {
		builder.setIndents(null, margins);
		}

		return builder.build();
		final StaticLayout result = builder.build();
		Trace.endSection();
		return result;
		}

		/**
		@@ -135,6 +139,7 @@ public class ImageFloatingTextView extends TextView {

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		Trace.beginSection("ImageFloatingTextView#onMeasure");
		int availableHeight = MeasureSpec.getSize(heightMeasureSpec) - mPaddingTop - mPaddingBottom;
		if (getLayout() != null && getLayout().getHeight() != availableHeight) {
		// We've been measured before and the new size is different than before, lets make sure
		@@ -161,6 +166,7 @@ public class ImageFloatingTextView extends TextView {
		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
		}
		}
		Trace.endSection();
		}

		@Override