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

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

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
# eE5rAJ4itrTO1U35Aeco7p9IPsAVfoTFIQCfS7JJJj7T5oFZMoiMtPzdgjTeFZU=
# =Cfn4
# -----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 Bill Yi (52) and others
# Via Android (Google) Code Review (603) and others
* tag 'android-15.0.0_r6': (678 commits)
  Fix Taskbar Touchable Region when overview is in split select mode
  Prevent archived apps content description from being overridden unexpectedly
  Fix Taskbar to Hotseat Animation for Non-Predective back apps
  Don't invalidate swipe handler until parallel anim finishes
  Fix Taskbar unlock transition
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Move padding from parent to WidgetPagedView and siblings in 2-pane pkr
  Fix small bug with TaskView tile expansion
  Two Taskbar Bug
  Fixing wallpaper preview rendered not being cleaned properly
  Update test activities with a non-default icon.
  Revert "Add support for taskbar background to wrap around hotseat"
  Fix bug with over-expanding split task tile
  Removing unnecessary package validation during grid migration
  Refctor DisplayController#handleInfoChange
  Simple implementation of Taskbar Overflow.
  Skip stash animation when destroying LauncherTaskbarUIController
  Changing min-sdk version of Launcher to 31
  Annotate SettingsChangeLogger with @LauncherAppSingleton (5/n)
  ...

 Conflicts:
	Android.bp
	quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
	quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
	quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
	src/com/android/launcher3/BubbleTextView.java

Change-Id: I92bf55830dad4f369c7366e83025b98e89bdbcef
parents a207446b 712da2cf
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