Samuel Fufa
efa5df380c
Merge "Refactor FolderInsetAnimationCallback to be used with any view" into sc-dev
2021-06-17 18:48:49 +00:00
Alex Chau
4d4dd93e75
Merge "Send TaskBar touch events to tests" into sc-v2-dev am: f77d45cce8 am: 1ffc292ed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14736370
Change-Id: I01d6bd1faf3c6169a1f45e35458ec699a1d7dfda
2021-06-17 18:35:25 +00:00
Zak Cohen
1d5debd60d
Merge "Suppress ViewInflationDuringSwipeUp test." into sc-dev
2021-06-17 18:34:29 +00:00
Alex Chau
1ffc292ed5
Merge "Send TaskBar touch events to tests" into sc-v2-dev am: f77d45cce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14736370
Change-Id: I718427af455405baffaffc89b133c70e275d2df1
2021-06-17 18:22:51 +00:00
Winson Chung
99356d22b4
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: a9a53a339f am: c2ea4e8cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: I0caf3a5d483e957172e80f8e45f4224988a0fe0c
2021-06-17 18:00:50 +00:00
Stevie Kideckel
59ea3ca110
Merge "Refresh widgets in the model when packages change" into sc-dev am: 10d4edade1 am: e994b674dd am: 1e314158e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012535
Change-Id: I74e85ce7ca6fdf72f9c19330158f077f61a30873
2021-06-17 18:00:44 +00:00
Steven Ng
109efea455
Merge "Deduct padding from widget size only if padding has been inset" into sc-dev am: 6ce6922c14 am: b5d7fd9728 am: c318bbc094
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002454
Change-Id: I10a734772ba82def2e9ec7a4d8397b689b22b990
2021-06-17 18:00:39 +00:00
Yogisha Dixit
7dc4027016
Merge "Center drop target icons in landscape mode." into sc-dev am: 3287dd9fa7 am: 62d2706244 am: 441ee2494a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980961
Change-Id: I0c14a7cb008adfaa3745d01e4536d1c82dbbb1eb
2021-06-17 18:00:34 +00:00
Steven Ng
8b0f685818
Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 am: 5da5694f4e am: 15510f0dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455
Change-Id: If105c98abcdb8169cc8010092e6c6636f3557070
2021-06-17 18:00:29 +00:00
Steven Ng
998d3dc419
Merge "Fix PendingWidgetHostView overlapping UI" into sc-dev am: e8772c1659 am: 97c8771798 am: 775ee3ed8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980850
Change-Id: Ib55ecbdd3746675940d700e90c0b3d2b0f21db81
2021-06-17 18:00:24 +00:00
TreeHugger Robot
ff36a356e5
Merge "Fixes duplicate logging for LAUNCHER_ALLAPPS_KEYBOARD_CLOSED events." into sc-dev am: ea95f88361 am: 424f99de43 am: 832a11fdd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14986815
Change-Id: I55fc41a1b83f2e8b964c1a78541238f1168715a3
2021-06-17 18:00:19 +00:00
TreeHugger Robot
1fe0afaa15
Merge "Add logging for tapped on 'Turn on/off work apps' button in all apps" into sc-dev am: 4f257655bd am: ca27436856 am: affee7685e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14989654
Change-Id: Iaab9685ae683fb67dd4188777e08802323e605a3
2021-06-17 18:00:12 +00:00
TreeHugger Robot
737f509b23
Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: 54433ee9cc am: 2854d6e3d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15003917
Change-Id: I65dc93cafb4f12b7db1ecb840a2b264d42ed9c9c
2021-06-17 17:56:23 +00:00
TreeHugger Robot
07b7c6666f
Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev am: 3a37543fb9 am: 7d901cf67d am: 29ce6c4596
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15001812
Change-Id: I26370908b67c1b0ddd93fe8e41ce67fd651b2fe8
2021-06-17 17:56:12 +00:00
TreeHugger Robot
603fe27f43
[automerger skipped] Merge "resolve merge conflicts of fdd4cb3c39 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: a594709f82 -s ours
...
am skip reason: Merged-In I48e3f6a20c27c8c7aeef5da7a464a6c4a5e4180c with SHA-1 b94b6e0d3c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15005434
Change-Id: Icebc6bf84a45bf88fdf39296f2d6ab16849557fe
2021-06-17 17:55:04 +00:00
Alex Chau
f77d45cce8
Merge "Send TaskBar touch events to tests" into sc-v2-dev
2021-06-17 17:52:44 +00:00
Tony Wickham
d410a2c168
Ensure widgets header is out of the gesture region before clicking
...
This way, NexusLauncher won't appear during the Launcher3 test.
Test: AddConfigWidgetTest#testConfigCancelled
Bug: 188450580
Change-Id: Iedf0e0e17eab2473ecd2d17a4391cf9db3e80599
2021-06-17 17:49:54 +00:00
Winson Chung
349ddc180b
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: 4280926c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: I20c1aa3f1ac034c7693aefbd270d8a4a6a1011ac
2021-06-17 17:42:42 +00:00
Stevie Kideckel
2d1a32b782
Merge "Refresh widgets in the model when packages change" into sc-dev am: 10d4edade1 am: ab605f3194
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012535
Change-Id: I7686da3e8444636a9313768a32c3e749592344e6
2021-06-17 17:42:37 +00:00
Steven Ng
1b852f8737
Merge "Deduct padding from widget size only if padding has been inset" into sc-dev am: 6ce6922c14 am: e3009c9ca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002454
Change-Id: I9cfc054f32af133d5460fa0fd09d928bd832b91a
2021-06-17 17:42:33 +00:00
Yogisha Dixit
88cdec8083
Merge "Center drop target icons in landscape mode." into sc-dev am: 3287dd9fa7 am: f67a8f25aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980961
Change-Id: I906294de168c868d9495f0263f4fdb96b24ee04f
2021-06-17 17:42:28 +00:00
Steven Ng
3fe495de64
Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 am: 8a3888e9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455
Change-Id: Id9c8be9d7b4e28f2171def18e12fa9ac92bc0701
2021-06-17 17:42:24 +00:00
Steven Ng
9cedff062d
Merge "Fix PendingWidgetHostView overlapping UI" into sc-dev am: e8772c1659 am: 7c4f1fd088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980850
Change-Id: I3d772139b16a9ac04e1622f85d10cac5c7f2c371
2021-06-17 17:42:19 +00:00
TreeHugger Robot
14fef24b04
Merge "Fixes duplicate logging for LAUNCHER_ALLAPPS_KEYBOARD_CLOSED events." into sc-dev am: ea95f88361 am: d4abfd0e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14986815
Change-Id: I24032ea6d60e6b33d15fd8f1a179d67654b9e974
2021-06-17 17:42:14 +00:00
TreeHugger Robot
9914402af2
Merge "Add logging for tapped on 'Turn on/off work apps' button in all apps" into sc-dev am: 4f257655bd am: 99128d6a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14989654
Change-Id: Ice402f233662166edfed51792a33f78b876edc3a
2021-06-17 17:42:08 +00:00
TreeHugger Robot
711cbfcb95
Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: f433ac0b48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15003917
Change-Id: I343643188d8131e7979b1da73b475f8fe0a55d65
2021-06-17 17:42:04 +00:00
TreeHugger Robot
ed70d72040
Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev am: 3a37543fb9 am: 47ef5bd7ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15001812
Change-Id: Ia2b9723e7ed1b6342fd1a31f36439e0949622a6f
2021-06-17 17:41:59 +00:00
Winson Chung
c2ea4e8cb2
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: a9a53a339f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: If88644cb1e54ca7f46f732814c3a9531444ab29a
2021-06-17 17:38:48 +00:00
Stevie Kideckel
1e314158e9
Merge "Refresh widgets in the model when packages change" into sc-dev am: 10d4edade1 am: e994b674dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012535
Change-Id: I5308578fc345266d5db5946fabaf8871eaf634e0
2021-06-17 17:38:45 +00:00
Steven Ng
c318bbc094
Merge "Deduct padding from widget size only if padding has been inset" into sc-dev am: 6ce6922c14 am: b5d7fd9728
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002454
Change-Id: I5dc156713c332d3f9d5f6fa6d7eb76f811fe08da
2021-06-17 17:38:41 +00:00
Yogisha Dixit
441ee2494a
Merge "Center drop target icons in landscape mode." into sc-dev am: 3287dd9fa7 am: 62d2706244
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980961
Change-Id: I536f261a8c7108ec094d0bda730810aa4dbf573a
2021-06-17 17:38:37 +00:00
Steven Ng
15510f0dd8
Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 am: 5da5694f4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455
Change-Id: I428b1e5ca32c06b02541e86d4769b6bb1512669e
2021-06-17 17:38:34 +00:00
Steven Ng
775ee3ed8b
Merge "Fix PendingWidgetHostView overlapping UI" into sc-dev am: e8772c1659 am: 97c8771798
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14980850
Change-Id: I2e3b8486325e7a3b9bd9a681cac2e249dbe94c43
2021-06-17 17:38:30 +00:00
TreeHugger Robot
832a11fdd1
Merge "Fixes duplicate logging for LAUNCHER_ALLAPPS_KEYBOARD_CLOSED events." into sc-dev am: ea95f88361 am: 424f99de43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14986815
Change-Id: I50c4d1e2a71d972cf0ecdaef22c5096e98fcced1
2021-06-17 17:38:17 +00:00
TreeHugger Robot
affee7685e
Merge "Add logging for tapped on 'Turn on/off work apps' button in all apps" into sc-dev am: 4f257655bd am: ca27436856
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14989654
Change-Id: Id42b1f9e015294b6ac561d801a8600b2251cf1db
2021-06-17 17:38:08 +00:00
TreeHugger Robot
2854d6e3d6
Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: 54433ee9cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15003917
Change-Id: I4f8db2bbe9aea139c11740d6a9a15b824f0351f6
2021-06-17 17:38:00 +00:00
Jonathan Miranda
842de42dc0
Merge "resolve merge conflicts of 32e6222f33 to master"
2021-06-17 17:37:38 +00:00
TreeHugger Robot
29ce6c4596
Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev am: 3a37543fb9 am: 7d901cf67d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15001812
Change-Id: I7af0badb0d62d7792113530d4fb78095116bea63
2021-06-17 17:37:22 +00:00
TreeHugger Robot
a594709f82
Merge "resolve merge conflicts of fdd4cb3c39 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp
2021-06-17 17:37:05 +00:00
Winson Chung
84f273878f
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: 3df79133f2 am: 1294809bbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: I53529a2f0a90f4c4a71bd36c63b4793c8a683bfd
2021-06-17 17:31:44 +00:00
Winson Chung
1294809bbc
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: 3df79133f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: Ibe6e0473c110d35509f1cdad4c24f2270e3b31d2
2021-06-17 17:21:40 +00:00
Winson Chung
3df79133f2
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: I59c266315e6c5fe8989dcff36fe395457792c189
2021-06-17 17:01:52 +00:00
Winson Chung
4280926c7a
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: I6da674f1eec758bb5e2b8f1857a2fca57a92f6ea
2021-06-17 17:01:06 +00:00
Winson Chung
a9a53a339f
Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985080
Change-Id: Iaa45a444c15c936a0b5b35193ba0a3c660650c47
2021-06-17 17:01:03 +00:00
Winson Chung
caabfa1519
Merge "Do some additional cleanup when switching handlers" into sc-dev
2021-06-17 16:48:42 +00:00
zakcohen
360489ff51
Suppress ViewInflationDuringSwipeUp test.
...
Test is failing on a subset of devices with a memory leak in an activity.
This is not repoing on other devices so could be a problem with the setup
rather than the code.
Bug: 190618549
Test: Local
Change-Id: I9c6a56432d1b1f59c337bf34e7b8c26befeb2d7d
2021-06-17 09:46:56 -07:00
Alex Chau
d28e78ddb6
Merge "Apply dismissScale on TaskView instead of TaskThumbnailView" into sc-v2-dev am: bdb1de88eb am: 8dfa3870a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012756
Change-Id: If3ce86467bf800e1123bde7162feced42b0c4e59
2021-06-17 16:06:21 +00:00
Alex Chau
8dfa3870a9
Merge "Apply dismissScale on TaskView instead of TaskThumbnailView" into sc-v2-dev am: bdb1de88eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012756
Change-Id: Ie76235b977e7d0d3aa3c859219f6e06d8877f9b2
2021-06-17 15:52:08 +00:00
Stevie Kideckel
4ea67c79d1
Merge "Refresh widgets in the model when packages change" into sc-dev am: 10d4edade1 am: f12eca67b2 am: 9810f61bd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15012535
Change-Id: I22d3f094ec467321e3a24effb04cca5f82fbadf0
2021-06-17 15:46:13 +00:00
Alex Chau
bdb1de88eb
Merge "Apply dismissScale on TaskView instead of TaskThumbnailView" into sc-v2-dev
2021-06-17 15:39:13 +00:00