Merge "Fixed measuring and layouting of the more card and expandableviews." (37dd8220) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+0 −24

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		= new PathInterpolator(0.6f, 0, 0.5f, 1);
		private static final Interpolator ACTIVATE_INVERSE_ALPHA_INTERPOLATOR
		= new PathInterpolator(0, 0, 0.5f, 1);
		private final int mMaxNotificationHeight;

		private boolean mDimmed;

		@@ -81,8 +80,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		AnimationUtils.loadInterpolator(context, android.R.interpolator.fast_out_slow_in);
		mLinearOutSlowInInterpolator =
		AnimationUtils.loadInterpolator(context, android.R.interpolator.linear_out_slow_in);
		mMaxNotificationHeight = getResources().getDimensionPixelSize(
		R.dimen.notification_max_height);
		setClipChildren(false);
		setClipToPadding(false);
		}
		@@ -295,27 +292,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		}
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		int newHeightSpec = MeasureSpec.makeMeasureSpec(mMaxNotificationHeight,
		MeasureSpec.AT_MOST);
		int maxChildHeight = 0;
		int childCount = getChildCount();
		for (int i = 0; i < childCount; i++) {
		View child = getChildAt(i);
		if (child != mBackgroundDimmed && child != mBackgroundNormal) {
		child.measure(widthMeasureSpec, newHeightSpec);
		int childHeight = child.getMeasuredHeight();
		maxChildHeight = Math.max(maxChildHeight, childHeight);
		}
		}
		newHeightSpec = MeasureSpec.makeMeasureSpec(maxChildHeight, MeasureSpec.EXACTLY);
		mBackgroundDimmed.measure(widthMeasureSpec, newHeightSpec);
		mBackgroundNormal.measure(widthMeasureSpec, newHeightSpec);
		int width = MeasureSpec.getSize(widthMeasureSpec);
		setMeasuredDimension(width, maxChildHeight);
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -258,11 +258,4 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		public void notifyContentUpdated() {
		mPrivateLayout.notifyContentUpdated();
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
		int newHeightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.EXACTLY);
		mVetoButton.measure(widthMeasureSpec, newHeightSpec);
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java

+51 −11

Original line number	Diff line number	Diff line
		@@ -21,34 +21,74 @@ import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.FrameLayout;
		import com.android.systemui.R;

		import java.util.ArrayList;

		/**
		* An abstract view for expandable views.
		*/
		public abstract class ExpandableView extends ViewGroup {
		public abstract class ExpandableView extends FrameLayout {

		private final int mMaxNotificationHeight;

		private OnHeightChangedListener mOnHeightChangedListener;
		protected int mActualHeight;
		protected int mClipTopAmount;
		private boolean mActualHeightInitialized;
		private ArrayList<View> mMatchParentViews = new ArrayList<View>();

		public ExpandableView(Context context, AttributeSet attrs) {
		super(context, attrs);
		mMaxNotificationHeight = getResources().getDimensionPixelSize(
		R.dimen.notification_max_height);
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		for (int i = 0; i < getChildCount(); i++) {
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		int ownMaxHeight = mMaxNotificationHeight;
		int heightMode = MeasureSpec.getMode(heightMeasureSpec);
		boolean hasFixedHeight = heightMode == MeasureSpec.EXACTLY;
		boolean isHeightLimited = heightMode == MeasureSpec.AT_MOST;
		if (hasFixedHeight \|\| isHeightLimited) {
		int size = MeasureSpec.getSize(heightMeasureSpec);
		ownMaxHeight = Math.min(ownMaxHeight, size);
		}
		int newHeightSpec = MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.AT_MOST);
		int maxChildHeight = 0;
		int childCount = getChildCount();
		for (int i = 0; i < childCount; i++) {
		View child = getChildAt(i);
		int height = child.getMeasuredHeight();
		int width = child.getMeasuredWidth();
		int center = getWidth() / 2;
		int childLeft = center - width / 2;
		child.layout(childLeft,
		0,
		childLeft + width,
		height);
		int childHeightSpec = newHeightSpec;
		ViewGroup.LayoutParams layoutParams = child.getLayoutParams();
		if (layoutParams.height != ViewGroup.LayoutParams.MATCH_PARENT) {
		if (layoutParams.height >= 0) {
		// An actual height is set
		childHeightSpec = layoutParams.height > ownMaxHeight
		? MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.EXACTLY)
		: MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY);
		}
		child.measure(widthMeasureSpec, childHeightSpec);
		int childHeight = child.getMeasuredHeight();
		maxChildHeight = Math.max(maxChildHeight, childHeight);
		} else {
		mMatchParentViews.add(child);
		}
		}
		int ownHeight = hasFixedHeight ? ownMaxHeight : maxChildHeight;
		newHeightSpec = MeasureSpec.makeMeasureSpec(ownHeight, MeasureSpec.EXACTLY);
		for (View child : mMatchParentViews) {
		child.measure(widthMeasureSpec, newHeightSpec);
		}
		mMatchParentViews.clear();
		int width = MeasureSpec.getSize(widthMeasureSpec);
		setMeasuredDimension(width, ownHeight);
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);
		if (!mActualHeightInitialized && mActualHeight == 0) {
		mActualHeight = getInitialHeight();
		}