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

Skip to content
Unverified Commit 281a0e53 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpwAKCRDorT+BmrEO
# eH5GAJ9hdho4mUfWjyeqLHz9+fokVTsHzwCfZyQnUYCIm5Kg9GCXE/3+lhZQDX4=
# =dU+s
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:07 2024 EEST
# 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 2506 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 (8) and others
# Via Android Build Coastguard Worker (30) and others
* tag 'android-14.0.0_r50': (31 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Adjust Color Provider to handle consecutive calls
  Import translations. DO NOT MERGE ANYWHERE
  Add SetFlagRule to WallpaperPreviewActivityTest (2/3)
  Adding some space between items
  Do not save crop hints to preferences (1/3)
  Support cinematic wallpapers (3/3)
  Change slider background bar color
  Fix color option selection indicator
  Fixes WallpaperPickerGoogle Studio build
  Set initial state of themed icon repository
  Migrate Test Targets to New Android Ownership Model
  Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault
  Support logging effect ID has for lock wallpaper (2/3)
  Add margin to preview in grid fragment
  Fix ThemePicker for use_resource_processor: true
  Simplify ThemePicker dependencies
  Use WallpaperPicker2Lib
  ...

 Conflicts:
	Android.bp
	AndroidManifest.xml

Change-Id: I674c846f2838ed444a9006cbf38e26fca008c866
parents 61f272c6 650fcf3e
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