Merge tag 'android-14.0.0_r29' #4112
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flag: NA Bug: 314190226 Test: this LDAPs should apear as owners Change-Id: Ia1e84fa3e3eeb2b94be256ad34833b330d469bd5
… b..."" into main
Change-Id: I07c5bdf273ac6f154e4838dd065271c54b10e33f
…rderAlgorithm" into main
Bug: 187761685 Test: presubmit Flag: N/A Change-Id: Ib73785d7421ebc0fb899cb02ae8c29b6bbad968e
Revert submission 25509210-proxy-kotlin Reason for revert: test revert b/314219394 Reverted changes: /q/submissionid:25509210-proxy-kotlin Change-Id: I3ada33461886ba2428b6b768cacc0d5454d543a3
This reverts commit 77e0faa. Reason for revert: Causes a 100% failing test see b/314206230 Change-Id: Icfc5bb4bace17b630bfd74a1460f6d1748d8d9d3
Fix: 311646336 Fix: 281021558 Test: TaskGridNavHelperTest Flag: N/A Change-Id: Iad5a2eec22f8fa4519a6a1f7bcde097e00d6b142
This reverts commit 311afc6. Reason for revert: Resubmitting with updated screenshots Change-Id: Ieb114c06376cf46b90b140490a54cbae592c8f5a
Also decouple focus indicator radius from ENABLE_DEVICE_SEARCH feature flag, as it is used on home screen as well as all apps. Bug: 313665319 Test: Manual. Flag: N/A. Change-Id: I629c1180b1b1b6797e2c3ba6ca13da04e8fa392b
Description: in ag/24721149 we stopped inflating IconView from Task.xml and instead used a viewstub. When creating files to fill the viewstub, we forgot to place the correct attributes on Icon_view.xml. We did place them correctly elsewhere. Anyways this is why we were seeing focusable icons. Flag: None Test: Built locally, will follow up with automation Bug: 307461880 Change-Id: I45f895c8545a80f80c79709180f2878476d10221
Fix: 314158312 Flag: LEGACY SHRINK_NAV_HANDLE_ON_PRESS DISABLED Test: Manual Change-Id: Icd46467939ae9a38592ee67ee0d2a521eb8e0b6c
…delCallbacks" into main
Bug: 313926097 Flag: N/A Test: presubmit Change-Id: I795571ec191b01929bb871fd021d8653449bb608
This is a no-op thoroughly tested by ReorderAlgorithmUnitTest. Flag: NA Bug: 229292911 Test: ReorderAlgorithmUnitTest Change-Id: I7203444df289cd3b67794fc570a2cd46e64549a2
Fix: 312159033 Flag: NONE Test: verified on device Change-Id: I69e39c9041ff2d0a2ac3a6459a4c85c131a1b785
ENABLE_SEARCH_HAPTIC_COMMIT should be enabled for now to keep consistency in behavior. Test: Manual Flag: LEGACY ENABLE_SEARCH_HAPTIC_COMMIT ENABLED Bug: 314005577 Change-Id: I98e2dea91fe58b6abaeeb63f6c92a5ee130b5204
The haptic hint can now be made up to 200 itertions long (2.4 seconds) Test: Manual Flag: LEGACY ENABLE_SEARCH_HAPTIC_HINT DISABLED Change-Id: I9c92d3cb24fabfa3b0d318a77d312423501737a6
Bug: 315847371 Test: presubmit Flag: N/A Change-Id: I9cf9818946de8b53edc8c44cbd9e673f3bea832f
Fully reverted the change in ag/24840504, and instead make use of prefixOrderIndex to ensure translucent overlays launch on top of the underlying task. Test: Swipe up from an app to Overview (phone), scroll over one task, click on the live tile you came from; ensure animates well Test: Open an app, launch a translucent overlay, e.g. Volume Dialog, swipe up to Overview and relaunch the live tasks; ensure the overlay stays on top throughout the animation Fixes: 310765248 Flag: ACONFIG com.android.launcher3.enable_grid_only_overview TEAMFOOD Change-Id: I0708bf3c060ba84089722d0bd9480a4f4bd2b8e2
Change-Id: Icf409ee8730334bf41d9f794c7465e31d17d3f8f
Change-Id: Ica1a6f5f023ee8132ae1d8d96195b78d4cafb3b3
Unless hardware keyboard is attached and taskbar is pinned. Fix: 316270741 Bug: 255818649 Test: Manual. Using combinations of transient taskbar, virtual and hardware keyboards. Flag: NONE (cherry picked from commit 559434af5a6a3f65c9e994cc032e627962b1d41b) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e05208ec32f454b3fc279bbc54dabab0b330df94) Merged-In: I1fae1655fc16b9fa951510cf834d2a33cb8956d8 Change-Id: I1fae1655fc16b9fa951510cf834d2a33cb8956d8
…33305'] into 24Q1-release. Change-Id: I3520a624a01ece14fa2382cae2c0ce7b157fdc4e
Calling this ensures we update touchableRegion accordingly. Since this will also start the stashed handle region sampling, which we don't need for 3 button mode, also adjust logic to check that the StashedHandleView is actually visible. Flag: None Test: Lock screen, run `adb shell cmd uimode night yes`, unlock Test: Lock screen, rotate, unlock In both cases, verify touchableRegion is accurate Fixes: 315393203 (cherry picked from commit 438e6c90af73660fd5a46b4fb3872a033c618efe) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5c3404751afa62a8cab91b357e30a9595724c942) Merged-In: I951af6b97cad0ee0f362dc22f3996cfd9286a21e Change-Id: I951af6b97cad0ee0f362dc22f3996cfd9286a21e
…31636'] into 24Q1-release. Change-Id: Id7d5d0f0ad978ee2705b606b3cf378a111f55930
Send app bounds used for content overlay by launcher to Shell's PiP component. This is used by Shell to reset overlay scale and offset properly after the enter animation but before the overlay fades out to avoid icon shifts. We observed that app bounds can be different depending on whether we are at 90 deg or 270 deg before fixed rotation. Moreover, the presence of the taskbar can also alter the app bounds. So supplying the app bounds we take from task view simulator to Shell should solve the issue in general. Flag: NONE Bug: 316993346 Test: manually enter PiP w/ fixed rotation in 90 or 270 deg (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:221457f00bb6e323aa57957392aafc549207653d) Merged-In: I0a26b0c69020dae399d6794d36a9f3bc8425f40b Change-Id: I0a26b0c69020dae399d6794d36a9f3bc8425f40b
Revert submission 25546504-revert-25518508-revert-25483550-themed-badge-GJNKEECDMN-LXXYVCLXNR Reason for revert: b/317566432 Bug: 317566432 Reverted changes: /q/submissionid:25546504-revert-25518508-revert-25483550-themed-badge-GJNKEECDMN-LXXYVCLXNR (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ac10660f29caeb46af159fe8c4af82467824d50) Merged-In: I2147c16961bb8ee27844cb4d17af5bdeb26d5d5f Change-Id: I2147c16961bb8ee27844cb4d17af5bdeb26d5d5f
…80352', 'googleplex-android-review.googlesource.com/25840288'] into 24Q1-release. Change-Id: I76bde343f53f05c299d0a88fe366fca5d38c8661
Bug: 314279319 Test: Verified on device Flag: None (cherry picked from commit 98b5e1f07761cfee9447a12b09a004dcb7254bce) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ba0feaa2d28a27b77f755d77a5289ac697800dde) Merged-In: I0a6e9eef77a1d917c0fce7d4bddd079ceeb10c99 Change-Id: I0a6e9eef77a1d917c0fce7d4bddd079ceeb10c99
…52868'] into 24Q1-release. Change-Id: I28e98f32de6d21313478fa2a3dc87d643169e7f7
Auto-generated-cl: translation import (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2f863664af7125cdb9c80bb37ce1f36d2b99c239) Merged-In: Iecc8364731c1fd3bd540875601599642a36a1e96 Change-Id: Iecc8364731c1fd3bd540875601599642a36a1e96
…68375'] into 24Q1-release. Change-Id: I90764cb354439211852c7d6c14f281a629f83a59
- Fixes case where handle is initially invisible but will be stashed and visible, e.g. when launching an app from home screen - To fix the original issue of sampling happening unnecessarily for three button nav, also check supportsVisualStashing() Fixes: 321257120 Flag: None Test: Launch an app from home in gesture nav mode Test: testThreeButtonsTaskbarBoundsAfterConfigChangeDuringIme (cherry picked from commit c4df8c2ec68d443716dcb004f77b7bda8a5aaf6a) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c5f03fd1bcfc24ec63bdd62b0606452f28d15664) Merged-In: I1f26436de3081fd00f75a5921010e361e9a9f34e Change-Id: I1f26436de3081fd00f75a5921010e361e9a9f34e
…72138'] into 24Q1-release. Change-Id: I103e9c75610c791190702f706f8f3ec0671342a4
This reverts commit 25f8e40. Reason for revert: b/318417510 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:93715f140b818d1b2294a79b5d24f2a3cbd2dac1) Merged-In: I175a49b6cf7db82eeec71fa24930736b58f8ed00 Change-Id: I175a49b6cf7db82eeec71fa24930736b58f8ed00
…72215'] into 24Q1-release. Change-Id: I86b6ff05cf12d9d65720af605ea3cca334bdee1a
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 07:18:57 2024 CST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Can't check signature: No public key # Conflicts: # build.gradle # quickstep/res/layout/split_instructions_view.xml # quickstep/res/layout/task_desktop.xml # quickstep/res/values-de/strings.xml # quickstep/src/com/android/launcher3/QuickstepTransitionManager.java # quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java # quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java # quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java # quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarView.java # quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java # quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java # quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt # quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java # quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java # quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java # quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java # quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java # quickstep/src/com/android/quickstep/LauncherBackAnimationController.java # quickstep/src/com/android/quickstep/RecentsActivity.java # quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java # quickstep/src/com/android/quickstep/RecentsModel.java # quickstep/src/com/android/quickstep/SystemUiProxy.java # quickstep/src/com/android/quickstep/TaskAnimationManager.java # quickstep/src/com/android/quickstep/TaskIconCache.java # quickstep/src/com/android/quickstep/TaskOverlayFactory.java # quickstep/src/com/android/quickstep/TaskShortcutFactory.java # quickstep/src/com/android/quickstep/TaskViewUtils.java # quickstep/src/com/android/quickstep/TouchInteractionService.java # quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java # quickstep/src/com/android/quickstep/util/AppPairsController.java # quickstep/src/com/android/quickstep/util/AsyncClockEventDelegate.java # quickstep/src/com/android/quickstep/util/BorderAnimator.java # quickstep/src/com/android/quickstep/util/TaskViewSimulator.java # quickstep/src/com/android/quickstep/util/TransformParams.java # quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java # quickstep/src/com/android/quickstep/views/GroupedTaskView.java # quickstep/src/com/android/quickstep/views/RecentsView.java # quickstep/src/com/android/quickstep/views/TaskMenuView.java # quickstep/src/com/android/quickstep/views/TaskView.java # res/values-ar/strings.xml # res/values-iw/strings.xml # res/values-ja/strings.xml # res/values-pt/strings.xml # res/values-ro/strings.xml # res/values-ru/strings.xml # res/values-zh-rCN/strings.xml # res/values/dimens.xml # src/com/android/launcher3/AbstractFloatingView.java # src/com/android/launcher3/AppWidgetResizeFrame.java # src/com/android/launcher3/BaseDraggingActivity.java # src/com/android/launcher3/BubbleTextView.java # src/com/android/launcher3/CellLayout.java # src/com/android/launcher3/DeviceProfile.java # src/com/android/launcher3/ExtendedEditText.java # src/com/android/launcher3/FastScrollRecyclerView.java # src/com/android/launcher3/Hotseat.java # src/com/android/launcher3/InvariantDeviceProfile.java # src/com/android/launcher3/Launcher.java # src/com/android/launcher3/LauncherAppState.java # src/com/android/launcher3/LauncherProvider.java # src/com/android/launcher3/ShortcutAndWidgetContainer.java # src/com/android/launcher3/Utilities.java # src/com/android/launcher3/Workspace.java # src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java # src/com/android/launcher3/allapps/AllAppsStore.java # src/com/android/launcher3/allapps/AllAppsTransitionController.java # src/com/android/launcher3/allapps/BaseAllAppsAdapter.java # src/com/android/launcher3/allapps/WorkProfileManager.java # src/com/android/launcher3/config/FeatureFlags.java # src/com/android/launcher3/dragndrop/DragView.java # src/com/android/launcher3/folder/Folder.java # src/com/android/launcher3/folder/LauncherDelegate.java # src/com/android/launcher3/folder/PreviewItemManager.java # src/com/android/launcher3/graphics/LauncherPreviewRenderer.java # src/com/android/launcher3/graphics/SysUiScrim.java # src/com/android/launcher3/icons/LauncherIcons.java # src/com/android/launcher3/logging/StartupLatencyLogger.kt # src/com/android/launcher3/logging/StatsLogManager.java # src/com/android/launcher3/model/BaseLauncherBinder.java # src/com/android/launcher3/model/BgDataModel.java # src/com/android/launcher3/model/DatabaseHelper.java # src/com/android/launcher3/model/GridSizeMigrationUtil.java # src/com/android/launcher3/model/LoaderCursor.java # src/com/android/launcher3/model/LoaderTask.java # src/com/android/launcher3/model/ModelDbController.java # src/com/android/launcher3/model/ModelWriter.java # src/com/android/launcher3/model/PackageUpdatedTask.java # src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java # src/com/android/launcher3/pageindicators/PageIndicatorDots.java # src/com/android/launcher3/pm/UserCache.java # src/com/android/launcher3/popup/ArrowPopup.java # src/com/android/launcher3/popup/PopupContainerWithArrow.java # src/com/android/launcher3/provider/RestoreDbTask.java # src/com/android/launcher3/qsb/QsbContainerView.java # src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java # src/com/android/launcher3/settings/SettingsActivity.java # src/com/android/launcher3/shortcuts/DeepShortcutTextView.java # src/com/android/launcher3/touch/AllAppsSwipeController.java # src/com/android/launcher3/util/DisplayController.java # src/com/android/launcher3/util/OnboardingPrefs.java # src/com/android/launcher3/util/VibratorWrapper.java # src/com/android/launcher3/views/ActivityContext.java # src/com/android/launcher3/views/FloatingIconView.java # src/com/android/launcher3/views/OptionsPopupView.java # src/com/android/launcher3/widget/BaseWidgetSheet.java # src/com/android/launcher3/widget/picker/WidgetsFullSheet.java # tests/shared/com/android/launcher3/testing/shared/TestProtocol.java # tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt # tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Reverted some format changes form before merges.
Goooler/Launcher3@android-14.0.0_r28...android-14.0.0_r29
Type of change
❌ General change (non-breaking change that doesn't fit the below categories like copyediting)
❌ Bug fix (non-breaking change which fixes an issue)
✅ New feature (non-breaking change which adds functionality)
❌ Breaking change (fix or feature that would cause existing functionality to not work as expected)