Vinit Nayak
d26f44cf65
Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: 0a740a074a am: 0a708332b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173
Change-Id: I2f9d630cdb5fbfa06304aa9199fcd1b69f2188ff
2021-07-01 16:39:28 +00:00
Yogisha Dixit
eac443c2d4
Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9 am: 1e143f2c6b am: 9d096bb34c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002
Change-Id: I668aa4dd2b2310c8a2b9bae60afb299e1f2ff421
2021-07-01 16:39:12 +00:00
Cyrus Boadway
91d06db5e3
Merge "Defer onColorsChanged updates during widget-to-home animation" into sc-dev am: 1edaed8790 am: 9d609707c1 am: 5d52c966ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147896
Change-Id: I875cfeaf0b6fefe06fbfeeb7811e4698365f1d1d
2021-07-01 16:39:03 +00:00
Cyrus Boadway
8a074aeb54
Merge "resolve merge conflicts of 8cf91e4bcc to master"
2021-07-01 16:33:29 +00:00
Samuel Fufa
9010e773e4
Merge "Polish changes for work tab" into sc-dev
2021-07-01 16:30:39 +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
Steven Ng
9c0bafea47
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc am: 322bde8da4 -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 b5c9b67b5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: If5295b033b6aa241019b1eb647f5f4839c9916cf
2021-07-01 14:18:24 +00:00
TreeHugger Robot
007e15d55f
[automerger skipped] Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae am: 90322514fc -s ours
...
am skip reason: Merged-In If573641e4bb5a98ed6b5008e00f70f4bbe492c24 with SHA-1 2881801c7b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15121736
Change-Id: I4e316f83a637757b7de5a1c83bb808f3da9e237d
2021-07-01 14:16:32 +00:00
Vadim Tryshev
8ec43bbce8
Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: c24d41d183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391
Change-Id: I9643b7fcc07d9b419326fe54b8c1d962742a1e42
2021-07-01 14:16:25 +00:00
Vadim Tryshev
1a937a76f7
Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a am: ee33c8263f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349
Change-Id: I9dd001a750f975f11ceab7c67cf24f4065e44f14
2021-07-01 14:15:22 +00:00
Brian Isganitis
c88968473a
[automerger skipped] Merge "Intercept touch events for launcher preview root view" into sc-dev am: e99ed7b9d1 am: 41c463f3fa -s ours
...
am skip reason: Merged-In I98d462eca699cf368dcd5894f15584f280932ccc with SHA-1 3b39f3164b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146793
Change-Id: If0e15f0f8d95997cf5e6410babedd304dbd482ff
2021-07-01 14:06:25 +00:00
Cyrus Boadway
be2038d306
resolve merge conflicts of 8cf91e4bcc to master
...
Bug: 192467834
Change-Id: I2fe910d57cee43fe9f893319626d843d787ac382
2021-07-01 13:58:05 +00:00
Hongwei Wang
dcfe1eab2f
Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220 am: b4a1448ae2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509
Change-Id: I8853abffe95a33dec942a69e92be5bc9579776d0
2021-07-01 13:43:35 +00:00
Jon Spivack
71fc5d17f1
Merge "NIU Actions: Add privacy confirmation dialog" into sc-dev am: 4e0bc773c8 am: 7b1ea2a163
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098029
Change-Id: I68e55d2cba548e122e1e1e1623d2dd75a74eaf8a
2021-07-01 13:43:27 +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
Vinit Nayak
80edc3a54c
Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: e8ea68582f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173
Change-Id: I86391bfa2d276c15b72ea6511b2d5b536467309d
2021-07-01 13:43:15 +00:00
Yogisha Dixit
e79c6ae8a8
Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9 am: 0d36d3d9bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002
Change-Id: I211c9d19c46c772e48ec2c1a6e09bc9155cf6547
2021-07-01 13:43:06 +00:00
Cyrus Boadway
312fd335c0
Merge "resolve merge conflicts of 239e0b5408 to master"
2021-07-01 13:41:20 +00:00
Alina Zaidi
f273be1019
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: f03b1aeeb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: Ie4a995b2fdfb197acce85ad5830d241ec4fc2770
2021-07-01 12:07:25 +00:00
Steven Ng
3dfd83fc23
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc -s ours am: 5dce7fef9b -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 39a87fda17 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: I17e25ccc1ddbfc2c1751922c054697ed12ad736d
2021-07-01 12:07:21 +00:00
Pierre Barbier de Reuille
c30fcad112
Merge "resolve merge conflicts of 25e37a85ae to sc-v2-dev" into sc-v2-dev am: 2fa6e35341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171390
Change-Id: I8f8a300762b17aa33422d3b3900231ce56bac674
2021-07-01 12:07:17 +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
Steven Ng
5dce7fef9b
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 39a87fda17 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: I3608ee9892ecc3b99ab6f2a83667161ea9ef566e
2021-07-01 11:52:01 +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
c1565463bd
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: Iea88e6b232d10ec5d3a561b50ac20fea2632d436
2021-07-01 11:23:42 +00:00
Alina Zaidi
03007e3a50
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: Idc6206986265c8861e9cb081d091ce9c662735f0
2021-07-01 11:23:39 +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
c3a5df6188
Fix widget animation truncated at drop if a widget is resized am: 39a87fda17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171710
Change-Id: I22e0c4df8d7633d54c94ae46efa64d5e7309550a
2021-07-01 10:49:23 +00:00
Steven Ng
322bde8da4
Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: I27b79b08006cd2bcf850cb2a7976de914a35d7a5
2021-07-01 10:48:57 +00:00
Steven Ng
0fcbd49f2a
Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: I633957630d467ac1af6de76cd25494412dff7957
2021-07-01 10:48:40 +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
90322514fc
Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15121736
Change-Id: I5eabdfcc6f9685c6a8c7be5dc927887899c1ff3e
2021-07-01 08:45:33 +00:00
TreeHugger Robot
9cfbc67b70
Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15121736
Change-Id: I9032cc26278184acfc31b2e93ef0a614e4823755
2021-07-01 08:45:18 +00:00
TreeHugger Robot
25e37a85ae
Merge "Correct color extraction on App Widget drop." into sc-dev
2021-07-01 08:31:16 +00:00
Vadim Tryshev
c24d41d183
Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391
Change-Id: I8bd5dab1b02886c349c0e63ca8179b582425d31a
2021-07-01 07:45:29 +00:00
Vadim Tryshev
ee33c8263f
Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349
Change-Id: I6c886b1f14df1f72d35a65b495185a44de0a8a0d
2021-07-01 07:44:36 +00:00
Brian Isganitis
41c463f3fa
Merge "Intercept touch events for launcher preview root view" into sc-dev am: e99ed7b9d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146793
Change-Id: I4851cf9c7106d2e84bb79abae868fe996d528b96
2021-07-01 07:39:43 +00:00
Hongwei Wang
b4a1448ae2
Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509
Change-Id: Icf00b2bb3cac793a144081a42b817960a72745c0
2021-07-01 07:24:40 +00:00
Jon Spivack
7b1ea2a163
Merge "NIU Actions: Add privacy confirmation dialog" into sc-dev am: 4e0bc773c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098029
Change-Id: I0d70c01f6bbb1da53f12eeb8e5636739b185dd06
2021-07-01 07:24:28 +00:00
Yogisha Dixit
0f8e5a8a3f
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: I8c76625ff6a2a6c42b88518e7332119000e3eda4
2021-07-01 07:24:22 +00:00
Vinit Nayak
e8ea68582f
Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173
Change-Id: I279f00bd76bbf78c40c0cd71c541586edf060d7d
2021-07-01 07:02:54 +00:00
Yogisha Dixit
0d36d3d9bb
Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002
Change-Id: Ifae5dbc4fe7f64d8c921a9e13c34cdd0b5d1cfc2
2021-07-01 06:52:22 +00:00
Winson Chung
8185663b6e
Remove unused logs
...
Bug: 191698994
Test: Just removing logs
Change-Id: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
2021-07-01 04:44:04 +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
Tracy Zhou
89f8d0763d
Merge "[Live Tile] App surface is above launcher even after reaching Overview" into sc-v2-dev am: d25ee3294c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158868
Change-Id: Ic6dfce00e0b80adaa26da23b05363578ada8689a
2021-07-01 01:22:10 +00:00