495c31d1d5
Merge "Revert "Revert "flip app shortcut popup design on for U""" into udc-dev am: e1f1fd0924
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22077862
Change-Id: I49432081f868f1ab7ea78373554107e20359d0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:11:41 +00:00
e1f1fd0924
Merge "Revert "Revert "flip app shortcut popup design on for U""" into udc-dev
2023-03-17 16:33:47 +00:00
7a0655c5d6
Merge "Add optional debug logging to on flag changes" into tm-qpr-dev am: 8daf6d804e am: ea674e208c am: 06abb655f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21868395
Change-Id: Ie6f2ec415d312c1cdd56326eed77a2336b5d6181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 09:46:23 +00:00
06abb655f1
Merge "Add optional debug logging to on flag changes" into tm-qpr-dev am: 8daf6d804e am: ea674e208c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21868395
Change-Id: I3e7c7a84bcaaf37bb55225ea714c46fea999a067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 09:04:47 +00:00
ea674e208c
Merge "Add optional debug logging to on flag changes" into tm-qpr-dev am: 8daf6d804e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21868395
Change-Id: I8a871b40687dffb7feb45fb7da9b27727e36ba97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 08:28:05 +00:00
8daf6d804e
Merge "Add optional debug logging to on flag changes" into tm-qpr-dev
2023-03-17 07:54:33 +00:00
75dafc2e83
Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev am: d4eed6ec90 am: cd6fd73639 am: 7c7ccbb2ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21992972
Change-Id: I6df005884d983fb5143b61800d955e92dbb433df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 01:42:04 +00:00
7c7ccbb2ad
Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev am: d4eed6ec90 am: cd6fd73639
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21992972
Change-Id: Id79a204f2f489e35829f2336743d1a06cd0d9908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 01:21:16 +00:00
cd6fd73639
Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev am: d4eed6ec90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21992972
Change-Id: Ic4c29770d9b485252bc8e12e7666f8ab0598cdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 00:45:25 +00:00
d4eed6ec90
Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev
2023-03-17 00:15:54 +00:00
b6c0be196c
Merge "Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT" into tm-qpr-dev am: 26958a0961 am: d8ae733516 am: 678da0e9c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079203
Change-Id: I81d7161d2bd3fd9ee033fdf67daaf858b5286868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 23:57:05 +00:00
8ee3336e66
Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b am: e861a047b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446
Change-Id: I27bec22ae25320fbca66360728a88a11c97274ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 23:56:19 +00:00
678da0e9c4
Merge "Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT" into tm-qpr-dev am: 26958a0961 am: d8ae733516
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079203
Change-Id: I8cbeee78df7e0b6474cf277689af3b65f5773808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 23:29:34 +00:00
d8ae733516
Merge "Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT" into tm-qpr-dev am: 26958a0961
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079203
Change-Id: Ic18cf7d1cd4e0605202461dc0c1cb1f39cb3f25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 23:11:49 +00:00
e861a047b8
Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446
Change-Id: I20d2edfb566aeef128c3e05e030bb49dfe189d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 23:10:55 +00:00
26958a0961
Merge "Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT" into tm-qpr-dev
2023-03-16 22:52:47 +00:00
aacd5d330b
Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446
Change-Id: I8ee5c66b978ce10da77f167d3dbbc45504394790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 22:33:50 +00:00
b219e31477
Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev
2023-03-16 22:00:00 +00:00
241823875f
Merge "Directly use launcher activity interface" into tm-qpr-dev am: 8b4ac56ee2 am: 20f89a41f4 am: 2065586a5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121678
Change-Id: I4f05ba88423c95f09e852d8116508700df474662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:57:44 +00:00
5dbcc48ada
Merge "[Predictive Back] Remove OnBackPressedHandler" into udc-dev am: d44129149c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22102382
Change-Id: Ibcb0ef0d392a7b9e61859db2d812b988c1705a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:56:50 +00:00
2065586a5d
Merge "Directly use launcher activity interface" into tm-qpr-dev am: 8b4ac56ee2 am: 20f89a41f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121678
Change-Id: If06bcfcfb058b0a932bec4b1364e14da4cac1f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:37:01 +00:00
d44129149c
Merge "[Predictive Back] Remove OnBackPressedHandler" into udc-dev
2023-03-16 21:18:11 +00:00
20f89a41f4
Merge "Directly use launcher activity interface" into tm-qpr-dev am: 8b4ac56ee2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121678
Change-Id: If5e7027172b903c14831627f51930e5b6d9b077d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:59:14 +00:00
8b4ac56ee2
Merge "Directly use launcher activity interface" into tm-qpr-dev
2023-03-16 20:24:06 +00:00
03d909d33e
Merge "Add automirroring to kids mode back button." into tm-qpr-dev am: aaa932d78c am: 6bf7c6b816 am: 6fcf80fa9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22099529
Change-Id: Ia16d0f903002b2e5983587804c6f393b25dc79c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 18:21:39 +00:00
6fcf80fa9c
Merge "Add automirroring to kids mode back button." into tm-qpr-dev am: aaa932d78c am: 6bf7c6b816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22099529
Change-Id: I9c3f1a94df245e01c841d95829673212cd510f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 17:40:01 +00:00
6bf7c6b816
Merge "Add automirroring to kids mode back button." into tm-qpr-dev am: aaa932d78c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22099529
Change-Id: Ibb3b22420e54291613edba5806446dbe0284b5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 17:02:42 +00:00
b7860bd85e
[Predictive Back] Remove OnBackPressedHandler
...
OnBackPressedHandler was mimicking android.window.OnBackAnimationCallback because later one was hidden API to T.
Now that we have moved to U, we can remove the former handler.
Test: manual
Bug: 272797556
Change-Id: Ic5302cfa0a6fb15c4a64bdf5dc331834b1f06f38
2023-03-16 09:39:31 -07:00
3a2a69ab3d
Fixes tests and issues when toggling new app shortcut popup flag.
...
Bug: 247880037
Test: manually tested app popup. Also ran Launcher tests locally with U flag on/off.
Change-Id: I93c04f9715d583376c36d823c23353619afd26b6
2023-03-16 12:37:14 -04:00
6adae751e7
Make sure desktop task view is only used in proto 2
...
When swiping up to recents and creating the current tasks TaskView, we
were checking for proto 1 or proto 2 to be enabled. And if they were, we
were creating the DesktopTaskView object. The DesktopTaskView should
only be enabled in proto 2.
Updated the feature flag check.
Bug: 273950066
Test: enable proto 1 and gesture nav, have a desktop app open, swipe up
to recents, no desktop tile
Test: enable proto 2 and gesture nav, have a desktop app open, swipe up
to recents, see the desktop tile
Change-Id: I73a47347d60e0f57ad6cf6e363a6fe83ac8cc509
2023-03-16 09:26:10 -07:00
aaa932d78c
Merge "Add automirroring to kids mode back button." into tm-qpr-dev
2023-03-16 16:23:00 +00:00
c7c9d594a1
Directly use launcher activity interface
...
When desktop tasks become visible or hidden, we update a SysUI state
flag. This flag update gets processed in TouchInteractionService which
then calls DesktopVisibilityController to update launcher state based on
whether desktop tasks are visible or not.
We were getting a reference to the DesktopVisibilityController through
OverviewComponentObserver. This was causing issues when device was
unlocked with desktop tasks visible. And 3-button navigation was enabled.
In this scenario, we are immediately processing a SysUI flags update
that desktop tasks are visible again (they are hidden while device is
locked). When this update is processed, OverviewComponentObserver
returns the fallback launcher interface. And not the nexus launcher.
The fallback launcher interface does not contain the
DesktopVisibilityController. Since the fallback controller does not
return the visiblity controller, we skipped processing the update that
desktop tasks are visible. Which resulted in launcher remaining in a bad
state with home screen icons visible and desktop tasks on top.
Bug: 273594452
Test: enable 3-button nav and proto 2, move an app to desktop, lock
screen with desktop app visible, unlock screen, observe launcher icons
hidden
Test: enable gesture nav and proto 2, move and app to desktop and lock
screen with desktop app visible, unlock and observe launcher icons
hidden
Test: repeat the same steps with proto 1 enabled
Change-Id: Id52ac4cf2df151b2aee2070ee2eb14de3d74fead
2023-03-16 08:58:50 -07:00
0ba832deea
Merge "Update PluginManagerWrapper to match SysUI changes" into udc-dev am: 2fced82e24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21989728
Change-Id: I438397b834f514dca0da6a906a27d808af0c3980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 14:25:52 +00:00
2fced82e24
Merge "Update PluginManagerWrapper to match SysUI changes" into udc-dev
2023-03-16 14:11:51 +00:00
f7fe20d1b1
Merge "Resize text in drop target button if the text displayed is truncated vertically" into tm-qpr-dev am: f70036a136 am: 9a452ebb57 am: a415a34bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21701323
Change-Id: Ib23b12233f3896c932c47cf112ac4aa56558d1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:26:46 +00:00
cb82d3848c
Merge "[Predictive Back] Add extra bottom space in taskbar all apps to home" into udc-dev am: 751d1475be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21991761
Change-Id: If3e7bd820bd0814b9a4122a91b1864f8adebbfc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:26:30 +00:00
a415a34bad
Merge "Resize text in drop target button if the text displayed is truncated vertically" into tm-qpr-dev am: f70036a136 am: 9a452ebb57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21701323
Change-Id: Ic606f2a342d1242b47c435b51a188189378c48d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:24:51 +00:00
fbcc74d883
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-16 01:02:54 +00:00
751d1475be
Merge "[Predictive Back] Add extra bottom space in taskbar all apps to home" into udc-dev
2023-03-16 00:46:42 +00:00
9a452ebb57
Merge "Resize text in drop target button if the text displayed is truncated vertically" into tm-qpr-dev am: f70036a136
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21701323
Change-Id: I80f12a51fd252b37248c71f88822e13601f41c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 00:45:27 +00:00
f70036a136
Merge "Resize text in drop target button if the text displayed is truncated vertically" into tm-qpr-dev
2023-03-16 00:08:32 +00:00
ee4c589515
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7d58e2abe -s ours am: d692234119 -s ours am: ce267007dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22093422
Change-Id: I30d23544e597667e3acf717b83a2f377d3da99df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:43:47 +00:00
af39db3186
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 519db9ba13 -s ours am: 7df1d11161 -s ours am: e96614530d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22093422
Change-Id: I3ee43f133f5b44ccfcc6beb1fb6f66cd4f137957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:43:38 +00:00
46f290964a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 152bc58d21 -s ours am: eb7f55ad9a -s ours am: 7ee2958d72 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22092152
Change-Id: I7e5a6cb149622f7e3c48f6fe579b45aebafaa34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:43:23 +00:00
93c08efb9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11aa16757e -s ours am: 903565cb65 -s ours am: e0cc29a58c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22092152
Change-Id: I485558a933ab14ef6f03a70cef1d25eded65e939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:43:08 +00:00
48f9cabc3a
Merge "polish for the app shortcut popup, fixing padding on several elements." into tm-qpr-dev am: da4e07812a am: d52925f9c4 am: 787cd87ec8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21791366
Change-Id: Ia4157e44482b12be53391c1a89597f68558762f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:41:14 +00:00
4cbb5ecd03
Merge "Revert "Revert "Create TAPL test suite for splitscreen""" into tm-qpr-dev am: 7b286a4f68 am: 7f61f22560 am: c0d8b2dc0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079982
Change-Id: Ie913a1ea240da834ade99e3277cf934fbd776374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:41:01 +00:00
ce267007dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7d58e2abe -s ours am: d692234119 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22093422
Change-Id: Ifd952ba6b08364d203fdb290ad94b860572bab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:35 +00:00
e96614530d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 519db9ba13 -s ours am: 7df1d11161 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22093422
Change-Id: I4624fe024d9a84c84ed83f72768c183978ad8d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:30 +00:00
7ee2958d72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 152bc58d21 -s ours am: eb7f55ad9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22092152
Change-Id: Ib7735f2943b25bb278b7b3fe69d30a1a8ba56542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:15 +00:00
Charlie Anderson
Mike Schneider
Brandon Dayauon
Ats Jenk
Fengjiang Li
Pat Manning
Hawkwood Glazier
Helen Cheuk
TreeHugger Robot
Bill Yi
Jeremy Sim