From aa582fc0bcca4d2a3ad3b765903b5c90d4d693bb Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 16 Oct 2024 19:11:04 +0530 Subject: [PATCH 1/5] ThemePicker: Remove wallpaper color selection --- .../module/DefaultCustomizationSections.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java index 9195e4a65..31df74cde 100644 --- a/src/com/android/customization/module/DefaultCustomizationSections.java +++ b/src/com/android/customization/module/DefaultCustomizationSections.java @@ -158,23 +158,13 @@ public final class DefaultCustomizationSections implements CustomizationSections customizationPickerViewModel)); sectionControllers.add( - new ConnectedSectionController( - // Theme color section. - new ColorSectionController( - sectionNavigationController, - new ViewModelProvider( - activity, - mColorPickerViewModelFactory) - .get(ColorPickerViewModel.class), - lifecycleOwner), - // Wallpaper quick switch section. - new WallpaperQuickSwitchSectionController( - customizationPickerViewModel.getWallpaperQuickSwitchViewModel( - screen), - lifecycleOwner, - sectionNavigationController, - savedInstanceState == null), - /* reverseOrderWhenHorizontal= */ true)); + // Wallpaper quick switch section. + new WallpaperQuickSwitchSectionController( + customizationPickerViewModel.getWallpaperQuickSwitchViewModel( + screen), + lifecycleOwner, + sectionNavigationController, + savedInstanceState == null)); switch (screen) { case LOCK_SCREEN: -- GitLab From 2bfd38020f75a12488ce031ff759df16a76be16c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 2 Jun 2025 22:51:33 +0200 Subject: [PATCH 2/5] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7a4a3ea24 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. \ No newline at end of file -- GitLab From 2b55c249cd5dcf0fbb78eddb2205926bb9944199 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 1 Nov 2019 23:17:08 +0100 Subject: [PATCH 3/5] Specify we read and write launcher settings Change-Id: Ifc8196588443b007602118389ca76d34ab531f14 --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2f3425303..0f6b5b12b 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -61,6 +61,9 @@ + + + Date: Tue, 4 Apr 2023 11:21:27 +0000 Subject: [PATCH 4/5] ThemePicker: Adjust permission for changed packagename Change-Id: If81882ee61b9bcc652ff3c73f2507867c3d5a5a0 --- AndroidManifest.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0f6b5b12b..014a7ce41 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,6 +26,7 @@ + @@ -61,8 +62,8 @@ - - + + Date: Thu, 17 Oct 2024 15:22:42 +0530 Subject: [PATCH 5/5] Theme components to match our palette --- res/drawable/clock_color_size_button_background_base.xml | 2 +- res/drawable/option_border.xml | 2 +- res/layout/dark_mode_section_view.xml | 3 +-- res/layout/notification_section.xml | 3 +-- res/layout/themed_icon_section_view.xml | 3 +-- .../customization/model/mode/DarkModeSectionController.java | 4 ++-- .../customization/picker/mode/DarkModeSectionView.java | 4 ++-- .../notifications/ui/binder/NotificationSectionBinder.kt | 4 ++-- .../picker/themedicon/ThemedIconSectionView.java | 6 +++--- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/res/drawable/clock_color_size_button_background_base.xml b/res/drawable/clock_color_size_button_background_base.xml index 2e6f2be5e..e29b9f2a0 100644 --- a/res/drawable/clock_color_size_button_background_base.xml +++ b/res/drawable/clock_color_size_button_background_base.xml @@ -17,5 +17,5 @@ - + \ No newline at end of file diff --git a/res/drawable/option_border.xml b/res/drawable/option_border.xml index d0fde5cab..fce166633 100644 --- a/res/drawable/option_border.xml +++ b/res/drawable/option_border.xml @@ -23,7 +23,7 @@ - + diff --git a/res/layout/dark_mode_section_view.xml b/res/layout/dark_mode_section_view.xml index 7eae574aa..be7385dd2 100644 --- a/res/layout/dark_mode_section_view.xml +++ b/res/layout/dark_mode_section_view.xml @@ -33,14 +33,13 @@ android:text="@string/mode_title" style="@style/SectionTitleTextStyle" /> - - diff --git a/res/layout/themed_icon_section_view.xml b/res/layout/themed_icon_section_view.xml index 715423356..26d742d41 100644 --- a/res/layout/themed_icon_section_view.xml +++ b/res/layout/themed_icon_section_view.xml @@ -39,14 +39,13 @@ android:text="@string/themed_icon_title" style="@style/SectionTitleTextStyle" /> - switchView.setChecked(mIsDarkModeActivated) diff --git a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt index fe1ec330d..7b81f00f3 100644 --- a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt +++ b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt @@ -19,13 +19,13 @@ package com.android.customization.picker.notifications.ui.binder import android.annotation.SuppressLint import android.view.View +import android.widget.Switch; import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel import com.android.themepicker.R -import com.google.android.material.materialswitch.MaterialSwitch import kotlinx.coroutines.launch /** @@ -38,7 +38,7 @@ object NotificationSectionBinder { viewModel: NotificationSectionViewModel, lifecycleOwner: LifecycleOwner, ) { - val switch: MaterialSwitch = view.requireViewById(R.id.switcher) + val switch: Switch = view.requireViewById(R.id.switcher) view.setOnClickListener { viewModel.onClicked() } diff --git a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java index 5b379a9cf..2bbe74ee0 100644 --- a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java +++ b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java @@ -17,19 +17,19 @@ package com.android.customization.picker.themedicon; import android.content.Context; import android.util.AttributeSet; +import android.widget.Switch; import androidx.annotation.Nullable; import com.android.themepicker.R; import com.android.wallpaper.picker.SectionView; -import com.google.android.material.materialswitch.MaterialSwitch; /** * The {@link SectionView} for themed icon section view */ public class ThemedIconSectionView extends SectionView { - private MaterialSwitch mSwitchView; + private Switch mSwitchView; public ThemedIconSectionView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); @@ -49,7 +49,7 @@ public class ThemedIconSectionView extends SectionView { } /** Gets the switch view. */ - public MaterialSwitch getSwitch() { + public Switch getSwitch() { return mSwitchView; } } -- GitLab