2cb1e6bcda
[automerger skipped] Merge "Merge Android R" am: 75abb09acd -s ours am: 284bd39fdc -s ours
...
am skip reason: Change-Id I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc with SHA-1 05bfabfc02https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1422340
Change-Id: I451c2ec603e6d3a00228726c894056a2be78dcf3
2020-09-11 02:02:19 +00:00
284bd39fdc
[automerger skipped] Merge "Merge Android R" am: 75abb09acd -s ours
...
am skip reason: Change-Id I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc with SHA-1 05bfabfc02https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1422340
Change-Id: If41856764970db256c8768944512d3f0ca47e1e2
2020-09-11 00:39:34 +00:00
75abb09acd
Merge "Merge Android R"
2020-09-10 17:22:14 +00:00
192d17e08a
Merge Android R
...
Bug: 168057903
Merged-In: I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc
Change-Id: Id6e38ad638ffc856e26b8b1935c16f077dbd82c4
2020-09-08 16:56:03 -07:00
e69488009e
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 05bfabfc02 -s ours
...
am skip reason: Change-Id I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836 with SHA-1 e8e680005dhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12483917
Change-Id: Iacf35e3c0c411447b67d32c76d9cc6a709099073
2020-09-01 20:36:48 +00:00
05bfabfc02
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836
Change-Id: I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc
2020-08-28 13:11:13 -07:00
f617d254ca
[automerger skipped] Merge "AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE" am: af6968dcec am: c7e0fc92e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245
Change-Id: I2fdfd4d0e070d887121b53d557114083d4ed9501
2020-08-05 18:10:17 +00:00
5118ee7309
[automerger skipped] AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE am: d0a660cf22 am: b9bb107cbe -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245
Change-Id: I88a63b6a030a358386d18bca464654b33ce187de
2020-08-05 18:10:13 +00:00
c7e0fc92e2
Merge "AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE" am: af6968dcec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245
Change-Id: Ifbdb131abace787a21d5e7e53e4531598ddf0607
2020-08-05 17:54:47 +00:00
b9bb107cbe
AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE am: d0a660cf22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245
Change-Id: I8d212a52072c180304707a51d1031c23a31d2a9a
2020-08-05 17:54:45 +00:00
af6968dcec
Merge "AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE"
2020-08-05 17:40:02 +00:00
d0a660cf22
AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance. DO NOT MERGE
...
Fixed check-style errors.
These files are AOSP specific files and they don't exist in the internal code.
See https://source.android.com/setup/contribute/respectful-code for reference
BUG=161896447
Test: m and Launcher3Tests
$ find out -name "Launcher*.apk" -print -exec ls -l {} \;
out/target/product/bonito/testcases/Launcher3Tests/arm64/Launcher3Tests.apk
-rw-r----- 1 rtenneti primarygroup 947525 Aug 4 16:22 out/target/product/bonito/testcases/Launcher3Tests/arm64/Launcher3Tests.apk
out/target/product/bonito/system_ext/priv-app/Launcher3QuickStep/Launcher3QuickStep.apk
-rw-r----- 1 rtenneti primarygroup 9249956 Aug 4 16:20 out/target/product/bonito/system_ext/priv-app/Launcher3QuickStep/Launcher3QuickStep.apk
Change-Id: I428eaa50ada96567a3b583eca1aa8ee2d8b85e6b
2020-08-05 17:17:35 +00:00
e8e680005d
Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f13231
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12152234
Change-Id: I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836
2020-07-15 23:47:29 +00:00
8127f13231
Merge "Calculate all apps cell height based on actual sizes." into rvc-dev
2020-07-15 23:32:58 +00:00
f06e1b8b93
Calculate all apps cell height based on actual sizes.
...
This ensures that the cell contents always fit.
Bug: 160716074
Change-Id: I3d85adec3e7e3652fe4a258bd659382a3e696211
Merged-In: I3d85adec3e7e3652fe4a258bd659382a3e696211
(cherry picked from commit 3535944395
2020-07-15 20:43:28 +00:00
c3771e64d9
Fixing swiping up on home interrupting animation am: d481c5c58c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12152002
Change-Id: I62a4e0cb58d2159730295129724b05cbfdc11af4
2020-07-15 19:56:21 +00:00
d481c5c58c
Fixing swiping up on home interrupting animation
...
Bug: 161180005
Change-Id: Ida59b87b2fb5905d98b0090630a6ce32fc9c36c8
Merged-In: Ida59b87b2fb5905d98b0090630a6ce32fc9c36c8
(cherry picked from commit 93188d61da
2020-07-15 07:11:30 +00:00
0ed6042555
Preventing disambiguation screen when swiping up am: f130c29882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12141303
Change-Id: I77b4149f114788606d1b249adf2e1bfe82de65af
2020-07-13 21:37:58 +00:00
f130c29882
Preventing disambiguation screen when swiping up
...
Bug: 161052537
Change-Id: Ibeeba0841963dc5eb1b5a09847cafc26eb6e4adc
2020-07-13 19:03:56 +00:00
9824cf5312
[automerger skipped] Import translations. DO NOT MERGE am: e9bf882158 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12130183
Change-Id: I4fc4e7b43dc01a84f612a7e188622d9778b87573
2020-07-11 04:54:04 +00:00
e9bf882158
Import translations. DO NOT MERGE
...
Force snapping translations from unbundled branch
Bug: 159176821
Test: N/A
Change-Id: I2406edf7eef6aa683f99b2b5f897d16b8968a28d
2020-07-10 12:07:45 -07:00
9723e7dc34
Merge "Persist prediction cache on every update" into rvc-dev am: 7f1f8030db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12077951
Change-Id: Ia9622f423bad11b8d07689d773748dce03e22ec9
2020-07-08 18:46:23 +00:00
7f1f8030db
Merge "Persist prediction cache on every update" into rvc-dev
2020-07-08 18:35:26 +00:00
15a729010f
Fixing recents orientation (when home rotation is allowed) during swipe-up am: 52f2392405
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12102312
Change-Id: I76c430848b00f186956f6fc5bf44bce590315bb0
2020-07-08 05:11:50 +00:00
52f2392405
Fixing recents orientation (when home rotation is allowed) during swipe-up
...
Bug: 158781568
Bug: 160149607
Change-Id: I27be09febcdb6f19687469db34b002ce682aa0cb
Merged-In: I27be09febcdb6f19687469db34b002ce682aa0cb
(cherry picked from commit 141c231d2f
2020-07-08 00:24:29 +00:00
f16456f686
Persist prediction cache on every update
...
Test: Manual
Bug: 160058750
Change-Id: Icb0b7322b7f9754d3f1c3012e1c98a760f83c787
2020-07-07 18:22:37 +00:00
7630ccd24a
Go Launcher: Fix icon placement retention am: 8f490e21c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12094432
Change-Id: I1a8084747333cf2ff5b1c816a05b78eb00f7bab4
2020-07-07 16:45:15 +00:00
8f490e21c9
Go Launcher: Fix icon placement retention
...
We need dbFile set when MULTI_DB_GRID_MIRATION_ALGO is in
use. This was set for other launchers, but not the Go launcher.
Bug: 157557047
Test: Built, flashed, moved icons on home screen, rebooted, and confirmed icons retained their position.
Change-Id: Icfcb56e00a8ac2f74e5f7a1957fd46cee5cb8b5b
2020-07-07 04:58:57 +00:00
2c82e23920
Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12035575
Change-Id: Iec769c64a40d9c614bc3be9983a1317dd2b2ec0e
2020-06-29 23:51:40 +00:00
6f5d4bb8ab
Merge "Fixes NPE with system shortcuts." into rvc-dev
2020-06-29 23:35:59 +00:00
06d3cbdbc7
Thumbnail Cache - check canceled status on the right thread. am: 19797b419b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12029198
Change-Id: I407be8a43fc607be1872285b72d753b532b3c41f
2020-06-29 22:22:17 +00:00
43bf883841
Fixes NPE with system shortcuts.
...
Bug: 160109140
Change-Id: I35c00fc1792fcf11fc61e1876f9184bd5fb309ce
(cherry picked from commit 53925ff9c6
2020-06-29 19:44:28 +00:00
19797b419b
Thumbnail Cache - check canceled status on the right thread.
...
The cache was checking the canceled status on the background
thread, but the cancel call was being made on the main thread.
This was leading to canceled requests still delivering this thumbnail
in some cases.
Bug: 159840851
Test: local build and non-repo of bug
Change-Id: I9a3556f6570eee1db39ebec202c115d58010d7f8
2020-06-29 04:11:04 +00:00
2d0f86d986
Merge "During accessible drag, hover events were not properly getting dispatched to the DragAndDropAccessibilityDelegate" into rvc-dev am: 0538863c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12010483
Change-Id: I461c245fdbe477be0fe223d77147690e4a636d10
2020-06-26 22:14:25 +00:00
0538863c58
Merge "During accessible drag, hover events were not properly getting dispatched to the DragAndDropAccessibilityDelegate" into rvc-dev
2020-06-26 21:59:15 +00:00
9929673657
Merge "Add NPE check for prediction controller" into rvc-dev am: f8e12b78bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12001481
Change-Id: I9e36dafbb1b45e0209cd2a7ced5e4de45ce8b814
2020-06-26 19:53:46 +00:00
f8e12b78bf
Merge "Add NPE check for prediction controller" into rvc-dev
2020-06-26 19:39:34 +00:00
d1137b8c89
Fixes missing folder label after launcher restarts. am: e148652075
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12003751
Change-Id: Id53a5f12ba7e83bc6d9551e9f4cbf67d17b06569
2020-06-26 18:29:13 +00:00
9e3aebd8dd
During accessible drag, hover events were not properly getting dispatched to the DragAndDropAccessibilityDelegate
...
=> regressed in ag/10634216 which attemped to use onHoverListener
=> the problem is that onHoverListener is only triggered when the event is passed to the CellLayout, however, as with all dispatching, these events are handled depth first, and so in cases where a child handled the event, it would never bubble back up to the parent.
=> instead we have to continue to override dispatchHover event to always give presecedence to the delegate when it exists
Bug: 155956518
Change-Id: Ic3ecf1b422c1821456328035a66a2fc1277e6746
(cherry picked from commit 6e7c37a205
2020-06-26 17:15:03 +00:00
e148652075
Fixes missing folder label after launcher restarts.
...
Rootcause: FolderInfo was persisted into DB only when folder options are updated. Hence when folder was created (Folder option remains suggested) its title was not persisted into DB.
Fix: Persists folderInfo into DB always whenever title is updated
Bug: 159904890
Change-Id: If0d20b0d7fa6966dd7bb40a2c07bcb22bd0893e0
(cherry picked from commit 6ab4da8aa0
2020-06-26 16:30:31 +00:00
b95fbd99f0
Do preview grid migration in a worker thread am: 6b79a3767d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12002728
Change-Id: I8d6308cad0db1671d91fc141cb3542dc40d3deab
2020-06-26 07:47:45 +00:00
6b79a3767d
Do preview grid migration in a worker thread
...
Also remove USE_SURFACE_VIEW_FOR_PREVIEW flag
Fixes: 159755324
Test: manual
Change-Id: I6517c34911e217a69063226b01e4583194902f9c
(cherry picked from commit 633a4bdf57
2020-06-25 21:05:04 +00:00
0036b2b67a
Add NPE check for prediction controller
...
Bug: 159835714
Test: Manual
Change-Id: I9cc03f6491f4e14462be6c01edf3ed4ca1d82136
2020-06-25 20:10:01 +00:00
a2c80c2a1e
Merge "Pass isLikelyToStartNewTask to onGestureStarted()" into rvc-dev am: ccf588d36b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11994586
Change-Id: I26e24cc4d0a5d4ad075a8e3ee358071b6c3dcec6
2020-06-25 16:49:23 +00:00
ccf588d36b
Merge "Pass isLikelyToStartNewTask to onGestureStarted()" into rvc-dev
2020-06-25 16:38:47 +00:00
9befc26ea2
Updates Assistant gesture regions when no longer tracking multiple. am: d2731957ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11992046
Change-Id: I63e52519cf6a1ab15d5efce76f8ef120ba142b01
2020-06-25 02:39:27 +00:00
9e84745e4b
Pass isLikelyToStartNewTask to onGestureStarted()
...
This ensures we immediately setRecentsAttachedToAppWindow(). As
mentioned in the bug, there was an edge case where we would animate
the attached state if the first move event passed the touch slop,
causing the adjacent task view to lag behind during the gesture.
Fixes: 159742520
Change-Id: Ie47bb84fdd3dbd69e3b74ca504d487fb9aedb551
(cherry picked from commit c6a56ef7a2
2020-06-25 02:11:04 +00:00
d2731957ea
Updates Assistant gesture regions when no longer tracking multiple.
...
This should prevent states where Assistant triggers from
the vertical-center of the screen in portrait (see bug).
Also fleshes out OrientationTouchTransformerTests and
adds some new ones that fail without this change:
- enableMultipleRegions_assistantTriggersInMostRecent
- enableMultipleRegions_assistantTriggersInCurrentOrientationAfterDisable
Fixes: 158686674
Change-Id: I6d045a485f62e4010e9e3d00805a50fdd953a2fc
(cherry picked from commit 4b531b972d
2020-06-24 22:32:14 +00:00
c3adb0a088
Merge "Fixing NPE befre ActionsView first initialized." into rvc-dev am: ca493d1426
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11978215
Change-Id: If8cc8480d4ccf5fa5c62a90a1e72a1cb2041c81b
2020-06-24 07:09:51 +00:00
ca493d1426
Merge "Fixing NPE befre ActionsView first initialized." into rvc-dev
2020-06-24 06:52:16 +00:00
Xin Li
Treehugger Robot
Raman Tenneti
Jon Miranda
Sunny Goyal
Greg Kaiser
Thiru Ramasamy
Zak Cohen
Adam Cohen
Tracy Zhou
Samuel Fufa
Andy Wickham
Tony Wickham