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

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

Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35

Android 13.0.0 release 35

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jxgAKCRDorT+BmrEO
# eC+dAJ9LGKkPOPk+xq5dFB3ajg+Tv73H5wCfVvNF2b+CSpFsDW7o5uuo4SQO5WE=
# =t0l+
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 13 19:56:22 2023 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 1595 signatures in the past
#      16 months.  Encrypted 4 messages in the past 14 months.
# 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 Alex Chau (34) and others
# Via Android (Google) Code Review (410) and others
* tag 'android-13.0.0_r35': (432 commits)
  Disable Transient Taskbar
  Import translations. DO NOT MERGE ANYWHERE
  Fixing work tab is not updated when work-mode changes
  Improves overview split adjacent launch animation
  Add logging to work mode switch
  Re-enable the fast scroll in widget picker
  Fix NPE from getting swipe pip to home animator finish transation after the surface has been released
  Re-enabling testShortcutIconWithTheme
  Revert "Add logging to help debug additional app infos being updated by CacheDataUpdatedTask"
  [ShellTransit] Stabilize QuickSwitch test since Launcher can resumed.
  Toggle taskbar button nav assistant availability
  Turn off filter ui if flag is off
  Add icon scale and alpha animation for entering downloading state from pending state
  Ignoring failing out-of-SLO test
  LauncherTaskbarUIController should only translate nav buttons on inAppProgresst if icon is aligned with hotseat
  Use DisplayController INSTANCE for info instead of IDP INSTANCE.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Update taskbar to spec
  ...

 Conflicts:
	Android.bp
	AndroidManifest-common.xml
	quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
	res/drawable/bg_all_apps_searchbox.xml
	res/layout/search_container_all_apps.xml
	res/layout/secondary_launcher.xml
	res/values/dimens.xml
	res/xml/device_profiles.xml
	src/com/android/launcher3/DeviceProfile.java
	src/com/android/launcher3/InvariantDeviceProfile.java
	src/com/android/launcher3/allapps/SearchTransitionController.java
	src/com/android/launcher3/dragndrop/DragController.java
	src/com/android/launcher3/touch/ItemClickHandler.java

Change-Id: Iae2765343f17c18da8ff4a68cb9f5f289c06ab8d
parents 70e0e627 2c34cba0
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