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

Commit 784bd58d authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Add data dump from ClockRegistry" into udc-dev

parents 6a130d61 cd1ba69c

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

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.plugins.PluginLifecycleManager 
import com.android.systemui.plugins.PluginListener

import com.android.systemui.plugins.PluginManager

import com.android.systemui.util.Assert

import java.io.PrintWriter

import java.util.concurrent.ConcurrentHashMap

import java.util.concurrent.atomic.AtomicBoolean

import kotlinx.coroutines.CoroutineDispatcher
@@ -485,6 +486,14 @@ open class ClockRegistry( 
        return availableClocks[targetClockId]?.provider?.createClock(settings)

    }



    fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.println("ClockRegistry:")

        pw.println("  settings = $settings")

        for ((id, info) in availableClocks) {

            pw.println("  availableClocks[$id] = $info")

        }

    }



    private data class ClockInfo(

        val metadata: ClockMetadata,

        var provider: ClockProvider?,

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+6 −6
Original line number Diff line number Diff line
@@ -294,11 +294,11 @@ public class KeyguardClockSwitch extends RelativeLayout { 


    public void dump(PrintWriter pw, String[] args) {

        pw.println("KeyguardClockSwitch:");

        pw.println("  mSmallClockFrame: " + mSmallClockFrame);

        pw.println("  mSmallClockFrame.alpha: " + mSmallClockFrame.getAlpha());

        pw.println("  mLargeClockFrame: " + mLargeClockFrame);

        pw.println("  mLargeClockFrame.alpha: " + mLargeClockFrame.getAlpha());

        pw.println("  mStatusArea: " + mStatusArea);

        pw.println("  mDisplayedClockSize: " + mDisplayedClockSize);

        pw.println("  mSmallClockFrame = " + mSmallClockFrame);

        pw.println("  mSmallClockFrame.alpha = " + mSmallClockFrame.getAlpha());

        pw.println("  mLargeClockFrame = " + mLargeClockFrame);

        pw.println("  mLargeClockFrame.alpha = " + mLargeClockFrame.getAlpha());

        pw.println("  mStatusArea = " + mStatusArea);

        pw.println("  mDisplayedClockSize = " + mDisplayedClockSize);

    }

}

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+3 −2
Original line number Diff line number Diff line
@@ -519,9 +519,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 


    @Override

    public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("currentClockSizeLarge=" + (mCurrentClockSize == LARGE));

        pw.println("mCanShowDoubleLineClock=" + mCanShowDoubleLineClock);

        pw.println("currentClockSizeLarge: " + (mCurrentClockSize == LARGE));

        pw.println("mCanShowDoubleLineClock: " + mCanShowDoubleLineClock);

        mView.dump(pw, args);

        mClockRegistry.dump(pw, args);

        ClockController clock = getClock();

        if (clock != null) {

            clock.dump(pw);

packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.shared.clocks.DefaultClockProvider; 


import dagger.Module;

import dagger.Provides;



import kotlinx.coroutines.CoroutineDispatcher;

import kotlinx.coroutines.CoroutineScope;