Merge "Remove AmbientState.isAppearing()" into main (b434d22c) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ public class AmbientState implements Dumpable {
		private boolean mIsSmallScreen;
		private boolean mPulsing;
		private float mHideAmount;
		private boolean mAppearing;
		private float mPulseHeight = MAX_PULSE_HEIGHT;

		/**
		@@ -718,14 +717,6 @@ public class AmbientState implements Dumpable {
		return mHideAmount != 0;
		}

		public void setAppearing(boolean appearing) {
		mAppearing = appearing;
		}

		public boolean isAppearing() {
		return mAppearing;
		}

		public void setPulseHeight(float height) {
		if (height != mPulseHeight) {
		mPulseHeight = height;
		@@ -856,7 +847,6 @@ public class AmbientState implements Dumpable {
		pw.println("mFractionToShade=" + mFractionToShade);
		pw.println("mHideAmount=" + mHideAmount);
		pw.println("mAppearFraction=" + mAppearFraction);
		pw.println("mAppearing=" + mAppearing);
		pw.println("mExpansionFraction=" + mExpansionFraction);
		pw.println("mQsExpansionFraction=" + mQsExpansionFraction);
		pw.println("mExpandingVelocity=" + mExpandingVelocity);

+0 −1

Original line number	Diff line number	Diff line
		@@ -1616,7 +1616,6 @@ public class NotificationStackScrollLayout
		float translationY;
		float appearFraction = 1.0f;
		boolean appearing = calculateAppearFraction(height) < 1;
		mAmbientState.setAppearing(appearing);
		if (!appearing) {
		translationY = 0;
		if (mShouldShowShelfOnly) {