Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6
Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO # eLuCAJ9TgaVPRwWA4Iu06DqcoTACoMQVFQCeOgOB3D+m/bdk9NCkQGQRVMM1tFs= # =s3b7 # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:02 2024 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 2470 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # 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 George Lin (33) and others # Via Android Build Coastguard Worker (48) and others * tag 'android-15.0.0_r6': (80 commits) Import translations. DO NOT MERGE ANYWHERE Fix clock being clipped when scaled down in new customization picker ui Make colorContrast setting dependent on framework value Import translations. DO NOT MERGE ANYWHERE Increase max color options size Adding launch source info in the wallpaper picker intent (2/3) Match height for ColorSectionView and WallpaperQuickSwitchView Clock customization screen (1/3) Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Add changes for category wrapper Apply button Remove the SHAPE enrty Send messages to launcher renderer to update grid (2/3) Grid customiztion screen (1/2) Make java_sdk_library dependencies explicit Update More Wallpapers text color on system color change (2/2) Animate tab color change when system color is changed (2/2) Remove unused line in DoubleRowListItemSpacing ... Conflicts: res/values/dimens.xml src/com/android/customization/module/DefaultCustomizationSections.java src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt Change-Id: I1576fd788f6a5a082c99e52ebe019d095904df99
Loading
Please register or sign in to comment