Snap for 13585852 from 3add1dd502926b5fbc4cb5b9cfddc7f5ad197d67 to 25Q3-release (abbe826b) · Commits · e / os / android_packages_apps_ThemePicker

res/layout/floating_sheet_colors.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@
		android:background="@null"
		android:minHeight="@dimen/accessibility_min_height"
		android:text="@string/mode_title"
		android:textAppearance="@style/SectionTitleTextStyle"
		android:textAppearance="@style/SwitchSectionTitleTextStyle"
		android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
		</LinearLayout>

res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@
		<dimen name="floating_sheet_tab_clock_font_toolbar_top_margin">16dp</dimen>
		<dimen name="floating_sheet_tab_clock_font_toolbar_bottom_margin">8dp</dimen>
		<dimen name="floating_sheet_list_item_horizontal_space">8dp</dimen>
		<dimen name="floating_sheet_shortcut_list_item_horizontal_space">2dp</dimen>
		<dimen name="floating_sheet_grid_list_item_horizontal_space">10dp</dimen>
		<dimen name="floating_sheet_list_item_vertical_space">4dp</dimen>
		<dimen name="floating_sheet_clock_style_option_size">80dp</dimen>

res/values/styles.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,15 @@
		<item name="android:lineHeight">24sp</item>
		</style>

		<style name="SwitchSectionTitleTextStyle" parent="SectionTitleTextStyle">
		<item name="android:textSize">16sp</item>
		<item name="android:lineHeight">24sp</item>
		<item name="android:lineSpacingExtra">4sp</item>
		<item name="android:letterSpacing">0</item>
		<item name="android:textFontWeight">500</item>
		<item name="android:gravity">center</item>
		</style>

		<style name="SectionSubtitleTextStyle" parent="SectionTitleTextStyle">
		<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
		<item name="android:textColor">@color/system_on_surface_variant</item>

src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ object ShortcutFloatingSheetBinder {
		),
		itemHorizontalSpacePx =
		context.resources.getDimensionPixelSize(
		R.dimen.floating_sheet_list_item_horizontal_space
		R.dimen.floating_sheet_shortcut_list_item_horizontal_space
		),
		itemVerticalSpacePx =
		context.resources.getDimensionPixelSize(

src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt

+2 −31

Original line number	Diff line number	Diff line
		@@ -25,21 +25,16 @@ import androidx.lifecycle.lifecycleScope
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.customization.model.grid.DefaultShapeGridManager.Companion.COL_GRID_NAME
		import com.android.customization.model.grid.DefaultShapeGridManager.Companion.COL_SHAPE_KEY
		import com.android.customization.picker.clock.shared.ClockSize
		import com.android.customization.picker.clock.ui.view.ClockViewFactory
		import com.android.customization.picker.color.data.util.MaterialColorsGenerator
		import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END
		import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.CLOCK_SIZE_DYNAMIC
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.CLOCK_SIZE_SMALL
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_CLOCK_SIZE
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_HIDE_SMART_SPACE
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_INITIALLY_SELECTED_SLOT_ID
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_QUICK_AFFORDANCE_ID
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_SLOT_ID
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_DEFAULT_PREVIEW
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_HIDE_SMART_SPACE
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_PREVIEW_CLOCK_SIZE
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_PREVIEW_QUICK_AFFORDANCE_SELECTED
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_SLOT_SELECTED
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_START_CUSTOMIZING_QUICK_AFFORDANCES
		@@ -147,35 +142,11 @@ constructor(
		}

		launch {
		combine(
		viewModel.clockPickerViewModel.previewingClockSize,
		viewModel.clockPickerViewModel
		.showKeyguardPreviewRendererSmartspace,
		::Pair,
		)
		viewModel.clockPickerViewModel.showKeyguardPreviewRendererSmartspace
		.collect {
		(previewingClockSize, showKeyguardPreviewRendererSmartspace) ->
		workspaceCallback.sendMessage(
		MESSAGE_ID_HIDE_SMART_SPACE,
		Bundle().apply {
		putBoolean(
		KEY_HIDE_SMART_SPACE,
		!showKeyguardPreviewRendererSmartspace,
		)
		},
		)

		workspaceCallback.sendMessage(
		MESSAGE_ID_PREVIEW_CLOCK_SIZE,
		Bundle().apply {
		putString(
		KEY_CLOCK_SIZE,
		when (previewingClockSize) {
		ClockSize.DYNAMIC -> CLOCK_SIZE_DYNAMIC
		ClockSize.SMALL -> CLOCK_SIZE_SMALL
		},
		)
		},
		Bundle().apply { putBoolean(KEY_HIDE_SMART_SPACE, !it) },
		)
		}
		}