Merge "Fix Power menu background vanish" (0f18470e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java

+52 −45

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.view.ViewGroup;
		import android.view.ViewOutlineProvider;
		import android.view.ViewTreeObserver;
		import android.widget.LinearLayout;

		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;
		import com.android.systemui.util.leak.RotationUtils;
		@@ -41,14 +42,15 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		private static final String EDGE_BLEED = "sysui_hwui_edge_bleed";
		private static final String ROUNDED_DIVIDER = "sysui_hwui_rounded_divider";
		private final int[] mTmp2 = new int[2];
		private View mChild;
		private View mList;
		private View mSeparatedView;
		private int mOldHeight;
		private boolean mAnimating;
		private AnimatorSet mAnimation;
		private View mDivision;
		private boolean mHasOutsideTouch;
		private HardwareBgDrawable mBackground;
		private HardwareBgDrawable mListBackground;
		private HardwareBgDrawable mSeparatedViewBackground;
		private Animator mAnimator;
		private boolean mCollapse;
		private boolean mHasSeparatedButton;
		@@ -90,17 +92,19 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		mRoundedDivider = Settings.Secure.getInt(getContext().getContentResolver(),
		ROUNDED_DIVIDER, 0) != 0;
		updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding());
		mBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext());
		if (mChild != null) {
		mChild.setBackground(mBackground);
		mSeparatedView.setBackground(mBackground);
		mListBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext());
		mSeparatedViewBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed,
		getContext());
		if (mList != null) {
		mList.setBackground(mListBackground);
		mSeparatedView.setBackground(mSeparatedViewBackground);
		requestLayout();
		}
		}

		private void updateEdgeMargin(int edge) {
		if (mChild != null) {
		MarginLayoutParams params = (MarginLayoutParams) mChild.getLayoutParams();
		if (mList != null) {
		MarginLayoutParams params = (MarginLayoutParams) mList.getLayoutParams();
		if (mRotation == ROTATION_LANDSCAPE) {
		params.topMargin = edge;
		} else if (mRotation == ROTATION_SEASCAPE) {
		@@ -108,7 +112,7 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		} else {
		params.rightMargin = edge;
		}
		mChild.setLayoutParams(params);
		mList.setLayoutParams(params);
		}

		if (mSeparatedView != null) {
		@@ -131,15 +135,15 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
		if (mChild == null) {
		if (mList == null) {
		if (getChildCount() != 0) {
		mChild = getChildAt(0);
		mChild.setBackground(mBackground);
		mList = getChildAt(0);
		mList.setBackground(mListBackground);
		mSeparatedView = getChildAt(1);
		mSeparatedView.setBackground(mBackground);
		mSeparatedView.setBackground(mSeparatedViewBackground);
		updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding());
		mOldHeight = mChild.getMeasuredHeight();
		mChild.addOnLayoutChangeListener(
		mOldHeight = mList.getMeasuredHeight();
		mList.addOnLayoutChangeListener(
		(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
		updatePosition());
		updateRotation();
		@@ -147,7 +151,7 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		return;
		}
		}
		int newHeight = mChild.getMeasuredHeight();
		int newHeight = mList.getMeasuredHeight();
		if (newHeight != mOldHeight) {
		animateChild(mOldHeight, newHeight);
		}
		@@ -196,27 +200,29 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		}
		}
		if (to != ROTATION_NONE) {
		if (mChild instanceof LinearLayout) {
		if (mList instanceof LinearLayout) {
		mRotatedBackground = true;
		mBackground.setRotatedBackground(true);
		LinearLayout linearLayout = (LinearLayout) mChild;
		mListBackground.setRotatedBackground(true);
		mSeparatedViewBackground.setRotatedBackground(true);
		LinearLayout linearLayout = (LinearLayout) mList;
		if (mSwapOrientation) {
		linearLayout.setOrientation(LinearLayout.HORIZONTAL);
		setOrientation(LinearLayout.HORIZONTAL);
		}
		swapDimens(mChild);
		swapDimens(mList);
		swapDimens(mSeparatedView);
		}
		} else {
		if (mChild instanceof LinearLayout) {
		if (mList instanceof LinearLayout) {
		mRotatedBackground = false;
		mBackground.setRotatedBackground(false);
		LinearLayout linearLayout = (LinearLayout) mChild;
		mListBackground.setRotatedBackground(false);
		mSeparatedViewBackground.setRotatedBackground(false);
		LinearLayout linearLayout = (LinearLayout) mList;
		if (mSwapOrientation) {
		linearLayout.setOrientation(LinearLayout.VERTICAL);
		setOrientation(LinearLayout.VERTICAL);
		}
		swapDimens(mChild);
		swapDimens(mList);
		swapDimens(mSeparatedView);
		}
		}
		@@ -224,12 +230,12 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {

		private void rotateRight() {
		rotateRight(this);
		rotateRight(mChild);
		rotateRight(mList);
		swapDimens(this);

		LayoutParams p = (LayoutParams) mChild.getLayoutParams();
		LayoutParams p = (LayoutParams) mList.getLayoutParams();
		p.gravity = rotateGravityRight(p.gravity);
		mChild.setLayoutParams(p);
		mList.setLayoutParams(p);

		LayoutParams separatedViewLayoutParams = (LayoutParams) mSeparatedView.getLayoutParams();
		separatedViewLayoutParams.gravity = rotateGravityRight(separatedViewLayoutParams.gravity);
		@@ -282,12 +288,12 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {

		private void rotateLeft() {
		rotateLeft(this);
		rotateLeft(mChild);
		rotateLeft(mList);
		swapDimens(this);

		LayoutParams p = (LayoutParams) mChild.getLayoutParams();
		LayoutParams p = (LayoutParams) mList.getLayoutParams();
		p.gravity = rotateGravityLeft(p.gravity);
		mChild.setLayoutParams(p);
		mList.setLayoutParams(p);

		LayoutParams separatedViewLayoutParams = (LayoutParams) mSeparatedView.getLayoutParams();
		separatedViewLayoutParams.gravity = rotateGravityLeft(separatedViewLayoutParams.gravity);
		@@ -379,14 +385,14 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		mAnimating = false;
		}
		});
		int fromTop = mChild.getTop();
		int fromBottom = mChild.getBottom();
		int fromTop = mList.getTop();
		int fromBottom = mList.getBottom();
		int toTop = fromTop - ((newHeight - oldHeight) / 2);
		int toBottom = fromBottom + ((newHeight - oldHeight) / 2);
		ObjectAnimator top = ObjectAnimator.ofInt(mChild, "top", fromTop, toTop);
		top.addUpdateListener(animation -> mBackground.invalidateSelf());
		ObjectAnimator top = ObjectAnimator.ofInt(mList, "top", fromTop, toTop);
		top.addUpdateListener(animation -> mListBackground.invalidateSelf());
		mAnimation.playTogether(top,
		ObjectAnimator.ofInt(mChild, "bottom", fromBottom, toBottom));
		ObjectAnimator.ofInt(mList, "bottom", fromBottom, toBottom));
		}

		public void setDivisionView(View v) {
		@@ -400,29 +406,30 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		}

		private void updatePosition() {
		if (mChild == null) return;
		if (mList == null) return;
		// If got separated button, setRotatedBackground to false,
		// all items won't get white background.
		mBackground.setRotatedBackground(mHasSeparatedButton);
		mListBackground.setRotatedBackground(mHasSeparatedButton);
		mSeparatedViewBackground.setRotatedBackground(mHasSeparatedButton);
		if (mDivision != null && mDivision.getVisibility() == VISIBLE) {
		int index = mRotatedBackground ? 0 : 1;
		mDivision.getLocationOnScreen(mTmp2);
		float trans = mRotatedBackground ? mDivision.getTranslationX()
		: mDivision.getTranslationY();
		int viewTop = (int) (mTmp2[index] + trans);
		mChild.getLocationOnScreen(mTmp2);
		mList.getLocationOnScreen(mTmp2);
		viewTop -= mTmp2[index];
		setCutPoint(viewTop);
		} else {
		setCutPoint(mChild.getMeasuredHeight());
		setCutPoint(mList.getMeasuredHeight());
		}
		}

		private void setCutPoint(int point) {
		int curPoint = mBackground.getCutPoint();
		int curPoint = mListBackground.getCutPoint();
		if (curPoint == point) return;
		if (getAlpha() == 0 \|\| curPoint == 0) {
		mBackground.setCutPoint(point);
		mListBackground.setCutPoint(point);
		return;
		}
		if (mAnimator != null) {
		@@ -432,7 +439,7 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		mAnimator.cancel();
		}
		mEndPoint = point;
		mAnimator = ObjectAnimator.ofInt(mBackground, "cutPoint", curPoint, point);
		mAnimator = ObjectAnimator.ofInt(mListBackground, "cutPoint", curPoint, point);
		if (mCollapse) {
		mAnimator.setStartDelay(300);
		mCollapse = false;
		@@ -470,14 +477,14 @@ public class HardwareUiLayout extends LinearLayout implements Tunable {
		}

		private final ViewTreeObserver.OnComputeInternalInsetsListener mInsetsListener = inoutInfo -> {
		if (mHasOutsideTouch \|\| (mChild == null)) {
		if (mHasOutsideTouch \|\| (mList == null)) {
		inoutInfo.setTouchableInsets(
		ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME);
		return;
		}
		inoutInfo.setTouchableInsets(
		ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT);
		inoutInfo.contentInsets.set(mChild.getLeft(), mChild.getTop(),
		0, getBottom() - mChild.getBottom());
		inoutInfo.contentInsets.set(mList.getLeft(), mList.getTop(),
		0, getBottom() - mList.getBottom());
		};
		}