Snap for 13611907 from 5cb6791371081b021b24ec7791745b66a5df0500 to 25Q3-release (05a484d8) · Commits · e / os / android_packages_apps_ThemePicker

res/layout/floating_sheet_clock_style_content.xml

+33 −11

Original line number	Diff line number	Diff line
		@@ -52,6 +52,26 @@
		android:clipToPadding="false"/>
		</FrameLayout>

		<LinearLayout
		android:id="@+id/clock_face_width_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_marginTop="@dimen/clock_axis_control_slider_container_margin_vertical">

		<TextView
		android:id="@+id/clock_face_width_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@string/clock_face_width"
		android:text="@string/clock_face_width"
		android:textAppearance="@style/TextAppearance.DeviceDefault.Small.LabelMedium"
		android:textColor="@color/system_on_surface_variant"
		android:lineSpacingExtra="1sp"
		android:gravity="center_vertical"
		android:paddingHorizontal="20dp"
		android:layout_marginTop="8dp" />

		<com.google.android.material.slider.Slider
		android:id="@+id/clock_axis_preset_slider"
		android:layout_width="match_parent"
		@@ -67,3 +87,5 @@
		android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
		</LinearLayout>

		</LinearLayout>

+2 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,8 @@
		<!-- Clock font control dimensions -->
		<dimen name="clock_font_axis_name_width">64dp</dimen>
		<dimen name="clock_axis_control_text_margin_end">16dp</dimen>
		<dimen name="clock_axis_control_slider_row_margin_vertical">10dp</dimen>
		<dimen name="clock_axis_control_slider_container_margin_vertical">10dp</dimen>
		<dimen name="clock_axis_control_slider_row_margin_vertical">7dp</dimen>
		<dimen name="clock_axis_control_switch_row_margin_vertical">8dp</dimen>
		<dimen name="clock_font_apply_padding_start">8dp</dimen>

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.customization.picker.icon.data.repository

		import com.android.customization.picker.icon.shared.model.IconStyle
		import kotlinx.coroutines.flow.Flow

		interface IconStyleRepository {
		@@ -24,5 +25,9 @@ interface IconStyleRepository {

		val isThemedIconActivated: Flow<Boolean>

		val iconStyles: Flow<List<IconStyle>>

		val selectedIconStyle: Flow<IconStyle>

		suspend fun setThemedIconEnabled(enabled: Boolean)
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import android.content.Context
		import android.database.ContentObserver
		import android.net.Uri
		import com.android.customization.module.CustomizationPreferences
		import com.android.customization.picker.icon.shared.model.IconStyle
		import com.android.customization.picker.icon.shared.model.ThemePickerIconStyle
		import com.android.themepicker.R
		import com.android.wallpaper.model.Screen
		import com.android.wallpaper.module.InjectorProvider
		@@ -105,6 +107,21 @@ constructor(
		initialValue = false,
		)

		override val iconStyles: Flow<List<IconStyle>> =
		isThemedIconAvailable.map { isThemedIconAvailable ->
		var styles = ThemePickerIconStyle.entries.toList()
		if (!isThemedIconAvailable) styles = styles.filter { !it.getIsThemedIcon() }
		styles
		}

		override val selectedIconStyle =
		isThemedIconActivated.map {
		when (it) {
		true -> ThemePickerIconStyle.MONOCHROME
		false -> ThemePickerIconStyle.DEFAULT
		}
		}

		fun getThemedIconEnabled(uri: Uri): Boolean {
		val cursor =
		contentResolver.query(

+2 −15

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.customization.picker.icon.domain.interactor
		import com.android.customization.model.grid.ShapeOptionModel
		import com.android.customization.picker.grid.data.repository.ShapeRepository
		import com.android.customization.picker.icon.data.repository.IconStyleRepository
		import com.android.customization.picker.icon.shared.model.IconStyle
		import javax.inject.Inject
		import javax.inject.Singleton
		import kotlinx.coroutines.flow.Flow
		@@ -45,21 +44,9 @@ constructor(

		val isThemedIconEnabled: Flow<Boolean> = iconStyleRepository.isThemedIconActivated

		val iconStyles =
		isThemedIconAvailable.map { isThemedIconAvailable ->
		// TODO (b/397782741): introduce different icon styles depending on repository
		var styles = IconStyle.entries.toList()
		if (!isThemedIconAvailable) styles = styles.filter { it != IconStyle.MONOCHROME }
		styles
		}
		val iconStyles = iconStyleRepository.iconStyles

		val selectedIconStyle =
		isThemedIconEnabled.map {
		when (it) {
		true -> IconStyle.MONOCHROME
		false -> IconStyle.DEFAULT
		}
		}
		val selectedIconStyle = iconStyleRepository.selectedIconStyle

		suspend fun applyThemedIconEnabled(enabled: Boolean) =
		iconStyleRepository.setThemedIconEnabled(enabled)