Merge "Adding general KeyguardLogger and more logs to keyguard status bar" into tm-qpr-dev (85d4d091) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.keyguard.logging

		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogLevel
		import com.android.systemui.log.LogLevel.DEBUG
		import com.android.systemui.log.LogLevel.ERROR
		import com.android.systemui.log.LogLevel.VERBOSE
		import com.android.systemui.log.LogLevel.WARNING
		import com.android.systemui.log.MessageInitializer
		import com.android.systemui.log.MessagePrinter
		import com.android.systemui.log.dagger.KeyguardLog
		import com.google.errorprone.annotations.CompileTimeConstant
		import javax.inject.Inject

		private const val TAG = "KeyguardLog"

		/**
		* Generic logger for keyguard that's wrapping [LogBuffer]. This class should be used for adding
		* temporary logs or logs for smaller classes when creating whole new [LogBuffer] wrapper might be
		* an overkill.
		*/
		class KeyguardLogger @Inject constructor(@KeyguardLog private val buffer: LogBuffer) {
		fun d(@CompileTimeConstant msg: String) = log(msg, DEBUG)

		fun e(@CompileTimeConstant msg: String) = log(msg, ERROR)

		fun v(@CompileTimeConstant msg: String) = log(msg, VERBOSE)

		fun w(@CompileTimeConstant msg: String) = log(msg, WARNING)

		fun log(msg: String, level: LogLevel) = buffer.log(TAG, level, msg)

		private fun debugLog(messageInitializer: MessageInitializer, messagePrinter: MessagePrinter) {
		buffer.log(TAG, DEBUG, messageInitializer, messagePrinter)
		}

		// TODO: remove after b/237743330 is fixed
		fun logStatusBarCalculatedAlpha(alpha: Float) {
		debugLog({ double1 = alpha.toDouble() }, { "Calculated new alpha: $double1" })
		}

		// TODO: remove after b/237743330 is fixed
		fun logStatusBarExplicitAlpha(alpha: Float) {
		debugLog({ double1 = alpha.toDouble() }, { "new mExplicitAlpha value: $double1" })
		}

		// TODO: remove after b/237743330 is fixed
		fun logStatusBarAlphaVisibility(visibility: Int, alpha: Float, state: String) {
		debugLog(
		{
		int1 = visibility
		double1 = alpha.toDouble()
		str1 = state
		},
		{ "changing visibility to $int1 with alpha $double1 in state: $str1" }
		)
		}
		}

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ class KeyguardUpdateMonitorLogger @Inject constructor(

		fun e(@CompileTimeConstant msg: String) = log(msg, ERROR)

		fun v(@CompileTimeConstant msg: String) = log(msg, ERROR)
		fun v(@CompileTimeConstant msg: String) = log(msg, VERBOSE)

		fun w(@CompileTimeConstant msg: String) = log(msg, WARNING)

packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardLog.kt

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.log.dagger

		import javax.inject.Qualifier

		/**
		* A [com.android.systemui.log.LogBuffer] for keyguard-related stuff. Should be used mostly for
		* adding temporary logs or logging from smaller classes when creating new separate log class might
		* be an overkill.
		*/
		@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class KeyguardLog

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -334,4 +334,14 @@ public class LogModule {
		public static LogBuffer providerBluetoothLogBuffer(LogBufferFactory factory) {
		return factory.create("BluetoothLog", 50);
		}

		/**
		* Provides a {@link LogBuffer} for general keyguard-related logs.
		*/
		@Provides
		@SysUISingleton
		@KeyguardLog
		public static LogBuffer provideKeyguardLogBuffer(LogBufferFactory factory) {
		return factory.create("KeyguardLog", 250);
		}
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -4696,6 +4696,8 @@ public final class NotificationPanelViewController extends PanelViewController {
		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"));
		mKeyguardStatusBarViewController.updateViewState(
		/* alpha= */ 1f,
		keyguardShowing ? View.VISIBLE : View.INVISIBLE);