Snap for 13618210 from 33bd18e9d4b3311dceade3723ba78207ed651a80 to 25Q3-release (bddb42a2) · Commits · e / os / android_packages_apps_ThemePicker

res/drawable/circle_button.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2025 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="oval">
		<solid android:color="@color/system_primary"></solid>
		</shape>

res/layout/floating_sheet_app_icon.xml

+78 −78

Original line number	Diff line number	Diff line
		@@ -21,13 +21,12 @@
		android:paddingHorizontal="@dimen/floating_sheet_horizontal_padding"
		android:orientation="vertical">

		<LinearLayout
		<FrameLayout
		android:id="@+id/floating_sheet_content_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"
		android:background="@drawable/floating_sheet_content_background"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		@@ -35,10 +34,8 @@
		android:id="@+id/app_icon_style_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="12dp"
		android:clipToPadding="false"
		android:clipChildren="false"
		android:visibility="gone">
		android:clipChildren="false">

		<!--
		This is just an invisible placeholder put in place so that the parent keeps its height
		@@ -51,8 +48,6 @@
		-->
		<include
		layout="@layout/icon_style_option2"
		android:layout_width="64dp"
		android:layout_height="64dp"
		android:visibility="invisible" />

		<androidx.recyclerview.widget.RecyclerView
		@@ -64,11 +59,17 @@
		android:clipChildren="false" />
		</FrameLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		<FrameLayout
		android:id="@+id/app_shape_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="12dp"
		android:clipToPadding="false"
		android:clipChildren="false">

		@@ -83,8 +84,6 @@
		-->
		<include
		layout="@layout/shape_option2"
		android:layout_width="64dp"
		android:layout_height="64dp"
		android:visibility="invisible" />

		<androidx.recyclerview.widget.RecyclerView
		@@ -146,6 +145,7 @@
		android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
		</androidx.constraintlayout.widget.ConstraintLayout>
		</LinearLayout>
		</FrameLayout>

		<com.android.wallpaper.picker.customization.ui.view.FloatingToolbar
		android:id="@+id/floating_toolbar"

res/layout/icon_style_option2.xml

+23 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		android:clipChildren="false">

		<FrameLayout
		android:id="@+id/option_icon"
		android:layout_width="@dimen/option_item_size"
		android:layout_height="@dimen/option_item_size"
		android:clipChildren="false">
		@@ -44,6 +45,28 @@

		</FrameLayout>

		<FrameLayout
		android:id="@+id/button_icon"
		android:layout_width="@dimen/option_item_size"
		android:layout_height="@dimen/option_item_size"
		android:clipChildren="false"
		android:visibility="gone">

		<ImageView
		android:id="@+id/button_background"
		android:layout_width="50dp"
		android:layout_height="50dp"
		android:layout_gravity="center"
		android:src="@drawable/circle_button" />

		<ImageView
		android:id="@+id/button_foreground"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center" />

		</FrameLayout>

		<View
		android:layout_width="0dp"
		android:layout_height="8dp" />

res/values/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@
		<string name="grid_preview_card_content_description">Grid preview</string>

		<!-- Content description of theme preview card. [CHAR_LIMIT=30]-->
		<string name="pack_theme_preview_card_content_description">Themes preview</string>
		<string name="pack_theme_preview_card_content_description">Content Description</string>

		<!-- Content description of font preview. [CHAR_LIMIT=30]-->
		<string name="font_preview_content_description">Font preview</string>
		@@ -397,13 +397,13 @@
		<string name="themed_icon_beta_title">Themed icons (beta)</string>

		<!-- Title of a section of the pack theme where the user enter the theme app. [CHAR LIMIT=30] -->
		<string name="pack_theme_title">Themes</string>
		<string name="pack_theme_title">Title</string>

		<!-- Title of the tag to indicate beta version. [CHAR LIMIT=6] -->
		<string name="beta_title">Beta</string>

		<!-- The description of theme picker entry. [CHAR LIMIT=30] -->
		<string name="theme_packs_description">Discover Pixel themes</string>
		<string name="theme_packs_description">Description</string>

		<!-- The content description of grid picker entry. [CHAR LIMIT=NONE] -->
		<string name="gird_picker_entry_content_description" msgid="7538418512525897691">Change app grid</string>

src/com/android/customization/picker/icon/shared/model/IconStyle.kt→src/com/android/customization/picker/icon/shared/model/ThemePickerIconStyle.kt

+4 −6

Original line number	Diff line number	Diff line
		@@ -18,12 +18,6 @@ package com.android.customization.picker.icon.shared.model

		import com.android.themepicker.R

		interface IconStyle {
		val nameResId: Int

		fun getIsThemedIcon(): Boolean
		}

		enum class ThemePickerIconStyle(override val nameResId: Int) : IconStyle {
		DEFAULT(R.string.app_icons_style_default),
		MONOCHROME(R.string.app_icons_style_minimal);
		@@ -31,4 +25,8 @@ enum class ThemePickerIconStyle(override val nameResId: Int) : IconStyle {
		override fun getIsThemedIcon(): Boolean {
		return this == MONOCHROME
		}

		override fun getIsExternalLink(): Boolean {
		return false
		}
		}