Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
index 9690880..fa71fc2 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
@@ -20,7 +20,7 @@
import androidx.annotation.IntRange
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.clock.shared.model.ClockMetadataModel
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockId
import kotlinx.coroutines.flow.Flow
@@ -52,7 +52,7 @@
suspend fun setClockSize(size: ClockSize)
- suspend fun setClockFontAxes(axisSettings: List<ClockFontAxisSetting>)
+ suspend fun setClockFontAxes(axisSettings: ClockAxisStyle)
fun isReactiveToTone(clockId: ClockId): Boolean?
}
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
index db38342..9342ab5 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
@@ -22,8 +22,8 @@
import androidx.annotation.IntRange
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.clock.shared.model.ClockMetadataModel
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockFontAxis
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
import com.android.systemui.plugins.clocks.ClockId
import com.android.systemui.plugins.clocks.ClockMetadata
import com.android.systemui.shared.clocks.ClockRegistry
@@ -191,7 +191,7 @@
)
}
- override suspend fun setClockFontAxes(axisSettings: List<ClockFontAxisSetting>) {
+ override suspend fun setClockFontAxes(axisSettings: ClockAxisStyle) {
registry.mutateSetting { oldSettings ->
val newSettings = oldSettings.copy(axes = axisSettings)
newSettings.metadata = oldSettings.metadata
diff --git a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
index 27b8b26..acff6e8 100644
--- a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
+++ b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
@@ -23,7 +23,7 @@
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.clock.shared.model.ClockMetadataModel
import com.android.customization.picker.clock.shared.model.ClockSnapshotModel
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.wallpaper.picker.customization.data.repository.CustomizationRuntimeValuesRepository
import javax.inject.Inject
import javax.inject.Singleton
@@ -60,8 +60,10 @@
val seedColor: Flow<Int?> = repository.selectedClock.map { clock -> clock.seedColor }
- val axisSettings: Flow<List<ClockFontAxisSetting>?> =
- repository.selectedClock.map { clock -> clock.fontAxes.map { it.toSetting() } }
+ val axisSettings: Flow<ClockAxisStyle?> =
+ repository.selectedClock.map { clock ->
+ if (clock.fontAxes.isEmpty()) null else ClockAxisStyle(clock.fontAxes)
+ }
val selectedClockSize: Flow<ClockSize> = repository.selectedClockSize
@@ -92,7 +94,7 @@
setClockOption(ClockSnapshotModel(clockSize = size))
}
- suspend fun setClockFontAxes(axisSettings: List<ClockFontAxisSetting>) {
+ suspend fun setClockFontAxes(axisSettings: ClockAxisStyle) {
setClockOption(ClockSnapshotModel(axisSettings = axisSettings))
}
@@ -102,7 +104,7 @@
selectedColorId: String?,
@IntRange(from = 0, to = 100) colorToneProgress: Int?,
@ColorInt seedColor: Int?,
- axisSettings: List<ClockFontAxisSetting>,
+ axisSettings: ClockAxisStyle,
) {
setClockOption(
ClockSnapshotModel(
diff --git a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt
index 2a74276..41e82eb 100644
--- a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt
+++ b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt
@@ -21,7 +21,7 @@
import android.util.Log
import com.android.customization.picker.clock.data.repository.ClockPickerRepository
import com.android.customization.picker.clock.shared.model.ClockSnapshotModel
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.wallpaper.picker.undo.domain.interactor.SnapshotRestorer
import com.android.wallpaper.picker.undo.domain.interactor.SnapshotStore
import com.android.wallpaper.picker.undo.shared.model.RestorableSnapshot
@@ -60,7 +60,7 @@
seedColor = repository.selectedClock.map { clock -> clock.seedColor }.firstOrNull(),
axisSettings =
repository.selectedClock
- .map { clock -> clock.fontAxes.map { it.toSetting() } }
+ .map { clock -> ClockAxisStyle(clock.fontAxes) }
.firstOrNull(),
)
return snapshot(originalOption)
@@ -76,8 +76,8 @@
snapshot.args[KEY_COLOR_TONE_PROGRESS] ||
optionToRestore.seedColor?.toString() != snapshot.args[KEY_SEED_COLOR] ||
optionToRestore.selectedColorId != snapshot.args[KEY_COLOR_ID] ||
- (optionToRestore.axisSettings ?: listOf()) !=
- ClockFontAxisSetting.fromJson(JSONArray(snapshot.args[KEY_FONT_AXES]))
+ (optionToRestore.axisSettings ?: ClockAxisStyle()) !=
+ ClockAxisStyle.fromJson(JSONArray(snapshot.args[KEY_FONT_AXES]))
) {
Log.wtf(
TAG,
@@ -118,7 +118,7 @@
}
clockSnapshotModel.seedColor?.let { put(KEY_SEED_COLOR, it.toString()) }
clockSnapshotModel.axisSettings?.let {
- put(KEY_FONT_AXES, ClockFontAxisSetting.toJson(it).toString())
+ put(KEY_FONT_AXES, ClockAxisStyle.toJson(it).toString())
}
}
}
diff --git a/src/com/android/customization/picker/clock/shared/model/ClockSnapshotModel.kt b/src/com/android/customization/picker/clock/shared/model/ClockSnapshotModel.kt
index 6817ec1..3847ced 100644
--- a/src/com/android/customization/picker/clock/shared/model/ClockSnapshotModel.kt
+++ b/src/com/android/customization/picker/clock/shared/model/ClockSnapshotModel.kt
@@ -20,7 +20,7 @@
import androidx.annotation.ColorInt
import androidx.annotation.IntRange
import com.android.customization.picker.clock.shared.ClockSize
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
/** Models application state for a clock option in a picker experience. */
data class ClockSnapshotModel(
@@ -29,5 +29,5 @@
val selectedColorId: String? = null,
@IntRange(from = 0, to = 100) val colorToneProgress: Int? = null,
@ColorInt val seedColor: Int? = null,
- val axisSettings: List<ClockFontAxisSetting>? = null,
+ val axisSettings: ClockAxisStyle? = null,
)
diff --git a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
index cd298fe..eb02974 100644
--- a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
@@ -25,8 +25,8 @@
import androidx.annotation.ColorInt
import androidx.lifecycle.LifecycleOwner
import com.android.internal.policy.SystemBarUtils
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockController
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
import com.android.systemui.plugins.clocks.WeatherData
import com.android.systemui.shared.Flags
import com.android.systemui.shared.clocks.ClockRegistry
@@ -136,7 +136,7 @@
}
}
- override fun updateFontAxes(clockId: String, settings: List<ClockFontAxisSetting>) {
+ override fun updateFontAxes(clockId: String, settings: ClockAxisStyle) {
getController(clockId)?.let { it.events.onFontAxesChanged(settings) }
}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 7b78e8c..2cb5e86 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -38,7 +38,7 @@
import com.android.customization.picker.color.ui.view.ColorOptionIconView2
import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
import com.android.customization.picker.settings.ui.binder.ColorContrastSectionViewBinder2
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockPreviewConfig
import com.android.systemui.shared.Flags
import com.android.themepicker.R
@@ -473,8 +473,7 @@
.collect { quadruple ->
val (color, clock, axisMap, _) = quadruple
clockViewFactory.updateColor(clock.clockId, color)
- val axisList = axisMap.map { ClockFontAxisSetting(it.key, it.value) }
- clockViewFactory.updateFontAxes(clock.clockId, axisList)
+ clockViewFactory.updateFontAxes(clock.clockId, ClockAxisStyle(axisMap))
}
}
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
index 7fe81ed..dca361f 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
@@ -28,7 +28,7 @@
import com.android.customization.picker.clock.ui.viewmodel.ClockColorViewModel
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor2
import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.themepicker.R
import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
@@ -464,7 +464,7 @@
colorTone = it.getColorTone(previewProgress),
)
},
- axisSettings = axisMap.map { ClockFontAxisSetting(it.key, it.value) },
+ axisSettings = ClockAxisStyle(axisMap),
)
}
} else {
diff --git a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
index d3fc546..fd2c801 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
@@ -23,9 +23,9 @@
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.clock.shared.model.ClockMetadataModel
import com.android.systemui.plugins.clocks.AxisType
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockFontAxis
import com.android.systemui.plugins.clocks.ClockFontAxis.Companion.merge
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
import com.android.systemui.plugins.clocks.ClockId
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
@@ -88,7 +88,7 @@
_selectedClockSize.value = size
}
- override suspend fun setClockFontAxes(axisSettings: List<ClockFontAxisSetting>) {
+ override suspend fun setClockFontAxes(axisSettings: ClockAxisStyle) {
fontAxes.update { fontAxes -> fontAxes.merge(axisSettings) }
}
diff --git a/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt b/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
index 4bb542c..484d810 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
@@ -3,6 +3,7 @@
import androidx.test.filters.SmallTest
import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository
import com.android.customization.picker.clock.shared.ClockSize
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
import com.android.wallpaper.picker.customization.data.repository.CustomizationRuntimeValuesRepository
import com.android.wallpaper.testing.FakeSnapshotStore
@@ -88,7 +89,7 @@
@Test
fun setFontAxisSettings() = runTest {
val axisSettings = collectLastValue(underTest.axisSettings)
- val fakeSettings = listOf(FakeClockPickerRepository.buildFakeAxis(10).toSetting())
+ val fakeSettings = ClockAxisStyle(listOf(FakeClockPickerRepository.buildFakeAxis(10)))
underTest.setClockFontAxes(fakeSettings)
diff --git a/tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt
index 1c02756..b570003 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt
@@ -4,12 +4,12 @@
import androidx.lifecycle.LifecycleOwner
import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository
import com.android.customization.picker.clock.ui.view.ClockViewFactory
+import com.android.systemui.plugins.clocks.ClockAxisStyle
import com.android.systemui.plugins.clocks.ClockConfig
import com.android.systemui.plugins.clocks.ClockController
import com.android.systemui.plugins.clocks.ClockEventListener
import com.android.systemui.plugins.clocks.ClockEvents
import com.android.systemui.plugins.clocks.ClockFaceController
-import com.android.systemui.plugins.clocks.ClockFontAxisSetting
import java.io.PrintWriter
import javax.inject.Inject
@@ -58,7 +58,7 @@
TODO("Not yet implemented")
}
- override fun updateFontAxes(clockId: String, settings: List<ClockFontAxisSetting>) {
+ override fun updateFontAxes(clockId: String, settings: ClockAxisStyle) {
TODO("Not yet implemented")
}