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

Commit 8412c727 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert^2 "Move LogBuffer and related to SystemUILogLib."" into... 

Merge "Merge "Revert^2 "Move LogBuffer and related to SystemUILogLib."" into udc-dev am: 46805d76 am: 18ec333e am: 52e1f667" into udc-qpr-dev-plus-aosp
parents 7ae8e405 0fbba46e

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ android_library { 
        "SystemUIAnimationLib",

        "SystemUICommon",

        "SystemUICustomizationLib",

        "SystemUILogLib",

        "SystemUIPluginLib",

        "SystemUISharedLib",

        "SystemUI-statsd",

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ import com.android.systemui.animation.GlyphCallback 
import com.android.systemui.animation.Interpolators

import com.android.systemui.animation.TextAnimator

import com.android.systemui.customization.R

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.plugins.log.LogLevel.DEBUG

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel.DEBUG

import java.io.PrintWriter

import java.util.Calendar

import java.util.Locale

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt

+6 −6
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ import android.os.UserHandle 
import android.provider.Settings

import android.util.Log

import androidx.annotation.OpenForTesting

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel

import com.android.systemui.log.LogMessage

import com.android.systemui.log.LogMessageImpl

import com.android.systemui.log.MessageInitializer

import com.android.systemui.log.MessagePrinter

import com.android.systemui.plugins.ClockController

import com.android.systemui.plugins.ClockId

import com.android.systemui.plugins.ClockMetadata
@@ -32,12 +38,6 @@ import com.android.systemui.plugins.ClockSettings 
import com.android.systemui.plugins.PluginLifecycleManager

import com.android.systemui.plugins.PluginListener

import com.android.systemui.plugins.PluginManager

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.plugins.log.LogLevel

import com.android.systemui.plugins.log.LogMessage

import com.android.systemui.plugins.log.LogMessageImpl

import com.android.systemui.plugins.log.MessageInitializer

import com.android.systemui.plugins.log.MessagePrinter

import com.android.systemui.util.Assert

import java.io.PrintWriter

import java.util.concurrent.ConcurrentHashMap

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.View 
import android.widget.FrameLayout

import androidx.annotation.VisibleForTesting

import com.android.systemui.customization.R

import com.android.systemui.log.LogBuffer

import com.android.systemui.plugins.ClockAnimations

import com.android.systemui.plugins.ClockConfig

import com.android.systemui.plugins.ClockController
@@ -32,7 +33,6 @@ import com.android.systemui.plugins.ClockFaceConfig 
import com.android.systemui.plugins.ClockFaceController

import com.android.systemui.plugins.ClockFaceEvents

import com.android.systemui.plugins.ClockSettings

import com.android.systemui.plugins.log.LogBuffer

import java.io.PrintWriter

import java.util.Locale

import java.util.TimeZone

packages/SystemUI/log/.gitignore

0 → 100644
+9 −0
Original line number Diff line number Diff line 
.idea/

.gradle/

gradle/

build/

gradlew*

local.properties

*.iml

android.properties

buildSrc
 
 No newline at end of file