Merge "Rename LocalLogger as DebugLogger & move to Debug folder" (ba2f009a) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package com.android.settingslib.spa.gallery

		import android.content.Context
		import com.android.settingslib.spa.framework.common.LocalLogger
		import com.android.settingslib.spa.debug.DebugLogger
		import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository
		import com.android.settingslib.spa.framework.common.SpaEnvironment
		import com.android.settingslib.spa.framework.common.createSettingsPage
		@@ -83,7 +83,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) {
		)
		}

		override val logger = LocalLogger()
		override val logger = DebugLogger()

		override val browseActivityClass = GalleryMainActivity::class.java
		override val sliceBroadcastReceiverClass = SpaSliceBroadcastReceiver::class.java

0 → 100644

+34 −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.settingslib.spa.debug

		import android.os.Bundle
		import android.util.Log
		import com.android.settingslib.spa.framework.common.LogCategory
		import com.android.settingslib.spa.framework.common.LogEvent
		import com.android.settingslib.spa.framework.common.SpaLogger

		class DebugLogger : SpaLogger {
		override fun message(tag: String, msg: String, category: LogCategory) {
		Log.d("SpaMsg-$category", "[$tag] $msg")
		}

		override fun event(id: String, event: LogEvent, category: LogCategory, extraData: Bundle) {
		val extraMsg = extraData.toString().removeRange(0, 6)
		Log.d("SpaEvent-$category", "[$id] $event $extraMsg")
		}
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settingslib.spa.framework.common

		import android.os.Bundle
		import android.util.Log

		// Defines the category of the log, for quick filter
		enum class LogCategory {
		@@ -62,14 +61,3 @@ interface SpaLogger {
		) {
		}
		}

		class LocalLogger : SpaLogger {
		override fun message(tag: String, msg: String, category: LogCategory) {
		Log.d("SpaMsg-$category", "[$tag] $msg")
		}

		override fun event(id: String, event: LogEvent, category: LogCategory, extraData: Bundle) {
		val extraMsg = extraData.toString().removeRange(0, 6)
		Log.d("SpaEvent-$category", "[$id] $event $extraMsg")
		}
		}
		No newline at end of file