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

Commit 6cf3dab1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove atraces from RemeasuringLinearLayout" into tm-qpr-dev

parents 5d076fc2 03d923da

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

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




import android.annotation.Nullable;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.os.Trace;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.View;

import android.view.View;

import android.widget.LinearLayout;

import android.widget.LinearLayout;
@@ -55,7 +54,6 @@ public class RemeasuringLinearLayout extends LinearLayout { 




    @Override

    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        Trace.beginSection("RemeasuringLinearLayout#onMeasure");

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        int count = getChildCount();

        int count = getChildCount();

        int height = 0;

        int height = 0;
@@ -88,6 +86,5 @@ public class RemeasuringLinearLayout extends LinearLayout { 
        }

        }

        mMatchParentViews.clear();

        mMatchParentViews.clear();

        setMeasuredDimension(getMeasuredWidth(), height);

        setMeasuredDimension(getMeasuredWidth(), height);

        Trace.endSection();

    }

    }

}
 
}