Merge cherrypicks of [14803476, 14803477] into sc-release (46716e3f) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+12 −2

Original line number	Diff line number	Diff line
		@@ -105,11 +105,21 @@ android_library {
		filegroup {
		name: "SystemUI-tests-utils",
		srcs: [
		"tests/src/com/android/systemui/SysuiTestCase.java",
		"tests/src/com/android/systemui/TestableDependency.java",
		"tests/src/com/android/systemui/classifier/FalsingManagerFake.java",
		"tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java",
		"tests/src/com/android/systemui/statusbar/RankingBuilder.java",
		"tests/src/com/android/systemui/statusbar/SbnBuilder.java",
		"tests/src/com/android/systemui/util/concurrency/FakeExecutor.java",
		"tests/src/com/android/systemui/util/time/FakeSystemClock.java",
		"tests/src/com/android/systemui/SysuiTestableContext.java",
		"tests/src/com/android/systemui/utils/leaks/BaseLeakChecker.java",
		"tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java",
		"tests/src/com/android/systemui/*/Fake.java",
		"tests/src/com/android/systemui/*/Fake.kt",
		],
		exclude_srcs: [
		"tests/src/com/android/systemui/*/Test.java",
		"tests/src/com/android/systemui/*/Test.kt",
		],
		path: "tests/src",
		}

+9 −7

Original line number	Diff line number	Diff line
		@@ -382,13 +382,15 @@ public class StackScrollAlgorithm {

		final boolean isHunGoingToShade = ambientState.isShadeExpanded()
		&& view == ambientState.getTrackedHeadsUpRow();
		if (!isHunGoingToShade) {
		if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
		if (isHunGoingToShade) {
		// Keep 100% opacity for heads up notification going to shade.
		} else if (ambientState.isOnKeyguard()) {
		// Adjust alpha for wakeup to lockscreen.
		viewState.alpha = 1f - ambientState.getHideAmount();
		} else if (ambientState.isExpansionChanging()) {
		// Adjust alpha for shade open & close.
		viewState.alpha = Interpolators.getNotificationScrimAlpha(
		ambientState.getExpansionFraction(), true /* notification */);
		} else {
		viewState.alpha = 1f - ambientState.getHideAmount();
		}
		}

		if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {