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

Skip to content
Unverified Commit 72e11361 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+BmrEOeAUCZeZW4QAKCRDorT+BmrEO
# eE4/AJ9E/RZ0j1nWQ520q2J/M7xvr7x9bwCeIbsmQ5h/VhK1tESzl8+Xygmrv0M=
# =N+BS
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:57 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 Bill Yi (84) and others
# Via Automerger Merge Worker (7885) and others
* tag 'android-14.0.0_r29': (778 commits)
  Revert "Adding ReorderParameters to ReorderAlgorithm"
  Revert to passing mIsStashed to StashedHandleViewController again
  Import translations. DO NOT MERGE ANYWHERE
  Adding support for skipping animation cancel on reapply
  Revert "Revert "Revert "Removing unnecessary iconFactory class w..."
  Send app bounds to Shell via stopSwipePipToHome
  Fix onIsStashedChanged() not called in 3 button mode
  Hide taskbar icons for IME when virtual keyboard is present.
  Fix layering issue when launching from side TaskView
  Disabling the failing piece of a test in presubmit
  Introduce taskbar_phone_size
  Remove duplicated widget host view reinflation on screen rotation
  Make sure the task bar stays unstashed upon configuration change
  Move taskbar clean up so that it only gets called when user swipes up to go home.
  Update two pane sheet widget picker to use RelativeLayout since ConstraintLayout was causing test failures
  Inserting waiting for settling in the Workspace state after "back" from All Apps
  Increasing the LOW_TICK intensity of haptic feedback for taskbar invocation
  Adds more in depth logging of Launcher restore functionality
  Fix crash when restoring data from phone to tablet with responsive grid
  TaskbarPinningController Unit Tests
  ...

 Conflicts:
	Android.bp
	quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
	quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
	quickstep/src/com/android/quickstep/TaskAnimationManager.java
	quickstep/src/com/android/quickstep/TaskViewUtils.java
	quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
	src/com/android/launcher3/BubbleTextView.java
	src/com/android/launcher3/InvariantDeviceProfile.java
	src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
	src/com/android/launcher3/allapps/AlphabeticalAppsList.java
	src/com/android/launcher3/config/FeatureFlags.java
	src/com/android/launcher3/settings/SettingsActivity.java

Change-Id: Ie2506b248c2500d0d79f3e4cee2607e454a9c51b
parents 2c08943a 5f635e80
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