Merge "[SB] Ensure all tags used in the StatusBarChipsLog have same length." into main (117ae7bf) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/chips/StatusBarChipLogTags.kt

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.systemui.statusbar.chips

		/** Helper class to ensure all tags used in [StatusBarChipsLog] are exactly the same length. */
		object StatusBarChipLogTags {
		private const val TAG_LENGTH = 20

		fun String.pad(): String {
		return this.padEnd(TAG_LENGTH)
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad
		import com.android.systemui.statusbar.chips.StatusBarChipsLog
		import com.android.systemui.statusbar.phone.ongoingcall.data.repository.OngoingCallRepository
		import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel
		@@ -47,6 +48,6 @@ constructor(
		.stateIn(scope, SharingStarted.Lazily, OngoingCallModel.NoCall)

		companion object {
		private const val TAG = "OngoingCall"
		private val TAG = "OngoingCall".pad()
		}
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.plugins.ActivityStarter
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad
		import com.android.systemui.statusbar.chips.StatusBarChipsLog
		import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor
		import com.android.systemui.statusbar.chips.ui.model.ColorsModel
		@@ -112,7 +113,7 @@ constructor(
		ActivityTransitionAnimator.Controller.fromView(
		backgroundView,
		InteractionJankMonitor.CUJ_STATUS_BAR_APP_LAUNCH_FROM_CALL_CHIP,
		)
		),
		)
		}
		}
		@@ -121,10 +122,8 @@ constructor(
		private val phoneIcon =
		Icon.Resource(
		com.android.internal.R.drawable.ic_phone,
		ContentDescription.Resource(
		R.string.ongoing_phone_call_content_description,
		),
		ContentDescription.Resource(R.string.ongoing_phone_call_content_description),
		)
		private const val TAG = "CallVM"
		private val TAG = "CallVM".pad()
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.mediarouter.data.repository.MediaRouterRepository
		import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad
		import com.android.systemui.statusbar.chips.StatusBarChipsLog
		import com.android.systemui.statusbar.chips.casttootherdevice.domain.model.MediaRouterCastModel
		import com.android.systemui.statusbar.policy.CastDevice
		@@ -68,6 +69,6 @@ constructor(
		}

		companion object {
		private const val TAG = "MediaRouter"
		private val TAG = "MediaRouter".pad()
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad
		import com.android.systemui.statusbar.chips.StatusBarChipsLog
		import com.android.systemui.statusbar.chips.casttootherdevice.domain.interactor.MediaRouterChipInteractor
		import com.android.systemui.statusbar.chips.casttootherdevice.domain.model.MediaRouterCastModel
		@@ -255,6 +256,6 @@ constructor(

		companion object {
		@DrawableRes val CAST_TO_OTHER_DEVICE_ICON = R.drawable.ic_cast_connected
		private const val TAG = "CastToOtherVM"
		private val TAG = "CastToOtherVM".pad()
		}
		}