Merge tag 'android-16.0.0_r4' into staging/lineage-23.2_merge-android-16.0.0_r4 (34978482) · Commits · e / os / android_packages_apps_ThemePicker

Android.bp

+6 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		// limitations under the License.
		//


		package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		}
		@@ -49,7 +48,6 @@ java_library {
		],
		}


		filegroup {
		name: "ThemePicker_Manifest",
		srcs: [
		@@ -86,6 +84,7 @@ android_library {
		"androidx.compose.ui_ui-tooling",
		"androidx.lifecycle_lifecycle-runtime-compose",
		"androidx.lifecycle_lifecycle-viewmodel-compose",
		"PlatformComposeSceneTransitionLayout",
		],

		srcs: [
		@@ -152,6 +151,10 @@ android_app {
		platform_apis: true,
		manifest: "AndroidManifest.xml",
		additional_manifests: [":WallpaperPicker2_Manifest"],
		overrides: ["WallpaperCropper", "WallpaperPicker", "WallpaperPicker2"],
		overrides: [
		"WallpaperCropper",
		"WallpaperPicker",
		"WallpaperPicker2",
		],
		static_libs: ["ThemePickerApplicationLib"],
		}

res/drawable/ic_screen_saver_entry_24px.xml

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?attr/colorControlNormal">
		<path
		android:pathData="M16.9755,16.6487C14.383,16.9265 11.7379,16.18 9.7791,14.2213C7.8202,12.2624 7.0738,9.6169 7.3519,7.0241C5.3417,8.2543 4,10.4714 4,13C4,16.866 7.134,20 11,20C13.5283,20 15.7453,18.6585 16.9755,16.6487ZM17.8457,14.4704C15.4318,15.0692 12.9199,14.5337 11.1934,12.8071C9.4666,11.0804 8.9312,8.5682 9.5302,6.1542C9.5355,6.1329 9.5408,6.1117 9.5463,6.0905C9.62,5.8033 9.7097,5.5177 9.8154,5.235C9.885,5.0489 9.9616,4.8641 10.045,4.681C10.1769,4.3916 9.9586,4.0539 9.6441,4.1015C9.4359,4.1329 9.23,4.1715 9.0267,4.217C8.7057,4.2888 8.3911,4.3778 8.084,4.4829C8.0369,4.499 7.99,4.5155 7.9433,4.5324C4.4774,5.7837 2,9.1025 2,13C2,17.9706 6.0294,22 11,22C14.8972,22 18.2158,19.523 19.4674,16.0574C19.4842,16.0107 19.5007,15.9638 19.5168,15.9168C19.622,15.6097 19.711,15.2951 19.7828,14.974C19.8283,14.7707 19.8669,14.5649 19.8984,14.3566C19.946,14.0422 19.6083,13.8239 19.3189,13.9557C19.1358,14.0391 18.951,14.1157 18.7649,14.1853C18.4822,14.291 18.1966,14.3807 17.9094,14.4543C17.8882,14.4598 17.867,14.4651 17.8457,14.4704Z"
		android:fillColor="@android:color/system_accent1_600"/>
		<path
		android:pathData="M15.5,6L14.4062,8.4063L12,9.5L14.4062,10.5938L15.5,13L16.5938,10.5938L19,9.5L16.5938,8.4063L15.5,6Z"
		android:fillColor="@android:color/system_accent1_600"/>
		</vector>

res/layout/color_option2_desktop.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		Copyright (C) 2024 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.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<com.android.customization.picker.color.ui.view.ColorOptionIconView2
		android:layout_width="@dimen/floating_sheet_color_option_size"
		android:layout_height="@dimen/floating_sheet_color_option_size"/>

		<com.android.customization.picker.color.ui.view.ColorOptionIconView2
		android:layout_width="@dimen/floating_sheet_color_option_size"
		android:layout_height="@dimen/floating_sheet_color_option_size"/>
		</LinearLayout>
		No newline at end of file

res/layout/customization_option_entry_pack_theme.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		style="@style/CustomizationOptionEntryTitleTextStyle"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:text="@string/pack_theme_title"
		android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"
		@@ -42,7 +41,6 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
		android:text="@string/theme_packs_description"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"
		app:layout_constraintStart_toStartOf="parent"
		@@ -62,7 +60,7 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/ic_pack_theme_24px"
		android:contentDescription="@string/pack_theme_preview_card_content_description"
		android:contentDescription="@null"
		android:layout_centerInParent="true"/>
		</RelativeLayout>
		</androidx.constraintlayout.widget.ConstraintLayout>

res/layout/customization_option_entry_screen_saver.xml

0 → 100644

+56 −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.
		-->

		<androidx.constraintlayout.widget.ConstraintLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
		android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
		android:clickable="true">

		<TextView
		android:id="@+id/option_entry_title"
		style="@style/CustomizationOptionEntryTitleTextStyle"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:text="@string/screen_saver_title"
		android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintVertical_chainStyle="packed" />

		<FrameLayout
		android:id="@+id/option_entry_icon_container"
		android:layout_width="@dimen/customization_option_entry_icon_size"
		android:layout_height="@dimen/customization_option_entry_icon_size"
		android:orientation="horizontal"
		android:background="@drawable/customization_option_entry_icon_background"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent">

		<ImageView
		android:id="@+id/option_entry_icon"
		android:layout_width="@dimen/customization_option_screen_saver_icon_size"
		android:layout_height="@dimen/customization_option_screen_saver_icon_size"
		android:src="@drawable/ic_screen_saver_entry_24px"
		android:layout_gravity="center" />
		</FrameLayout>
		</androidx.constraintlayout.widget.ConstraintLayout>