Brian Isganitis
bdefcd1f77
Merge "Only close overlays onTaskMovedToFront for desktop prototype." into udc-dev am: cd7078372a am: fe4e3ee6d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22975846
Change-Id: I2544568ac8d126a3cdc0d4ada840d15e7e564376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:04:44 +00:00
Charlie Anderson
f4a2c2cab7
Merge "Revert "Changing GridMigrationTask to use ModelDbController directly"" into udc-dev am: 178802d35c am: ce7e7fdcd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23028431
Change-Id: Ie74b7d23ac29122deefd168a6cf95d2171cae038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:04:04 +00:00
Treehugger Robot
eddb8ecbc2
Merge "Always insetting the widget by a minimum of 6dp" into udc-dev am: c2dca5fec4 am: 1a1879239d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22953988
Change-Id: Ib7e0482227c2a7176cbe2ea6a6b0d0bbe7590bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:02:01 +00:00
Brian Isganitis
fe4e3ee6d9
Merge "Only close overlays onTaskMovedToFront for desktop prototype." into udc-dev am: cd7078372a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22975846
Change-Id: Icfd3370784b84753ae4d4bbb189c5ff71e01a8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:00:42 +00:00
Treehugger Robot
9aa8fb903e
Merge changes from topic "tc_change_23050307_53" into udc-dev-plus-aosp am: c9ab7ca52c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22972105
Change-Id: I318bcaa4a9d3ac3b5133ea8424446f635296a293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:20:26 +00:00
Bill Yi
b51c83b4ae
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d464fea1c 2p: 156ad0c167 am: 80241ebc25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22972105
Change-Id: I92e04a1636b9a34cff076a006cc65663ef7a2b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:20:13 +00:00
Charlie Anderson
fbcd272cbc
Merge "Revert "Changing GridMigrationTask to use ModelDbController directly"" into udc-dev am: 178802d35c am: 268945dafe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23028431
Change-Id: Ia83fed938e33046f9aebd125b005ea96c88e912a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:19:10 +00:00
Treehugger Robot
04d8a09245
Merge "Always insetting the widget by a minimum of 6dp" into udc-dev am: c2dca5fec4 am: 09df16f400
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22953988
Change-Id: Iecfcfe26de82d2551a7b5795dc83cd86da41fce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:18:59 +00:00
Brian Isganitis
cd7078372a
Merge "Only close overlays onTaskMovedToFront for desktop prototype." into udc-dev
2023-05-04 18:55:42 +00:00
Treehugger Robot
c9ab7ca52c
Merge changes from topic "tc_change_23050307_53" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d464fea1c 2p: 156ad0c167
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d464fea1c
Import translations. DO NOT MERGE ANYWHERE
2023-05-04 18:53:25 +00:00
Charlie Anderson
ce7e7fdcd2
Merge "Revert "Changing GridMigrationTask to use ModelDbController directly"" into udc-dev am: 178802d35c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23028431
Change-Id: I2d75a1d6898416136c1b3d39488369e59e45bbc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:36:56 +00:00
Treehugger Robot
1a1879239d
Merge "Always insetting the widget by a minimum of 6dp" into udc-dev am: c2dca5fec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22953988
Change-Id: Ifdb84c04ba6fc8d1dc23bceedefde31b661e966e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:36:36 +00:00
Charlie Anderson
268945dafe
Merge "Revert "Changing GridMigrationTask to use ModelDbController directly"" into udc-dev am: 178802d35c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23028431
Change-Id: I3814415661e231fb2ac2d4e941435d47985b1465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:32:42 +00:00
Treehugger Robot
09df16f400
Merge "Always insetting the widget by a minimum of 6dp" into udc-dev am: c2dca5fec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22953988
Change-Id: I73eee4772d669edbca7b0adb668ef0acdd32f9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:32:29 +00:00
Charlie Anderson
178802d35c
Merge "Revert "Changing GridMigrationTask to use ModelDbController directly"" into udc-dev
2023-05-04 17:58:01 +00:00
Schneider Victor-tulias
3c2460e35f
Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev am: d1054fd86b am: c21e15ab9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22915139
Change-Id: I9ea499478cc72076bfd33afb5c9a94a768b4d8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:50:23 +00:00
Brian Isganitis
8d5a392c7e
Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev am: 0c7f244f18 am: 189dafd86f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22976837
Change-Id: I9eb3af2153930ed044e2a2023e096849ebf2db82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:50:03 +00:00
Treehugger Robot
c2dca5fec4
Merge "Always insetting the widget by a minimum of 6dp" into udc-dev
2023-05-04 17:48:48 +00:00
Schneider Victor-tulias
6f5827fcde
Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev am: d1054fd86b am: 98f691ba84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22915139
Change-Id: I45a2e316a9b29a45ae5a3b1a82821ff4534ad80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:33:08 +00:00
Brian Isganitis
f02a0332d1
Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev am: 0c7f244f18 am: 2ef7f5e4a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22976837
Change-Id: If748675953fceaa7833d1f28940e6a4b2cc6e340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:31:25 +00:00
Schneider Victor-tulias
c21e15ab9c
Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev am: d1054fd86b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22915139
Change-Id: I3ed2e329bc9e71330148fb3d72df9212eb567dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:13:59 +00:00
Brian Isganitis
189dafd86f
Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev am: 0c7f244f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22976837
Change-Id: I8541ff49bdd8d0f7bb6d4286554c6cbd551983ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:12:31 +00:00
Schneider Victor-tulias
98f691ba84
Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev am: d1054fd86b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22915139
Change-Id: I8af271531e8ee826d0ce704f1fb5f350bc26f2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:10:41 +00:00
Brian Isganitis
2ef7f5e4a2
Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev am: 0c7f244f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22976837
Change-Id: Id1574fbb703ca0caba302bf0bca79fc400f50187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:08:25 +00:00
Schneider Victor-tulias
d1054fd86b
Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev
2023-05-04 16:55:21 +00:00
Brian Isganitis
0c7f244f18
Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev
2023-05-04 16:30:07 +00:00
Charlie Anderson
30bb3a247a
Revert "Changing GridMigrationTask to use ModelDbController directly"
...
This reverts commit 9ef41413e0 .
Reason for revert: This was the only launcher CL during the time b/280669657 and 280680602 occurred
Change-Id: Id7107f0935f84908ca87e1ae4c62ab05efe41a24
2023-05-04 15:19:58 +00:00
Fengjiang Li
b02689dd0d
Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev am: efb0c4e98c am: 0997074bba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22984963
Change-Id: Ic21778466bbe0337d0771301a4e3c5b5f7d6b46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:03:40 +00:00
Fengjiang Li
89d2362b90
Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev am: efb0c4e98c am: 1173366a91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22984963
Change-Id: Ib2d11199d596af88d9b93845a32d9153172a6e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:01:16 +00:00
Fengjiang Li
0997074bba
Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev am: efb0c4e98c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22984963
Change-Id: Id497957b4296e78b8759b91a8f0e05e25eb1fc71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:22:46 +00:00
Fengjiang Li
1173366a91
Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev am: efb0c4e98c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22984963
Change-Id: I21c40577b8ffb77f86e262222d9ed55d200aec28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:22:16 +00:00
Tony Huang
c01479fe0b
Merge "Send divider change to launcher to animate" into udc-dev am: 2725473272 am: 831791047a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22572268
Change-Id: I566d68468c5aed00aa34ff09f05636f3d5ebe8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:02:12 +00:00
Tony Huang
60eca67bcd
Merge "Send divider change to launcher to animate" into udc-dev am: 2725473272 am: 67d6b0026a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22572268
Change-Id: Icb3dc0442cc9fcbf7e3c110271be8599439568a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:01:16 +00:00
Fengjiang Li
efb0c4e98c
Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev
2023-05-04 13:39:08 +00:00
Tony Huang
67d6b0026a
Merge "Send divider change to launcher to animate" into udc-dev am: 2725473272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22572268
Change-Id: Ieda6054f7660d5079e35d34d167cf36d7680926b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:33:11 +00:00
Tony Huang
831791047a
Merge "Send divider change to launcher to animate" into udc-dev am: 2725473272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22572268
Change-Id: Ie88f3adb739353aa899dc2f2e9c281e71e2da6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:19:02 +00:00
Tony Huang
2725473272
Merge "Send divider change to launcher to animate" into udc-dev
2023-05-04 13:02:53 +00:00
Pat Manning
d5dc9e5d67
Merge "Change hover state based on color selector" into udc-dev am: fb9687dded am: 42b438a0db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612903
Change-Id: I84a4419b33dd2fda8e5db1d46c4562110deace0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:53:10 +00:00
Nick Chameyev
3776c0e7b7
Merge "[Unfold animation] Start Launcher animation preemptively to synchronize the first frame" into udc-dev am: 1aa2383d26 am: d2237ca763
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22647883
Change-Id: Ieb86cb74f2314e7e7eeb357657ccb5ba08bc5ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:51:48 +00:00
Pat Manning
0f3aa79a48
Merge "Change hover state based on color selector" into udc-dev am: fb9687dded am: 6578eaddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612903
Change-Id: I3a41604896d2c24981087a861f43157624177aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:51:27 +00:00
Nick Chameyev
6db21deef1
Merge "[Unfold animation] Start Launcher animation preemptively to synchronize the first frame" into udc-dev am: 1aa2383d26 am: ddf4099bb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22647883
Change-Id: I006189d8ca81a139b38016704325a0e90b24ea34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:50:39 +00:00
Pat Manning
42b438a0db
Merge "Change hover state based on color selector" into udc-dev am: fb9687dded
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612903
Change-Id: Ifb9135ecfbf3719381d04261001610b16e78345f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:30:32 +00:00
Pat Manning
6578eaddcc
Merge "Change hover state based on color selector" into udc-dev am: fb9687dded
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612903
Change-Id: I9b8702c9c3c885698e2897f81c891c981b5e5c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:29:19 +00:00
Pat Manning
fb9687dded
Merge "Change hover state based on color selector" into udc-dev
2023-05-04 10:17:35 +00:00
Nick Chameyev
d2237ca763
Merge "[Unfold animation] Start Launcher animation preemptively to synchronize the first frame" into udc-dev am: 1aa2383d26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22647883
Change-Id: If2b5feb329926a9841cef56b137251a839b82120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:09:28 +00:00
Nick Chameyev
ddf4099bb7
Merge "[Unfold animation] Start Launcher animation preemptively to synchronize the first frame" into udc-dev am: 1aa2383d26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22647883
Change-Id: I6317933f8adbff60cd90635776666c7e9843d203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:09:25 +00:00
Wei Sheng Shih
a03cb379c7
Merge "Fix pauseBlur make launcher become opaque" into udc-dev am: 37d8c93893 am: 5459e659ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23011999
Change-Id: I2ad6f38856ed2ff722b7d1262f369c364a4bd99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:53:29 +00:00
Jagrut Desai
74a597e3bf
Merge "Revert to Fix AddConfigWidgetTest" into udc-dev am: d2852c90fc am: 301b4fbcac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22912160
Change-Id: I12c2a2803d672329554aa07038817ab27e9e7ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:50:06 +00:00
TreeHugger Robot
7a5be135b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8360dcdf20 -s ours am: e7d6d409d9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22972104
Change-Id: I2722a9e364d7a5f79913a5ab7cf820067f192e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:48:18 +00:00
Bill Yi
456ae4a700
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb6e930ce8 -s ours am: da473ede33 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22972104
Change-Id: Ifa1b6146ced2754b19743b53b4159f35dfa01f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:48:07 +00:00