summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2025-01-09 10:58:06 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-01-09 10:58:06 -0800
commitca618d9f16633b1cbf29eac795956d201e1bc6e3 (patch)
tree4a0f1cc4d3348f6dbc07e733961b72753b2e2068
parent2689f6343d3885ba78ee6de0dde36caff54bd94f (diff)
parent3939d050477f19523085ceb7579e936d63b8d077 (diff)
Merge "Remove ClockConfig.isReactiveToTone" into main
-rw-r--r--packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt1
-rw-r--r--packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt4
2 files changed, 0 insertions, 5 deletions
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt
index aed3a2df0436..e69fa994931d 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt
@@ -50,7 +50,6 @@ class FlexClockController(private val clockCtx: ClockContext) : ClockController
DEFAULT_CLOCK_ID,
clockCtx.resources.getString(R.string.clock_default_name),
clockCtx.resources.getString(R.string.clock_default_description),
- isReactiveToTone = true,
)
}
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt
index d84d89087349..812a964bf8bc 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt
@@ -30,10 +30,6 @@ data class ClockConfig(
/** Transition to AOD should move smartspace like large clock instead of small clock */
val useAlternateSmartspaceAODTransition: Boolean = false,
- /** Deprecated version of isReactiveToTone; moved to ClockPickerConfig */
- @Deprecated("TODO(b/352049256): Remove in favor of ClockPickerConfig.isReactiveToTone")
- val isReactiveToTone: Boolean = true,
-
/** True if the clock is large frame clock, which will use weather in compose. */
val useCustomClockScene: Boolean = false,
)