Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 508857b3 authored Nov 17, 2022 by Colin Cross Committed by Automerger Merge Worker Nov 17, 2022

Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into...

Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into tm-qpr-dev am: f8003e57 am: 3726e9b3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20454887

Change-Id: I2e0e9f3cee3a1fb24ba25c98d5050743cc0aa40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 03cfa058 3726e9b3

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -5499,8 +5499,11 @@ public final class NotificationPanelViewController implements Dumpable {
		if (!animatingUnlockedShadeToKeyguard) {
		// Only make the status bar visible if we're not animating the screen off, since
		// we only want to be showing the clock/notifications during the animation.
		mShadeLog.v("Updating keyguard status bar state to "
		+ (keyguardShowing ? "visible" : "invisible"));
		if (keyguardShowing) {
		mShadeLog.v("Updating keyguard status bar state to visible");
		} else {
		mShadeLog.v("Updating keyguard status bar state to invisible");
		}
		mKeyguardStatusBarViewController.updateViewState(
		/* alpha= */ 1f,
		keyguardShowing ? View.VISIBLE : View.INVISIBLE);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3733,7 +3733,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		}
		}

		private void debugLog(@CompileTimeConstant String s) {
		private void debugLog(@CompileTimeConstant final String s) {
		if (mLogger == null) {
		return;
		}