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

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

Merge "Remove @Keep from clock plugin classes" into main

parents b15402bf 058ba41a

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt

+0 −4
Original line number Diff line number Diff line
@@ -13,14 +13,11 @@ 
 */

package com.android.systemui.plugins.clocks



import com.android.internal.annotations.Keep



/**

 * Exposes the rendering capabilities of this clock to SystemUI so that it can be hosted and render

 * correctly in SystemUI's process. Ideally all clocks could be rendered identically, but in

 * practice we different clocks require different behavior from SystemUI.

 */

@Keep

data class ClockConfig(

    val id: ClockId,
@@ -38,7 +35,6 @@ data class ClockConfig( 
)



/** Render configuration options for a specific clock face. */

@Keep

data class ClockFaceConfig(

    /** Expected interval between calls to onTimeTick. Can always reduce to PER_MINUTE in AOD. */

    val tickRate: ClockTickRate = ClockTickRate.PER_MINUTE,

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ package com.android.systemui.plugins.clocks 


import android.content.Context

import android.graphics.Rect

import com.android.internal.annotations.Keep

import com.android.systemui.plugins.annotations.ProtectedInterface



/** Events that have specific data about the related face */
@@ -54,7 +53,6 @@ interface ClockFaceEvents { 
}



/** Contains Theming information for the clock face */

@Keep

data class ThemeConfig(

    /** True if the clock should use dark theme (light text on dark background) */

    val isDarkTheme: Boolean,

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceLayout.kt

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ package com.android.systemui.plugins.clocks 


import android.view.View

import androidx.constraintlayout.widget.ConstraintSet

import com.android.internal.annotations.Keep

import com.android.systemui.plugins.annotations.GeneratedImport

import com.android.systemui.plugins.annotations.ProtectedInterface

import com.android.systemui.plugins.annotations.ProtectedReturn
@@ -45,7 +44,6 @@ interface ClockFaceLayout { 
}



/** Data class to contain AOD BurnIn information for correct aod rendering */

@Keep

data class AodClockBurnInModel(

    /** Scale that the clock should render at to mitigate burnin */

    val scale: Float,

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockMessageBuffers.kt

+0 −2
Original line number Diff line number Diff line
@@ -13,11 +13,9 @@ 
 */

package com.android.systemui.plugins.clocks



import com.android.internal.annotations.Keep

import com.android.systemui.log.core.MessageBuffer



/** MessageBuffers for clocks that want to log information to SystemUI dumps */

@Keep

data class ClockMessageBuffers(

    /** Message buffer for general infrastructure */

    val infraMessageBuffer: MessageBuffer,

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockPickerConfig.kt

+0 −4
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ 
package com.android.systemui.plugins.clocks



import android.graphics.drawable.Drawable

import com.android.internal.annotations.Keep



@Keep

data class ClockPickerConfig

@JvmOverloads

constructor(
@@ -41,7 +39,6 @@ constructor( 
    val presetConfig: AxisPresetConfig? = null,

)



@Keep

data class AxisPresetConfig(

    /** Groups of Presets. Each group can be used together in a single control. */

    val groups: List<Group>,
@@ -87,7 +84,6 @@ data class AxisPresetConfig( 
}



/** Represents an Axis that can be modified */

@Keep

data class ClockFontAxis(

    /** Axis key, not user renderable */

    val key: String,