Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17
Android 14.0.0 Release 17 (UQ1A.231205.015) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPMwAKCRDorT+BmrEO # eCeFAKCQC9O854kcxSxUYMMgiuqLzlWVfgCdGTj0mdpRySiJOC8mOtrT0l49GdI= # =GgkG # -----END PGP SIGNATURE----- # gpg: Signature made Wed Dec 6 21:44:51 2023 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2194 signatures in the past # 2 years. Encrypted 4 messages in the past 23 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Bill Yi (42) and others # Via Automerger Merge Worker (293) and others * tag 'android-14.0.0_r17': (105 commits) Added changes to WallpaperPreviewer for sending the current state in the picker to WallpaperEngine Fix color picker scroll position resets on select (1/2) Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Give state description to the tabs Enable side-tap for scrolling clock carousel (2/2) Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Remove unused preview arguments (2/3) Rename Preview2 to Preview (2/3) [4/n] Add Apply Button to grid preview page Import translations. DO NOT MERGE ANYWHERE Remove PreviewFragment (2/3) Clock Carousel Card Color Fix Import translations. DO NOT MERGE ANYWHERE Add OWNERS for ThemePicker Removes AOSP tests from TEST_MAPPING Select the default clock if current clock id was not found Makes legacy Injector @Injectable and adds shared singleton Preferences ... Conflicts: src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt src/com/android/customization/module/CustomizationInjector.kt src/com/android/customization/module/DefaultCustomizationSections.java src/com/android/customization/module/ThemePickerInjector.kt src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragment.kt src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselItemViewModel.kt src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt src/com/android/customization/picker/clock/utils/ClockDescriptionUtils.kt src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt Change-Id: I0299d61b1733e8f53d3c33343f66951beef15af8
Loading
Please register or sign in to comment