Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit 27ceeeb3 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW5AAKCRDorT+BmrEO
# eAhjAJwPKt+tQ3644OF5Z1lJOxFDbcOVYQCdHxcJ7LI0wHpLi/UM/QSp9x20VnE=
# =yo2M
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:19:00 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 2354 signatures in the past
#      2 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 (39) and others
# Via Automerger Merge Worker (1848) and others
* tag 'android-14.0.0_r29': (116 commits)
  Renaming WhichPreview following the camal case (2/3)
  Move DispatchersModule to /di/modules (2/3)
  Refactor WallpaperModelFactory (3/3)
  Set initial state of themed icon repository
  Refactor clock plugin package
  Fix color in the preview fragment (2/2)
  Import translations. DO NOT MERGE ANYWHERE
  Inject WallpaperInteractor and repository (2/3)
  Fix crash from resetting shortcuts to none
  Fix multiple logs of THEMED_ICON_APPLIED
  Fix repetitive clock color options when onResume
  Fix stale state of the shortcut slot tab a11y content description
  Introduce launch source of keyguard (2/n)
  Log color snapshot (1/2)
  Import translations. DO NOT MERGE ANYWHERE
  Fix Wallpaper Picker loggings
  Changes for a11y of color slider
  Fix color logging crash
  Fix crash at clock carousel
  setStaticWallpaper in WallpaperClient (3/3)
  ...

 Conflicts:
	Android.bp
	AndroidManifest.xml
	res/layout/theme_font_option.xml
	res/layout/theme_icon_option.xml
	res/layout/theme_shape_option.xml
	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/ui/binder/ClockCarouselViewBinder.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/grid/shared/model/GridOptionItemsModel.kt
	src/com/android/customization/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepository.kt
	src/com/android/customization/widget/OptionSelectorController.java
	tests/robotests/src/com/android/customization/model/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepositoryTest.kt
	tests/robotests/src/com/android/customization/model/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractorTest.kt
	tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt

Change-Id: If6ea01b3b1c38f480be368b0b84ac3a9015c39b9
parents 13f173f8 05d630cc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment