Xin Li
30b95a6741
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I90ed6ba7d25c41a3fbbc19bca6a3706b8aa756cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:15:17 +00:00
Xin Li
0e1fc6e6c8
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Id132417e04a26ea756d3513d3d35201f26b3d29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:14:11 +00:00
Xin Li
3ccbee4558
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Ie121b3b4dac24334fa93f18390033ce3d63b0277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:58:15 +00:00
Xin Li
7d8d41ac47
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I701c3c0ddb6afd4c6e472b4fc43b80c5e0e67a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:57:03 +00:00
Xin Li
250f92bbe0
Merge "Merge Android 12 QPR 3"
2022-06-16 18:51:54 +00:00
Tony Wickham
ca544c5a1b
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Id802a0ac9cea65b662afd3e35582e0b7014f489b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:08:40 +00:00
Tony Wickham
9d5f64adf1
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev
2022-06-16 14:55:48 +00:00
Tony Wickham
a379435d04
Clear MotionPauseDetector onRecentsAnimationCanceled()
...
Fixes: 234022857
Test: Open ImCapture and swipe up to home; repeat 20 times and ensure never see empty overview tasks over launcher
Change-Id: Icef6d7a54000e1e21453feeae7e207679077b772
2022-06-15 11:59:59 -07:00
Hyunyoung Song
0f27de35c8
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I7255de82c3c00b6d74f45fcd70e603a82f312dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:18:28 +00:00
Hyunyoung Song
5d57e3d651
Merge "Remove hideKeyboard exception in the log" into tm-dev
2022-06-15 05:38:16 +00:00
Winson Chung
c8a05f37ba
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: Id2ac0ef7aa79e9df3f03ffc1970e9ffe2ea954f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:04:21 +00:00
Winson Chung
7d54b06c29
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev
2022-06-15 03:30:16 +00:00
Tony Wickham
0f3df27b9a
Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev am: 4ee29221df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18820561
Change-Id: I69b7c08d9f5ebc3e85eb691a58896bcb51093f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 02:56:21 +00:00
Tony Wickham
4ee29221df
Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev
2022-06-15 02:23:13 +00:00
hyunyoungs
6677fa3cf3
Remove hideKeyboard exception in the log
...
Bug: 235616419
Test: no error stack trace
Change-Id: Ice5a52edaed2fb0485696a4586552792b0b5b932
2022-06-14 17:03:47 -07:00
Xin Li
5e36e2607b
Merge Android 12 QPR 3
...
Bug: 236045730
Merged-In: I540ce3429cb4b1b86b8554a08677679c932b05e5
Change-Id: Iba370df34ced18cf42f19dc7e1976d0b4a6b1ccf
2022-06-14 16:48:15 -07:00
Winson Chung
2345fee566
Snap to running task if it's offscreen when back is invoked
...
- If the user has scrolled the running task offscreen, then
snap back to the task if back is invoked.
Bug: 233952141
Test: Swipe to overview, scroll away from the current task
and then go back
Change-Id: Icc5040d4b38c97e0329f937e24bd517a71a32f13
2022-06-14 21:20:05 +00:00
Tony Wickham
3945f028de
Revert line that could wrongly initialize RecentsView scroll
...
Test: open a random app that hasn't been opened in a while, touch down
on nav handle and see if RecentsView scrolls partially or fully
offscreen; repeat 20 times to be sure
Bug: 233112195
Fixes: 235369468
Change-Id: Ie8b3dbea7c4826af037edf22360946105ab22134
2022-06-14 19:17:55 +00:00
Winson Chung
e98f53fdd3
Merge "Updating call to match change in interface" into tm-dev am: baf27c1b5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18800135
Change-Id: I44601c828b1b6384db8aa5430cd7eeb8ab4aaf7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 16:05:18 +00:00
Winson Chung
baf27c1b5b
Merge "Updating call to match change in interface" into tm-dev
2022-06-14 13:56:10 +00:00
TreeHugger Robot
6a8def53cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b7706a9cf7 -s ours am: 06b963e7d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849916
Change-Id: Icd439b015cb315f5e825eb8309f646f71d82afa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:34:12 +00:00
Bill Yi
d667f9827e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5631bd53de -s ours am: c3a159cd5f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849916
Change-Id: I179322a715d89a9b8b1f68598a18c60e218b1db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:34:03 +00:00
Bill Yi
372b062c8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce47a6268 -s ours am: 7af50e4397 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849919
Change-Id: I17a2bb01ac423f7c25939eb707e51338d4cb9fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:05 +00:00
TreeHugger Robot
06b963e7d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b7706a9cf7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849916
Change-Id: Ida2cdf9b829b8152f99f58a55ba88d9be599b992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:08:11 +00:00
Bill Yi
c3a159cd5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5631bd53de -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849916
Change-Id: I86400371e2bd0835b7f5bb3990886a0f14c883ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:08:01 +00:00
Bill Yi
7af50e4397
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce47a6268 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18849919
Change-Id: Icef4c46ff5f5c4d75fd84e16c5e71f551c8b669d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:37 +00:00
Hyunyoung Song
d149f0b38f
Merge "Workspace should not receive touch events" into tm-dev am: 5c33ec3766
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18791871
Change-Id: Id9f254480e9b7e4200cf3d8370c6e3aa235eff99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:52:58 +00:00
TreeHugger Robot
b7706a9cf7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:50 +00:00
Hyunyoung Song
5c33ec3766
Merge "Workspace should not receive touch events" into tm-dev
2022-06-13 16:30:19 +00:00
Bill Yi
3ce47a6268
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b7c0928809a98f73df5abb89b17d8d0067fc27f
2022-06-11 03:33:20 -07:00
Bill Yi
5631bd53de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52a5996d0ae9d6305629b7cf6d2f3168e5729a17
2022-06-11 03:32:19 -07:00
Becky Qiu
66c275b8a6
Merge "[Toast] Add a new type fields for user visible cold status." into tm-dev am: a500cde8f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18821283
Change-Id: I74bf8a73cf2cdb2e0d3fc3579ec2bb4af5b4375b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-11 08:17:51 +00:00
Becky Qiu
a500cde8f2
Merge "[Toast] Add a new type fields for user visible cold status." into tm-dev
2022-06-11 06:00:46 +00:00
Becky Qiu
ae9ab8a8bf
Merge "Hide keyboard when thumb scroller is visible." into tm-dev am: d6d0dc3ca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18819707
Change-Id: I4bbd6ea6173d00e828f55d93c7f9428f30d5534f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-11 02:19:24 +00:00
Becky Qiu
d6d0dc3ca8
Merge "Hide keyboard when thumb scroller is visible." into tm-dev
2022-06-11 01:45:36 +00:00
Becky Qiu
24c77a5ff5
Hide keyboard when thumb scroller is visible.
...
Bug: 235497706
Test: manual
Change-Id: Id3202300650949d079b9209e30b2bfc4f80979cd
2022-06-10 13:58:09 -07:00
TreeHugger Robot
f2afc1fcd1
Merge "Fix NPE when user swipes back in All Apps and no matching view found" into tm-dev am: a49ba25353
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18821198
Change-Id: Ieb6f063e004f2521a4022ae5195d0667b01c40f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:57:05 +00:00
TreeHugger Robot
a49ba25353
Merge "Fix NPE when user swipes back in All Apps and no matching view found" into tm-dev
2022-06-10 19:05:32 +00:00
Becky Qiu
fa317f4420
[Toast] Add a new type fields for user visible cold status.
...
Bug: 235249335
Test: manual
Change-Id: I58eee38e740e746e8a3d6065d4ef57cc5569a837
2022-06-10 12:03:56 -07:00
Andy Wickham
3343ffa5cf
Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522
Change-Id: Iaa94d52bfbc5bb4be8de0ec0a79b1e8951e0ce02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:27:44 +00:00
Andy Wickham
34e8c3364a
Merge "Fixes Search bar padding when work profile not present." into tm-dev
2022-06-10 17:07:43 +00:00
Jon Miranda
f26bdcb4c1
Fix NPE when user swipes back in All Apps and no matching view found
...
This crash will occur every time user swipes back and
there is not a view to return to
Introduced in I56cda07f3eccc11e8909f7fb28210f65cc6e0f1d
Bug: 235494234
Test: manual
Change-Id: I1261afcefec8fed4be20ab9ef439a50bc706d464
2022-06-10 16:00:18 +00:00
Sunny Goyal
3e4d940ba4
Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891
Change-Id: I6b83718c02726d518bb909f086125b6cbdb6a2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 15:53:00 +00:00
Sunny Goyal
ad7e199e52
Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev
2022-06-10 15:28:30 +00:00
TreeHugger Robot
826356355d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18811510
Change-Id: Ifc53cc9a184ebfc4b6076a0de6f24a3aa09b6874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:42 +00:00
Bill Yi
2b59e1d397
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18811510
Change-Id: I67b81b6b334da5915c6e30239a0d21d7117f2d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:31 +00:00
TreeHugger Robot
ecea734d9f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
TreeHugger Robot
dcb13c8e40
Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev am: a37556ae5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18722495
Change-Id: Ibf500cba41c41415feb6c8b6459784718abbbdea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 22:45:56 +00:00
Becky Qiu
9911e708bb
Merge "[Toast] Add a new latency type as FAIL." into tm-dev am: f13d3cca63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18781402
Change-Id: I49e35aa8351f8e7eeeafc5077a55723562f450eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 22:45:39 +00:00
TreeHugger Robot
a37556ae5c
Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev
2022-06-09 22:30:17 +00:00