Snap for 12274519 from 2df19e5a6c61942a67630b5ba1b5ccabb6dab895 to 24Q4-release (c034a3f9) · Commits · e / os / android_frameworks_base

packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java

+22 −28

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.view.MotionEvent.ACTION_UP;

		import android.app.Activity;
		import android.content.res.Configuration;
		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.os.Bundle;
		import android.view.MotionEvent;
		@@ -38,9 +37,7 @@ import android.widget.Magnifier;

		import com.android.egg.R;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.stream.IntStream;

		public class PaintActivity extends Activity {
		@@ -60,31 +57,28 @@ public class PaintActivity extends Activity {
		private View.OnClickListener buttonHandler = new View.OnClickListener() {
		@Override
		public void onClick(View view) {
		switch (view.getId()) {
		case R.id.btnBrush:
		// With non final fields in the R class we can't switch on the
		// id since the case values are no longer constants.
		int viewId = view.getId();
		if (viewId == R.id.btnBrush) {
		view.setSelected(true);
		hideToolbar(colors);
		toggleToolbar(brushes);
		break;
		case R.id.btnColor:
		} else if (viewId == R.id.btnColor) {
		view.setSelected(true);
		hideToolbar(brushes);
		toggleToolbar(colors);
		break;
		case R.id.btnClear:
		} else if (viewId == R.id.btnClear) {
		painting.clear();
		break;
		case R.id.btnSample:
		} else if (viewId == R.id.btnSample) {
		sampling = true;
		view.setSelected(true);
		break;
		case R.id.btnZen:
		} else if (viewId == R.id.btnZen) {
		painting.setZenMode(!painting.getZenMode());
		view.animate()
		.setStartDelay(200)
		.setInterpolator(new OvershootInterpolator())
		.rotation(painting.getZenMode() ? 0f : 90f);
		break;
		}
		}
		};

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -511,10 +511,12 @@ public class AmbientState implements Dumpable {
		}

		public int getTopPadding() {
		SceneContainerFlag.assertInLegacyMode();
		return mTopPadding;
		}

		public void setTopPadding(int topPadding) {
		SceneContainerFlag.assertInLegacyMode();
		mTopPadding = topPadding;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+39 −28

Original line number	Diff line number	Diff line
		@@ -851,7 +851,7 @@ public class NotificationStackScrollLayout
		return; // the rest of the fields are not important in Flexiglass
		}

		y = getTopPadding();
		y = mAmbientState.getTopPadding();
		drawDebugInfo(canvas, y, Color.RED, /* label= */ "getTopPadding() = " + y);

		y = getLayoutHeight();
		@@ -1231,9 +1231,11 @@ public class NotificationStackScrollLayout

		@Override
		public void setStackTop(float stackTop) {
		if (mAmbientState.getStackTop() != stackTop) {
		mAmbientState.setStackTop(stackTop);
		// TODO(b/332574413): replace the following with using stackTop
		updateTopPadding(stackTop, isAddOrRemoveAnimationPending());
		onTopPaddingChanged(/* animate = */ isAddOrRemoveAnimationPending());
		setExpandedHeight(mExpandedHeight);
		}
		}

		@Override
		@@ -1386,12 +1388,15 @@ public class NotificationStackScrollLayout
		}

		public int getTopPadding() {
		// TODO(b/332574413) replace all usages of getTopPadding()
		if (SceneContainerFlag.isEnabled()) {
		return (int) mAmbientState.getStackTop();
		} else {
		return mAmbientState.getTopPadding();
		}
		}

		private void setTopPadding(int topPadding, boolean animate) {
		if (getTopPadding() != topPadding) {
		mAmbientState.setTopPadding(topPadding);
		private void onTopPaddingChanged(boolean animate) {
		boolean shouldAnimate = animate \|\| mAnimateNextTopPaddingChange;
		updateAlgorithmHeightAndPadding();
		updateContentHeight();
		@@ -1408,7 +1413,6 @@ public class NotificationStackScrollLayout
		notifyHeightChangeListener(null, shouldAnimate);
		mAnimateNextTopPaddingChange = false;
		}
		}

		/**
		* Apply expansion fraction to the y position and height of the notifications panel.
		@@ -1435,6 +1439,11 @@ public class NotificationStackScrollLayout
		* @param listenerNeedsAnimation does the listener need to animate?
		*/
		private void updateStackPosition(boolean listenerNeedsAnimation) {
		// When scene container is active, we only want to recalculate stack heights.
		if (SceneContainerFlag.isEnabled()) {
		updateStackEndHeightAndStackHeight(mAmbientState.getExpansionFraction());
		return;
		}
		float topOverscrollAmount = mShouldUseSplitNotificationShade
		? getCurrentOverScrollAmount(true /* top */) : 0f;
		final float endTopPosition = getTopPadding() + mExtraTopInsetForFullShadeTransition
		@@ -1447,10 +1456,8 @@ public class NotificationStackScrollLayout
		if (mAmbientState.isBouncerInTransit() && mQsExpansionFraction > 0f) {
		fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction);
		}
		if (!SceneContainerFlag.isEnabled()) {
		final float stackY = MathUtils.lerp(0, endTopPosition, fraction);
		mAmbientState.setStackY(stackY);
		}

		if (mOnStackYChanged != null) {
		mOnStackYChanged.accept(listenerNeedsAnimation);
		@@ -2708,6 +2715,7 @@ public class NotificationStackScrollLayout
		* @param animate whether to animate the change
		*/
		public void updateTopPadding(float qsHeight, boolean animate) {
		SceneContainerFlag.assertInLegacyMode();
		int topPadding = (int) qsHeight;
		int minStackHeight = getLayoutMinHeightInternal();
		if (topPadding + minStackHeight > getHeight()) {
		@@ -2715,7 +2723,10 @@ public class NotificationStackScrollLayout
		} else {
		mTopPaddingOverflow = 0;
		}
		setTopPadding(topPadding, animate && !mKeyguardBypassEnabled);
		if (mAmbientState.getTopPadding() != topPadding) {
		mAmbientState.setTopPadding(topPadding);
		onTopPaddingChanged(/* animate = */ animate && !mKeyguardBypassEnabled);
		}
		setExpandedHeight(mExpandedHeight);
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1328,6 +1328,7 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		}

		public int getTopPadding() {
		SceneContainerFlag.assertInLegacyMode();
		return mView.getTopPadding();
		}