Merge tag 'android-14.0.0_r21' #3946
Merged
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
…10452d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529739 Change-Id: I15b264c5b349ec0f0429c4bbe80b4ce4ba473f69 Signed-off-by: Automerger Merge Worker <[email protected]>
…E" into udc-dev am: 1b4cb3e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529739 Change-Id: I97ee32a013455879bcd8f59e45c520731b348c6d Signed-off-by: Automerger Merge Worker <[email protected]>
…36381e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24530195 Change-Id: Ic909ee5e6f9b02daa16880f2245ceabb3b6b5576 Signed-off-by: Automerger Merge Worker <[email protected]>
…E" into udc-dev am: 36f021b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24530195 Change-Id: I7d78817c6a417a78bf1719905cd92fd71fa5ecf6 Signed-off-by: Automerger Merge Worker <[email protected]>
…10452d -s ours am: 2b2d785 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529739 Change-Id: I2c231880bbdbe6719719817e1ebeec3b42dd2e41 Signed-off-by: Automerger Merge Worker <[email protected]>
…E" into udc-dev am: 1b4cb3e -s ours am: 33fc372 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529739 Change-Id: Iff6b290757ec541ec87779342a840a559fc89d37 Signed-off-by: Automerger Merge Worker <[email protected]>
…36381e -s ours am: 09381e3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24530195 Change-Id: Ib2fbe4def4fd5aec093a280fa5cb9aabb6d0f36e Signed-off-by: Automerger Merge Worker <[email protected]>
…E" into udc-dev am: 36f021b -s ours am: 8f76275 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24530195 Change-Id: If03e79226e901a122b39019f2e5bd8ec5279937f Signed-off-by: Automerger Merge Worker <[email protected]>
…0b64f3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529738 Change-Id: I037f6a6d05c860dc55bca862b58d4a0c149a895d Signed-off-by: Automerger Merge Worker <[email protected]>
…E" into udc-d1-dev am: c9ca8eb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529738 Change-Id: If87f14e5d6a4ee8e1951640c1b426b34a3da633d Signed-off-by: Automerger Merge Worker <[email protected]>
Bug: 243191650 Test: PreviewBackgroundTest Flag: ENABLE_CURSOR_HOVER_STATES Change-Id: I8035501203af5c2d97b62cc79e576303e57f8b99
Bug: n/a Test: n/a Flag: n/a Change-Id: Ia227b180732d0acfdc4b648885d5ce208d86ee49
Design doc: go/toasty-taskbar-tapl Test: Compiles Bug: 295366997 Flag: not needed Change-Id: I4f11a9a0c99a736a499ab498b05b20996e1dc59b
The default handling of back in this preIme case already closes the keyboard if we return false, so adding it before our own key handling was stomping on our existing syncronized keyboard. We should still handle other cases where the system ime animation coincides with our control, but we at least shouldn't force it on ourselves. This fixes the back issue in 3 button mode, and also closes all apps on the first back gesture as intended (if you hadn't entered 0 state that is). Demo after fix: https://drive.google.com/file/d/1pK18iEdgxQ0HQmilAMFzn66LVyCH5Ma1/view?usp=drive_link&resourcekey=0-kW4BOC-Pj-wZ_DZL51z6Rg Bug: 270144901 Bug: 277738379 Test: Manual with 3 button mode and gesture nav, with always on keyboard on and off Flag: N/A Change-Id: I9b1c525494b49cde3307df8b0a73d6143ac9c616
Change-Id: I9a44713c3a207eee75222ab24a349de11f483132
Change-Id: I078885948277ccd812ac481e6da54b46a491f85e
* Previously the CUJ was ending after only the launcher side animation was completing, before we actually made the call into shell to launch the tasks Test: Compiles (no baseline to test metrics/latency off of) Bug: 285578568 Change-Id: I958e4a5265cb2fd81f2358343846385058b4465a
Test: atest getIconsPosition_afterIconRemoved_notContained Test: postsubmit flake percentage Bug: 288944469 Change-Id: I51253c066159fbc4d347bceff0f4017c03b01e74
flaky test runs and we can get a screen record. Apologies. I didn't realize how @platinumtest runs. Apparently demotion from platinum test list as of Aug 7th cl/554505521 makes them not run. Bug: b/293944634 Flag: No flag needed. Test only change. Test: No test needed. Purposefully turning on known flaky test for tracking. Change-Id: I3aee2d135bcaf64c35c242b580a92ce538b95896
Change-Id: I81fd3b5d23042bfad093b7ebc44580fea92cae0e
…ser" into udc-qpr-dev
Change-Id: I65a2d2100f3b40b4bd353bce578156e41cac67ac
Test: FastBitmapDrawableTest Fix: 304559962 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08f89425bbd652f9f6e0ad0d31f2e9aba8556705) Merged-In: Ie545cc5da506c77af18f99b5d045cafc37110a5a Change-Id: Ie545cc5da506c77af18f99b5d045cafc37110a5a
…58707'] into udc-qpr1-release. Change-Id: Iaeeb3a4bb9b1148fc54bbe41ed79f4b304ccb57a
Fix: 304911154 Flag: none Test: Swipe up in tablet, scroll to side, launch focused task (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f5de2483bc9eb36128a7f700ca4539591afd186) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c44b3cdda9b8d51ec2142e65674617d34d9a5c9d) Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f Change-Id: I91dd8b4088f02af9dc5e603853d8e26606acc38f
…86887'] into udc-qpr1-release. Change-Id: I8b641f9a2592b2e3eeee9c4a500c518fb7069984
- Set system bars appearance to light/dark depending on device theme to ensure visibility - Also fix issue where taskbar icons would appear partially offscreen and prevent pressing nav buttons if you rotated Fixes: 293438087 Test: adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity - Skip to the end (AllSetActivity), and ensure 3 buttons are visible - Rotate device and ensure 3 buttons are still visible and functional - Will also flash / wipe to the build once it's created Flag: None (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:286fc215e632280fe0b401bfd713621104861288) Merged-In: Ie2d9bf1e1d95a6ccbd1f9c592adb51390b21ad85 Change-Id: Ie2d9bf1e1d95a6ccbd1f9c592adb51390b21ad85
…LONG_PRESS_NAV_HANDLE_MPR". Flag: ENABLE_LONG_PRESS_NAV_HANDLE_MPR Test: Manual Bug: 309689303 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75183ceed565aca0174e4e9707d6cb59dea2fce5) Merged-In: Ib695b3d6ac3f40ee53b6b64bb6b121e7b34d4b07 Change-Id: Ib695b3d6ac3f40ee53b6b64bb6b121e7b34d4b07
…40828', 'googleplex-android-review.googlesource.com/25303662'] into udc-qpr1-release. Change-Id: Ib01d867873f7471977c57410800a32c06d3bdfb2
|
Few chagnes between r18 and r21, see Goooler/Launcher3@android-14.0.0_r18...android-14.0.0_r21 |
Goooler
force-pushed
the
14-dev-merge-launcher3
branch
from
1022b8b to
20c884d
Compare
- Set system bars appearance to light/dark depending on device theme to ensure visibility - Also fix issue where taskbar icons would appear partially offscreen and prevent pressing nav buttons if you rotated Fixes: 293438087 Test: adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity - Skip to the end (AllSetActivity), and ensure 3 buttons are visible - Rotate device and ensure 3 buttons are still visible and functional - Will also flash / wipe to the build once it's created Flag: None (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:286fc215e632280fe0b401bfd713621104861288) Merged-In: Ie2d9bf1e1d95a6ccbd1f9c592adb51390b21ad85 Change-Id: Ie2d9bf1e1d95a6ccbd1f9c592adb51390b21ad85 This cherry-picks from fa65485.
…LONG_PRESS_NAV_HANDLE_MPR". Flag: ENABLE_LONG_PRESS_NAV_HANDLE_MPR Test: Manual Bug: 309689303 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75183ceed565aca0174e4e9707d6cb59dea2fce5) Merged-In: Ib695b3d6ac3f40ee53b6b64bb6b121e7b34d4b07 Change-Id: Ib695b3d6ac3f40ee53b6b64bb6b121e7b34d4b07 This cherry-picks e4de57a.
Goooler
changed the title
|
Wired bad merge! Once you approve this, I'll merge it manually. |
|
It's ok now |
Goooler
force-pushed
the
14-dev-merge-launcher3
branch
from
3cb30ba to
32922a2
Compare
Goooler
changed the title
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.
Re-merge #3945.
https://android.googlesource.com/platform/packages/apps/Launcher3/+/refs/tags/android-14.0.0_r21