Pat Manning
a202345353
Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17400564
Change-Id: Ic36aa91bcb9ceaf42c6e69f721d5e2f3721c7dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:23:21 +00:00
Tony Wickham
0daff1d28d
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours am: d9e6861277 -s ours am: 6536e5468c -s ours am: 750884b1a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: Ia63a512b0ebea2bd87d650444c3a8c669b159717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:15:03 +00:00
Vinit Nayak
8131939074
[automerger skipped] Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a am: 2d6e6ed6e4 -s ours am: 26b6739c94 -s ours
...
am skip reason: Merged-In I3864ac02ea00f281d33ccb26b95a4916bd8b6be9 with SHA-1 26b6b577b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: I6ec3bda8314777c71f6dbb7f96d7f90b357dc2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:14:12 +00:00
Tony Wickham
c2f0aefa60
Merge "Log when calling disposeEventHandlers" into tm-dev am: 6e9c06998d am: eee5f9cb44 am: a6f74dd4ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17356395
Change-Id: I5a4e6a2b170edf0711efc3f533acafa89a699fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:10:00 +00:00
Tony Wickham
750884b1a4
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours am: d9e6861277 -s ours am: 6536e5468c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: I192779eb9dc9bd2f1bdf00a210349aa555ed2430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:06:37 +00:00
Pat Manning
5575dfeaad
Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev
2022-04-01 02:05:41 +00:00
Vinit Nayak
26b6739c94
[automerger skipped] Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a am: 2d6e6ed6e4 -s ours
...
am skip reason: Merged-In I3864ac02ea00f281d33ccb26b95a4916bd8b6be9 with SHA-1 26b6b577b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: If460b15bb35a4d53d6823f2688d97b481873d0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:03:27 +00:00
Tony Wickham
6536e5468c
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours am: d9e6861277 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: I8ef8d7a17827ed8a73075e036fbef0820bb15fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:49:18 +00:00
Tony Wickham
a6f74dd4ff
Merge "Log when calling disposeEventHandlers" into tm-dev am: 6e9c06998d am: eee5f9cb44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17356395
Change-Id: I8eab9e46ee7792546ec84f05ea0f0f791ed5ce22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:46:47 +00:00
Tony Wickham
b30e8f3c2a
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours am: d9e6861277 -s ours am: a820a01a16 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: I0c4e14efb894aaa83c029537b9e9e5453e47b29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:45:58 +00:00
Vinit Nayak
2d6e6ed6e4
Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: Ife7ff1b9c013cba3db23a8d1997781575c9fbad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:37:28 +00:00
Vinit Nayak
b4dbdc633c
[automerger skipped] Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a am: 8a3d35de16 -s ours
...
am skip reason: Merged-In I3864ac02ea00f281d33ccb26b95a4916bd8b6be9 with SHA-1 26b6b577b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: Ib34815908899142b683a314b722b1d43d0ced94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:34:18 +00:00
Vinit Nayak
6a4dfa4ab1
[automerger skipped] Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a -s ours
...
am skip reason: Merged-In I3864ac02ea00f281d33ccb26b95a4916bd8b6be9 with SHA-1 ddbf5374aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: I410732e4f2b0bdfd7d5c6bce19ebe0cb516205ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:29:35 +00:00
Vinit Nayak
8c13d8d310
[automerger skipped] Add metrics for taskbar 3 button nav am: 26b6b577b9 -s ours
...
am skip reason: Merged-In I3864ac02ea00f281d33ccb26b95a4916bd8b6be9 with SHA-1 ddbf5374aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: I925ef2869c8a992c31b786b50a87904d3b09b6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:29:34 +00:00
Tony Wickham
eee5f9cb44
Merge "Log when calling disposeEventHandlers" into tm-dev am: 6e9c06998d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17356395
Change-Id: I5e9976ddfcdb2501bc181c94d75e7028027ca790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:28:06 +00:00
Tony Wickham
978dde27ff
Merge "Log when calling disposeEventHandlers" into tm-dev am: 6e9c06998d am: 77f76a5e8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17356395
Change-Id: Ifba63ca659a637334407f455fe00ec1ef1515a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:26:05 +00:00
Android Build Coastguard Worker
a3dd71764f
Snap for 8391568 from 2c52c31571 to tm-release
...
Change-Id: I932689a52e02c63754debe66c3082d00704810f6
2022-04-01 01:09:33 +00:00
Merissa Tan
ce3af8d690
Disable taskbar stashing on desktop environment.
...
Bug: 223736439
Test: Manual
Change-Id: Iceb349b8a1dbae41e13ef1890a6834d66776c9af
(cherry picked from commit 215479443ce0339f75c691195dd14b4e9d5f4da1)
2022-03-31 18:03:56 -07:00
Tony Wickham
a820a01a16
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours am: d9e6861277 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: Id107134643f5d5e9f617898efed906e96ee16412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 00:31:26 +00:00
Tracy Zhou
0439fcdd5c
Do not append additional delimiters
...
Fixes: 227665358
Test: N/A
Change-Id: I6ec0bca286c0824e474f04a61b7d855858490120
2022-03-31 17:15:46 -07:00
Tony Wickham
d9e6861277
[automerger skipped] [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8 am: 274a88a949 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: I10818ce074a19ae0e319e10640b9ce3c36206323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 00:11:48 +00:00
Vinit Nayak
8a3d35de16
Merge "Add metrics for taskbar 3 button nav" into tm-dev am: c8b2fdbc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17387076
Change-Id: I990f9cef669dec1734ca99b9c35c75ea626ce493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 23:41:16 +00:00
Tony Wickham
77f76a5e8a
Merge "Log when calling disposeEventHandlers" into tm-dev am: 6e9c06998d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17356395
Change-Id: I36622417b3f550077fff67fb0f3ec5bdcc54f393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 23:36:50 +00:00
Tony Wickham
274a88a949
[RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165
Change-Id: I40829c772de9b898af060180fb12da6363c978a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 23:33:42 +00:00
Vinit Nayak
c8b2fdbc6a
Merge "Add metrics for taskbar 3 button nav" into tm-dev
2022-03-31 23:22:33 +00:00
Tony Wickham
6e9c06998d
Merge "Log when calling disposeEventHandlers" into tm-dev
2022-03-31 23:20:46 +00:00
Vinit Nayak
188ae14220
Listen for density changes through DisplayController callbacks
...
* Make display controller callbacks member variable for
clarity.
* Created follow-up refactor (b/227669780)
Fix: 227329641
Test: Repro steps in bug no longer make taskbar appear
when it shouldn't
Change-Id: I83702c0b817749943d2a9c4c5f0e44342a475e75
2022-03-31 16:20:23 -07:00
Vadim Tryshev
34586aeb4f
Merge "Moving away from obsolete Display#getRealSize()." into tm-dev am: 2c52c31571 am: 3ec1f6216b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17524213
Change-Id: I3743dbe0d34682144e5122669ead817317580cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 21:31:42 +00:00
Vadim Tryshev
3ec1f6216b
Merge "Moving away from obsolete Display#getRealSize()." into tm-dev am: 2c52c31571
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17524213
Change-Id: I8be38624a05354ffbe31645b5e503bbd1b73d36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 21:12:22 +00:00
Vadim Tryshev
55001ec5d2
Merge "Moving away from obsolete Display#getRealSize()." into tm-dev am: 2c52c31571
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17524213
Change-Id: I459b61853ec1880b8e7a7e4abce0a0459d88062c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 21:12:15 +00:00
Kholoud Mohamed
e98a6d2fc8
Merge "Fix newAPI lint error"
2022-03-31 21:11:34 +00:00
Vadim Tryshev
2c52c31571
Merge "Moving away from obsolete Display#getRealSize()." into tm-dev
2022-03-31 21:01:58 +00:00
Vinit Nayak
26b6b577b9
Add metrics for taskbar 3 button nav
...
Fixes: 221075063
Test: wwlogcat shows right events,
new events show up on aster dashboard
Change-Id: I3864ac02ea00f281d33ccb26b95a4916bd8b6be9
Merged-In: I3864ac02ea00f281d33ccb26b95a4916bd8b6be9
2022-03-31 19:36:47 +00:00
TreeHugger Robot
697a168260
Merge "Add metrics for taskbar 3 button nav"
2022-03-31 19:19:24 +00:00
Schneider Victor-tulias
cde332cbf0
Merge "Add public constructors to gesture tutorial fragments." into tm-dev am: 3a6b7360a2 am: f652834c96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17388919
Change-Id: Ib2577dfff0d1604cad8c77b86d892071c0489172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:07:53 +00:00
Tony Wickham
2242e4b437
Merge "Decouple taskbar background color from overview" into tm-dev am: e0c464a0e0 am: 6ffd4094f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17511887
Change-Id: Ica63d5ed4ad4bea3ac5f5a3431e33fa2a2d7320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:07:39 +00:00
Jon Miranda
17f8ec8c7d
Merge "Avoid closing PopUpContainer immediately after view is clicked." into tm-dev am: 39055bebc9 am: 81840c00a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17477449
Change-Id: Iabf01868690587e8f67c83685cef4dbce7a0cd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:07:32 +00:00
Sebastián Franco
e7a11ca5a2
Merge "Fix widget drop animation in 4x5 grid" into tm-dev am: 89804c42d4 am: 0a6b19b5f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17491543
Change-Id: Id67170b574923987719ac7c846ef5535ee7130af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:05:23 +00:00
vadimt
bda5f6b3e5
Moving away from obsolete Display#getRealSize().
...
Step 2 (final): stopping using old API
Bug: 202567877, 227307209
Test: presubmit
Change-Id: Ic32740723a517b28f92dbdd32fc53e27831441cc
2022-03-31 10:56:03 -07:00
Schneider Victor-tulias
f652834c96
Merge "Add public constructors to gesture tutorial fragments." into tm-dev am: 3a6b7360a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17388919
Change-Id: Iaa4bdd5b0b301581f7d6c12169e9873b10b28ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:34:28 +00:00
Schneider Victor-tulias
12387cf091
Merge "Add public constructors to gesture tutorial fragments." into tm-dev am: 3a6b7360a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17388919
Change-Id: Idcd57e272603e311b178e980f78a9c6e17dc2870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:34:23 +00:00
Tony Wickham
6ffd4094f4
Merge "Decouple taskbar background color from overview" into tm-dev am: e0c464a0e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17511887
Change-Id: I382310a23fc595b896d9bdd78647f1f488bb8b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:33:47 +00:00
Tony Wickham
adf429fa75
Merge "Decouple taskbar background color from overview" into tm-dev am: e0c464a0e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17511887
Change-Id: Ifc3e4ab34a83c9d62f56010b4f420c60ea7b2a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:33:23 +00:00
Jon Miranda
19a1fc932f
Merge "Avoid closing PopUpContainer immediately after view is clicked." into tm-dev am: 39055bebc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17477449
Change-Id: I724a4061df211b583dc18b90a93c5f441ba931f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:33:04 +00:00
Jon Miranda
81840c00a5
Merge "Avoid closing PopUpContainer immediately after view is clicked." into tm-dev am: 39055bebc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17477449
Change-Id: I82d03c4b9eb389f000d5458d665e2fbf5f340710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:32:32 +00:00
Sebastián Franco
0a6b19b5f9
Merge "Fix widget drop animation in 4x5 grid" into tm-dev am: 89804c42d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17491543
Change-Id: Icee6ea4283c21a10c4ca90875d9c30435cca2d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:31:48 +00:00
Sebastián Franco
07d9073f3d
Merge "Fix widget drop animation in 4x5 grid" into tm-dev am: 89804c42d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17491543
Change-Id: I50811d73b895dcf1dbd9835ae327a79a4d404602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:31:23 +00:00
Schneider Victor-tulias
3a6b7360a2
Merge "Add public constructors to gesture tutorial fragments." into tm-dev
2022-03-31 17:30:14 +00:00
Tony Wickham
e0c464a0e0
Merge "Decouple taskbar background color from overview" into tm-dev
2022-03-31 17:28:40 +00:00
Tony Wickham
ae82fc4ba0
Decouple taskbar background color from overview
...
- Taskbar background is 15L but Overview dark should be 35L
Test: Swipe up from taskbar (which is 15L), background matches until
going to overview, then animates to appropriate overview color based on
theme (light or dark).
Bug: 227344452
Change-Id: I52d892a569c8db565b4cfe271e532009f34ec669
2022-03-31 17:28:16 +00:00