Bryce Lee
9f43ea46a9
[automerger skipped] Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev am: 1276443016 am: 55c85ef2f2 -s ours am: 508fe43420 -s ours am: 7b8890847b -s ours
...
am skip reason: Merged-In If58608c1e491da7906a2615681da0514fa49cfc8 with SHA-1 31e90481d1 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22244586
Change-Id: I2c4c57c207de52297b29b5345feb9c87a5c80213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 01:48:01 +00:00
Bryce Lee
7b8890847b
[automerger skipped] Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev am: 1276443016 am: 55c85ef2f2 -s ours am: 508fe43420 -s ours
...
am skip reason: Merged-In If58608c1e491da7906a2615681da0514fa49cfc8 with SHA-1 31e90481d1 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22244586
Change-Id: I762652af11c3a518a3511fde5e6d1e134386b8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 01:05:08 +00:00
Jon Miranda
3c8a1bef83
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc am: a97dc04478 am: ae2f0e6499
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I350ef1fc5d8efd8869ac9fe907be233e13010f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 00:34:04 +00:00
Jon Miranda
04f2a758c6
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc am: a97dc04478 am: 623e12b54a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I6a1d108b1bd6d6f835dce9f6e212b43795e81420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 00:32:50 +00:00
Hyunyoung Song
963f3f6e0a
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9 am: bb1237eb76 am: c5d4b109ee am: 71149f756c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: I93e01c2845688b7ccd880c9633685a4f3addfbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 00:31:56 +00:00
Hyunyoung Song
6db11246a5
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9 am: bb1237eb76 am: c5d4b109ee am: d41f8abd68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: I6adf83734a5c6526c17b11e71fcb3a4a00c9b54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 00:30:29 +00:00
Bryce Lee
508fe43420
[automerger skipped] Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev am: 1276443016 am: 55c85ef2f2 -s ours
...
am skip reason: Merged-In If58608c1e491da7906a2615681da0514fa49cfc8 with SHA-1 31e90481d1 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20968629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22244586
Change-Id: I59b0db70eea43f4673b7d01a852242b45e9b4b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 00:16:06 +00:00
Jon Miranda
ae2f0e6499
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc am: a97dc04478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I7936c1ecd80d96aab0bdd5a1115441a6b9416fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:48:47 +00:00
Hyunyoung Song
71149f756c
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9 am: bb1237eb76 am: c5d4b109ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: I273ba9f1850d282d623a502cfc9756d866e63607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:48:09 +00:00
Jon Miranda
623e12b54a
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc am: a97dc04478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I673d6a98cdcbcde4dfe64729a9885c514261b323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:47:46 +00:00
Hyunyoung Song
d41f8abd68
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9 am: bb1237eb76 am: c5d4b109ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: Icea431bf075aeaf0ad1724622d790c71d163c3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:46:21 +00:00
Bryce Lee
55c85ef2f2
Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev am: 1276443016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22244586
Change-Id: Id879fd8d97166bb8818e45e49eafc453fd7ab87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:36:43 +00:00
Automerger Merge Worker
54c6d02c40
Merge "Merge "Add subclass for two pane widget picker" into udc-dev am: 94b5eada28 am: 4e44a9688d"
2023-03-24 23:16:49 +00:00
Federico Baron
7305716e5c
Merge "Add subclass for two pane widget picker" into udc-dev am: 94b5eada28 am: 4e44a9688d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22213528
Change-Id: Id31de3d50e580eda8dbac1e7f0420f7ab65ab3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:16:46 +00:00
Federico Baron
edcf794f33
Merge "Add subclass for two pane widget picker" into udc-dev am: 94b5eada28 am: 1cfc275699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22213528
Change-Id: Ib0d667c28d219ed56f0de23a52bc21c4da3f6dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:16:40 +00:00
Jon Miranda
a97dc04478
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I3cb2d462cef1df514c87418ed70ac624899c21fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:02:51 +00:00
Hyunyoung Song
c5d4b109ee
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9 am: bb1237eb76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: I491a12f6d11c40c165b83f4bd61cf5d9f79d55c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:00:41 +00:00
Bryce Lee
1276443016
Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev
2023-03-24 22:58:03 +00:00
Federico Baron
1cfc275699
Merge "Add subclass for two pane widget picker" into udc-dev am: 94b5eada28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22213528
Change-Id: I8ee22216e81e7798ee2f6df0bda0d1d9dc56e263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 22:32:55 +00:00
Federico Baron
4e44a9688d
Merge "Add subclass for two pane widget picker" into udc-dev am: 94b5eada28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22213528
Change-Id: Ieb05606e30be3f01a5bc4d0cf17c63d046d421d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 22:32:43 +00:00
Jon Miranda
3cd39729dc
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I687ea2a249e73036f8d4c4d187d999fd224b9f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 22:02:13 +00:00
Hyunyoung Song
bb1237eb76
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827
Change-Id: I1d5e7b401cfb874a0f801cfc0b5b76b53a608c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 22:00:27 +00:00
Jon Miranda
085c53869f
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev
2023-03-24 21:51:42 +00:00
Federico Baron
94b5eada28
Merge "Add subclass for two pane widget picker" into udc-dev
2023-03-24 21:43:24 +00:00
Hyunyoung Song
e8abfee5e9
Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev
2023-03-24 21:41:04 +00:00
Jon Miranda
16f7f355e8
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c am: d914d88884 am: 5dac395b9b am: e36203d43f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: I4c684900c31e7b39e9767567e9070c52ff50d795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 20:27:40 +00:00
Jon Miranda
f61463aa88
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c am: d914d88884 am: 5dac395b9b am: 295404be3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: I5e9f8ad2e885f358910f49c4589e1bca7010daaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 20:26:31 +00:00
Jon Miranda
e36203d43f
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c am: d914d88884 am: 5dac395b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: I144feca94c367a9da6e940606a7c0da79603ed93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 20:12:01 +00:00
Jon Miranda
295404be3d
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c am: d914d88884 am: 5dac395b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: I52517788b96125c36890ab3d0d2887958d255c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 20:11:52 +00:00
Vinit Nayak
62aebc354d
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37 am: cbc884e191 am: 8bdea9da7f am: 419923c90f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: Ib26b95e9aec95219dae10b25887216f31b846d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:58:01 +00:00
Vinit Nayak
14c3a5ee21
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37 am: cbc884e191 am: 8bdea9da7f am: 22405c9102
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: Id6fd578e81976cd11d12342267a2af2156e37c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:57:52 +00:00
Charlie Anderson
6906f80521
Merge "sets the initial arrow color for the popup to match the popup background." into udc-dev am: 7de5e99a10 am: 554ba74088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121620
Change-Id: I5128eed8e63cd478ad8186d5aadccc0bfaa68135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:57:26 +00:00
Jon Miranda
5dac395b9b
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c am: d914d88884
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: Ie3657fd66dc88aec4bb2063b76202147ad3b2c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:56:41 +00:00
Charlie Anderson
181cf46a7b
Merge "sets the initial arrow color for the popup to match the popup background." into udc-dev am: 7de5e99a10 am: 673548f085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121620
Change-Id: Ic1e802610f08d6587d9cd6a94aaed2f1ef063de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:56:37 +00:00
Jon Miranda
d914d88884
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev am: d22b3af81c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22235599
Change-Id: Ie6b6229342e4c6d473d98ee4594d648095f5babc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:40:17 +00:00
Jon Miranda
9c478b6c29
Add taskbarIconSize to GridOption/DisplayOptions
...
- Renamed variables to make it more clear what they represent
- DeviceProfile will be source of truth for taskbar
sizes
Bug: 265144213
Test: phone, multi-display, tablet
Change-Id: Id9c19d15a65894fd7645e0f876a4b6527b713c34
Flag: ENABLE_TRANSIENT_TASKBAR=true
2023-03-24 12:29:11 -07:00
Vinit Nayak
419923c90f
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37 am: cbc884e191 am: 8bdea9da7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: I8812e318efecb5189ac7a2e6061cfe0664ebd249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:28:34 +00:00
Vinit Nayak
22405c9102
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37 am: cbc884e191 am: 8bdea9da7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: I751aa6b69e627b8b21cdb1fac2afa512f4d5a23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:28:34 +00:00
Charlie Anderson
673548f085
Merge "sets the initial arrow color for the popup to match the popup background." into udc-dev am: 7de5e99a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121620
Change-Id: I04b89f223a4ddeeceb9e431766375750d6e69154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:28:06 +00:00
Charlie Anderson
554ba74088
Merge "sets the initial arrow color for the popup to match the popup background." into udc-dev am: 7de5e99a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121620
Change-Id: I0f2f2012db36abf7b8b80b0459def32b9fbb1b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:27:18 +00:00
Vinit Nayak
8bdea9da7f
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37 am: cbc884e191
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: Ic751581c09fd82949f78e8cd58baaaf2424ff124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 19:25:24 +00:00
Jon Miranda
d22b3af81c
Merge "Update transient taskbar shadow alpha for light/dark theme." into tm-qpr-dev
2023-03-24 19:18:26 +00:00
Charlie Anderson
7de5e99a10
Merge "sets the initial arrow color for the popup to match the popup background." into udc-dev
2023-03-24 18:59:33 +00:00
Vinit Nayak
cbc884e191
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: I9517d17659a5e650d91037f9f687b81ca5f193d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 18:55:40 +00:00
Federico Baron
002317f60c
Add subclass for two pane widget picker
...
Since the regular widget picker and the widget picker for tablet diverge quite a bit, we added a child class for it that extends WidgetsFullSheet.java
There should be no functionality changes with this CL, it's purely changes in code structure.
Bug: 256684299
Test: Turn on LARGE_SCREEN_WIDGET_PICKER flag and verify nothing changes compared to ag/20508230.
Change-Id: Ie0e93534d7b93017cc11a05f67728155d22951f9
2023-03-24 11:48:20 -07:00
Bryce Lee
340f6c0988
Revert "Do not allow system gestures when dreaming."
...
This reverts commit 05c9d551d8 .
Reason for revert: leads to b/274525884
Test: manual
Fixes: 275081253
Change-Id: I4bef532b1d8cb4e4c71458e609f25da901ed943d
2023-03-24 18:34:11 +00:00
Vinit Nayak
4ed9562b37
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev
2023-03-24 18:25:51 +00:00
Jon Miranda
a8f03bbe13
Update transient taskbar shadow alpha for light/dark theme.
...
Bug: 259712417
Test: manual
Change-Id: If3b24efa7b619501e8ed07621d8673e68d2c903d
Flag: ENABLE_TRANSIENT_TASKBAR true
2023-03-24 17:22:39 +00:00
Riddle Hsu
29f152905c
Merge "Remove workaround of delaying remove task" into udc-dev am: b828ba1386 am: 084c73f749
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22196246
Change-Id: I7a26b8b8f64da6c794e0f389bbb639dd156dfe7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 16:39:49 +00:00
Riddle Hsu
5f56090bbb
Merge "Remove workaround of delaying remove task" into udc-dev am: b828ba1386 am: bb9f8722f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22196246
Change-Id: Iec58a017f799a13a526db74f3b8efdc021c418e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 16:39:34 +00:00