András Klöczl
76ff949ba8
Merge "Fix icon adding issue on two panel home" into sc-v2-dev am: a2f5ee8f0c am: 27476dcf3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15216470
Change-Id: Id821b459555e42ad0bdae3876be060b2e3798291
2021-07-06 21:42:23 +00:00
Andras Kloczl
88716645cd
Fix icon adding issue on two panel home
...
Test: manual & PromiseIconUITest & RequestPinItemTest
Bug: 192431856
Change-Id: I4a6319fa33c9359057f87d9c008eb139410593b5
2021-07-06 17:41:26 +02:00
Hyunyoung Song
3553e5941b
Merge "Revert "Don't use ProxyActivity when launching from SearchActionItemInfo intent"" into sc-dev am: 933d2536da am: 912f7aff7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184812
Change-Id: I7c9ce9074f9f7457593b5716c1283bea920d7e78
2021-07-02 21:50:48 +00:00
Hyunyoung Song
6700b07b95
Merge "Revert "Don't use ProxyActivity when launching from SearchActionItemInfo intent"" into sc-dev am: 933d2536da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184812
Change-Id: I11f7a50edec21c2ed2adca381f7841a4844b2580
2021-07-02 21:36:55 +00:00
Hyunyoung Song
933d2536da
Merge "Revert "Don't use ProxyActivity when launching from SearchActionItemInfo intent"" into sc-dev
2021-07-02 21:18:18 +00:00
Hyunyoung Song
5881b910e9
Revert "Don't use ProxyActivity when launching from SearchActionItemInfo intent"
...
This reverts commit 878dedfb84 .
Reason for revert: b/192558017
Bug: 192558017
Change-Id: I41e64ab74c00d7b255be6f3ef1b783c01571d641
2021-07-02 21:18:10 +00:00
Hyunyoung Song
0ef049b748
Merge "Remove flicker when dismissing snackbar" into sc-dev am: 2d8856537e am: cc54d4a3bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15190712
Change-Id: I48c30029bb36dd9bd748972fe279a82892a2ebe0
2021-07-02 21:03:28 +00:00
Hyunyoung Song
40729fbdd6
Merge "Remove flicker when dismissing snackbar" into sc-dev am: 2d8856537e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15190712
Change-Id: I96da9d1380c2131849080e7835ed30b2b17f16a2
2021-07-02 20:42:24 +00:00
Hyunyoung Song
2d8856537e
Merge "Remove flicker when dismissing snackbar" into sc-dev
2021-07-02 20:29:59 +00:00
TreeHugger Robot
e4a0bbfb37
Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev am: 04d4d0d4f9 am: 667c605d40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184364
Change-Id: I46967408354d4a46626c46f563aa17743f199ea7
2021-07-02 19:20:35 +00:00
TreeHugger Robot
fc9d97164c
Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev am: 04d4d0d4f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184364
Change-Id: I2ab86183cc5cd32b233b596364acfd329d8211a9
2021-07-02 19:05:02 +00:00
TreeHugger Robot
04d4d0d4f9
Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev
2021-07-02 18:46:30 +00:00
Hyunyoung Song
1b68cbb822
Remove flicker when dismissing snackbar
...
Bug: 191972314
Test: manual
Change-Id: Icf185b89c07b363ec44c77ba3ac1bdeb34e30e59
2021-07-02 11:35:53 -07:00
Pierre Barbier de Reuille
8029c85b95
Merge changes Id2a8d12e,I06353ba4 into sc-dev am: 6788b73970 am: b8de52725e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171715
Change-Id: I03b4acde4c095f6b47f6f1eeee34417f86b0d7a7
2021-07-02 14:33:13 +00:00
Pierre Barbier de Reuille
c167b0bdf3
Merge changes Id2a8d12e,I06353ba4 into sc-dev am: 6788b73970
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171715
Change-Id: I40b331817125cd8f4f56302d004bb77e79ca635b
2021-07-02 14:20:17 +00:00
Pierre Barbier de Reuille
6788b73970
Merge changes Id2a8d12e,I06353ba4 into sc-dev
...
* changes:
Use the computation of the widget size including padding.
Avoid calling AppWidgetHostViedw#updateAppWidgetSize
2021-07-02 14:05:08 +00:00
Pierre Barbier de Reuille
a7b3a14e75
Use the computation of the widget size including padding.
...
Found all the uses of getWidgetSizePx and replaced them with the
computation of padded sizes (checked it all made sense).
Test: Try the various widget pickers.
Bug: 191612352
Change-Id: Id2a8d12ee7ce6baabef186dbb78d817975ea2212
2021-07-02 10:04:06 +01:00
Pierre Barbier de Reuille
199aec50ad
Avoid calling AppWidgetHostViedw#updateAppWidgetSize
...
We cannot call it anymore, because the system padding is not always
used.
Bug: 191612352
Test: Manually, using CtsVerifier and dedicated widgets
Change-Id: I06353ba49a8e62127e593cdbcb86fadcf89ecb24
2021-07-02 10:03:44 +01:00
Hyunyoung Song
9804c0472e
Fix NPE inside dispatchRestoreInstanceState
...
Bug: 192559704
Test: manual
Change-Id: I212518ac4a7feddd8e87f4be601332ea62e99313
2021-07-01 23:26:57 -07:00
Tracy Zhou
e54f789de9
Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev
2021-07-01 19:32:39 +00:00
Jonathan Miranda
0382ba2d27
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: b018ea34fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I87c9e1863a9bd7097b419bdeedbddc3c3b8beb04
2021-07-01 18:48:12 +00:00
Jonathan Miranda
aa560506ba
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I667763f65219cf259b8cf0db929d7dc0c848163e
2021-07-01 18:36:16 +00:00
Jonathan Miranda
81501a563c
Merge "Cancel existing preview item animation during non-animated update." into sc-dev
2021-07-01 18:32:49 +00:00
Tracy Zhou
99adef95b3
Do not switch to screenshot and finish recents animation for menu options that already do so
...
The issue is that in landscape mode we add overview shortcuts (e.g. screenshot) to the task view menu, where we switch to screenshot and finish recents animation before executing the shortcut action. However for shortcut actions like screenshot, we do the same, resulting in two chained "switch to screenshot and finish". This is a temporary fix for S given it's late in the cycle and we don't want to introduce unwanted regressions.
Fixes: 192272546
Test: manual
Change-Id: I7ef596e8bce6c15aa4a27163197beac12359b691
2021-07-01 17:46:44 +00:00
Cyrus Boadway
0113aa9fd8
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 2c0058d280
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I8102fdf54c026e8ff723e34ef74e728c8a31e0fd
2021-07-01 17:27:56 +00:00
Cyrus Boadway
270a9c734f
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I6b6b6bf2ecb367f81fdb82321c7e7bb3cd8a228a
2021-07-01 17:15:38 +00:00
Cyrus Boadway
551b4297ed
Use nullable field and boolean rather than optional
...
Optional won't hold null parameters, so use a boolean flag and
colorschange fields to represent the value and whether changes are
present.
Bug: 190818220
Test: manual
Change-Id: I794507340345864e73f04039f12a035c8053fd96
2021-07-01 15:05:43 +00:00
Alina Zaidi
676e0e5bf0
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: 03007e3a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: I2ffb1a4a5d9ee0bc32a7100631a45fe97f1acecf
2021-07-01 14:19:08 +00:00
Yogisha Dixit
c0425b05c6
Merge "Log widgets source." into sc-dev am: f9acf1d5d4 am: 0f8e5a8a3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879
Change-Id: If1ec9ea5acee39e6b83b5beb51a3cb109aaf219b
2021-07-01 13:43:21 +00:00
Cyrus Boadway
312fd335c0
Merge "resolve merge conflicts of 239e0b5408 to master"
2021-07-01 13:41:20 +00:00
Alina Zaidi
f03b1aeeb6
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: I92c997fbd0d0f47e78e5169e8cad9938bd2af0a0
2021-07-01 11:52:05 +00:00
Pierre Barbier de Reuille
2fa6e35341
Merge "resolve merge conflicts of 25e37a85ae to sc-v2-dev" into sc-v2-dev
2021-07-01 11:50:42 +00:00
Cyrus Boadway
f3bd6d81c7
resolve merge conflicts of 239e0b5408 to master
...
Bug: 192467834
Change-Id: Iaa856c8606561980be3d41251a68ca87eb419def
2021-07-01 11:42:00 +00:00
Alina Zaidi
eefccccb19
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev
2021-07-01 11:10:26 +00:00
Steven Ng
d9128413cc
Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev
2021-07-01 10:29:49 +00:00
Pierre Barbier de Reuille
41f78f1e13
resolve merge conflicts of 25e37a85ae to sc-v2-dev
...
Change-Id: I78062d68d051a5f3c369214929f569b17c5a3471
Fix: 192532604
Bug: 192354264
Test: Manual
Merged-In: If573641e4bb5a98ed6b5008e00f70f4bbe492c24
2021-07-01 09:47:10 +00:00
Steven Ng
39a87fda17
Fix widget animation truncated at drop if a widget is resized
...
Set the widget outline to DragView rather than the content view
hosting a Picture record of AppWidgetHostView at drop.
Bug: 191646816
Test: Manual
Change-Id: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
Merged-In: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
2021-07-01 09:22:25 +00:00
Alina Zaidi
1b5efa3216
Reduce margin for DropTargetBar to avoid buttons to be truncated.
...
Bug: 187036287
Test: Tested manually by QA testing team on 4X5 grid size
Change-Id: Iaa4cd3e464ccf50427a5aa96d97093601e1d2948
2021-07-01 09:50:46 +01:00
TreeHugger Robot
25e37a85ae
Merge "Correct color extraction on App Widget drop." into sc-dev
2021-07-01 08:31:16 +00:00
Vinit Nayak
837359b1ea
Set correct divider dimension for task menu options
...
Previously divider drawable dimension was set on height,
which only works when things are divided vertically.
For horizontal layouts, we need to set divider width.
Bug: 192398954
Test: Tested portrait + fake/real landscape
+ tablet
Change-Id: I5a63df9749bf37c3a563e923a1b4724aa17d9409
2021-07-01 02:05:42 +00:00
Jon Miranda
2cc33ed29a
Cancel existing preview item animation during non-animated update.
...
Otherwise we end up in a bad folder icon state.
Bug: 191227370
Test: Drag icon out of folder bounds,
Suddenly drop it so its forced to go back to the folder
Close folder before the animation finishes
Change-Id: Ib751a8209d66c5e9772731fdc1d7f365ae47531a
2021-06-30 17:59:17 -07:00
Steven Ng
b5c9b67b5e
Fix widget animation truncated at drop if a widget is resized
...
Set the widget outline to DragView rather than the content view
hosting a Picture record of AppWidgetHostView at drop.
Bug: 191646816
Test: Manual
Change-Id: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
2021-06-30 20:48:20 +00:00
Steven Ng
12b0dfb826
Fix widget animation truncated at drop if a widget is resized
...
Set the widget outline to DragView rather than the content view
hosting a Picture record of AppWidgetHostView at drop.
Fix: 191646816
Test: Manual
Change-Id: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
Merged-In: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
2021-06-30 20:47:57 +00:00
Brian Isganitis
e99ed7b9d1
Merge "Intercept touch events for launcher preview root view" into sc-dev
2021-06-30 20:36:55 +00:00
Yogisha Dixit
ba28286260
Merge "Log widgets source." into sc-dev am: f9acf1d5d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879
Change-Id: I2fa39b66ca31549f7754657b7d3bde6bdf8a5f59
2021-06-30 18:33:44 +00:00
Yogisha Dixit
f9acf1d5d4
Merge "Log widgets source." into sc-dev
2021-06-30 18:18:12 +00:00
Pierre Barbier de Reuille
43e17301c4
Correct color extraction on App Widget drop.
...
Disable color extraction on drop until the workspace is back to its
normal size, then re-enable it and force re-coloring. This needs to
happen if the drop is on the workspace, but also if the drop is on the
secondary target.
Fix: 192354264
Test: Manual, see bug for details.
Change-Id: I79203f68843d59384503aa76f4813d886e98afa3
Merged-In: If573641e4bb5a98ed6b5008e00f70f4bbe492c24
2021-06-30 18:50:41 +01:00
Yogisha Dixit
658c5dafd4
Log widgets source.
...
Test: manual
(1) Upgrading to new DB version is successful (no errors thrown in logcat)
(2) Widgets that were added with the old DB version have CONTAINER_UNKNOWN as their source container
(3) Widgets that are added with the new DB version still log source container after reboot
Bug: 185778648
Change-Id: Iaa38f0be6bc4cb0d29842f9a2ea0d08de000c930
2021-06-30 17:48:14 +00:00
Cyrus Boadway
f5f23ba119
Merge "Defer onColorsChanged updates during widget-to-home animation" into sc-dev am: 1edaed8790
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147896
Change-Id: I93c3c42dc173182c7625dea719bbc540a544234a
2021-06-30 17:24:57 +00:00
Pierre Barbier de Reuille
d95f68c86a
Merge "Correct color extraction on App Widget drop."
2021-06-30 14:57:37 +00:00