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

Skip to content
Unverified Commit 8b8cb111 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20

Android 15.0.0 Release 20 (BP1A.250305.019)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8epYgAKCRDorT+BmrEO
# eEk6AJ0SDe0Jr6ZhbGmfaeh4InfLDx3iVwCdHcN4FzyPpea5vX3A0xLKsbBFwuI=
# =QXtH
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:31:14 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-15.0.0_r20': (77 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Revert "Fix the layout of the grid option customization (2/2)"
  Fix the layout of the grid option customization (2/2)
  Migrates Monet's Style Enum to @IntDef
  Use bouncy grid option item
  Bind Toolbar colors (2/2)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Make preview smartspace corresponds to the selected clock (1/3)
  Delay color picker back navigation until apply is complete
  Make clock in lockscreen preview use the correct overlayed resources
  Added dependencies in ThemePicker for packagenotifier
  Add disbled background for the apply button (1/2)
  Import translations. DO NOT MERGE ANYWHERE
  Remove Beta tag from themed icon toggle
  Fix the icon for clock style
  Fix clock edit button cropped when overscroll
  Fix clock view out of bound in the carousel
  Revert "Revert "Revert "Revert "Replace field injection with con..."
  Clock thumbnail on clock customization entry
  ...

 Conflicts:
	res/layout/themed_icon_section_view.xml
	res/values/dimens.xml

Change-Id: I805d703ffd46c169d314aa7355321cf4cf56088a
parents 1c8d1e0a 624a8028
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment