Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into tm-qpr-dev am: f8003e57e4

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

Change-Id: I35c91d047796e1181543963f19467e0038c184b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-11-17 19:14:01 +00:00
committed by Automerger Merge Worker
parent 8662d3edb5 f8003e57e4
commit 3726e9b32e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

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

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

@@ -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) { if (mLogger == null) {
return; return;
} }