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

Commit 60e101e2 authored by Matt Pietal's avatar Matt Pietal Committed by Gerrit Code Review
Browse files

Merge "Remove redundant implements Dumpable" into main

parents 9ea23edb 13cfef4e

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

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ import javax.inject.Provider; 
 * to be updated.

 */

@SysUISingleton

public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpable, CoreStartable {

public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreStartable {



    private static final String TAG = "KeyguardUpdateMonitor";

    private static final int BIOMETRIC_LOCKOUT_RESET_DELAY_MS = 600;

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ import javax.inject.Inject; 
 */

@SysUISingleton

public class ScreenDecorations implements

        CoreStartable, ConfigurationController.ConfigurationListener, Dumpable {

        CoreStartable, ConfigurationController.ConfigurationListener {

    private static final boolean DEBUG_LOGGING = false;

    private static final String TAG = "ScreenDecorations";

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ import java.util.function.Consumer; 
 * directly to the keyguard UI is posted to a {@link android.os.Handler} to ensure it is taken on the UI

 * thread of the keyguard.

 */

public class KeyguardViewMediator implements CoreStartable, Dumpable,

public class KeyguardViewMediator implements CoreStartable,

        StatusBarStateController.StateListener {

    private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;

    private static final long KEYGUARD_DONE_PENDING_TIMEOUT_MS = 3000;

packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.internal.logging.InstanceId 
import com.android.internal.logging.UiEventLogger

import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.systemui.CoreStartable

import com.android.systemui.Dumpable

import com.android.systemui.common.shared.model.Text

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dump.DumpManager
@@ -55,7 +54,7 @@ constructor( 
    private val logger: MediaTttSenderLogger,

    private val mediaTttFlags: MediaTttFlags,

    private val uiEventLogger: MediaTttSenderUiEventLogger,

) : CoreStartable, Dumpable {

) : CoreStartable {



    // Since the media transfer display is similar to a heads-up notification, use the same timeout.

    private val defaultTimeout = context.resources.getInteger(R.integer.heads_up_notification_decay)

packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProvider.kt

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.Handler 
import android.os.RemoteException

import android.view.IWindowManager

import com.android.systemui.CoreStartable

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main
@@ -40,7 +39,7 @@ constructor( 
    @Background private val backgroundExecutor: Executor,

    private val wallpaperManager: WallpaperManager,

    @Main private val mainHandler: Handler,

) : CoreStartable, Dumpable {

) : CoreStartable {

    @ColorInt

    var letterboxBackgroundColor: Int = Color.BLACK

        private set