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

Unverified Commit 34978482 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r4' into staging/lineage-23.2_merge-android-16.0.0_r4

Android 16.0.0 release 4

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS5huQAKCRDorT+BmrEO
# eKstAJ9pC/QmsYeRAEVKukEa/agDpecrwgCfV/C2R21SE4dVuNF97+TxN3LlRZQ=
# =r7i3
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  2 05:49:13 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-16.0.0_r4': (65 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Add clock packages to WPP plugin allow-list
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add Icons content observer to additional Launcher URI
  Clean up monochromatic flag (2/3)
  Clean isNewPickerUi flag in ColorProvider
  Import translations. DO NOT MERGE ANYWHERE
  Wrap privileged plugins in config object
  Update PluginEnabler implementation to match updated interface
  Update Plugin constructor apis
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Refactor monet.Style to ThemeStyle
  Disable the entry option until gRPC response with intent.
  Add local flag for color picker compose UI update (2/2)
  Fix talkback issue for the entry option.
  Import translations. DO NOT MERGE ANYWHERE
  [3] Integrate WallpaperModel into LiveWallpaperClient
  Add icon style logging (2/4)
  ...

 Conflicts:
	Android.bp
	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-as/strings.xml
	res/values-az/strings.xml
	res/values-b+sr+Latn/strings.xml
	res/values-be/strings.xml
	res/values-bg/strings.xml
	res/values-bn/strings.xml
	res/values-bs/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rAU/strings.xml
	res/values-en-rCA/strings.xml
	res/values-en-rGB/strings.xml
	res/values-en-rIN/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-eu/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl/strings.xml
	res/values-gu/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-hy/strings.xml
	res/values-in/strings.xml
	res/values-is/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ka/strings.xml
	res/values-kk/strings.xml
	res/values-km/strings.xml
	res/values-kn/strings.xml
	res/values-ko/strings.xml
	res/values-ky/strings.xml
	res/values-lo/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-mk/strings.xml
	res/values-ml/strings.xml
	res/values-mn/strings.xml
	res/values-mr/strings.xml
	res/values-ms/strings.xml
	res/values-my/strings.xml
	res/values-nb/strings.xml
	res/values-ne/strings.xml
	res/values-nl/strings.xml
	res/values-or/strings.xml
	res/values-pa/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-si/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sq/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-ta/strings.xml
	res/values-te/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-ur/strings.xml
	res/values-uz/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rHK/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
	src/com/android/customization/picker/icon/domain/interactor/AppIconInteractor.kt
	src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
	src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt

Change-Id: I4103ea480a3445992bb780915ec01edf10db47d1
parents 2f6040dc 107217a2
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