Commit Graph

60459 Commits

Author SHA1 Message Date
Tracy Zhou 76a99eccc0 Merge "Fix npe in FrameHandler" into tm-dev 2022-04-01 18:10:10 +00:00
Sunny Goyal b864ca924b Merge "Adding a feature flag to disable icon overrides" into tm-dev am: 59c535bb71 am: e42f52a41a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17359924

Change-Id: I1aa1cd4ca87f3789e7051313707f8692adab7e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:59:11 +00:00
Sunny Goyal 18e0838421 Merge "Adding a feature flag to disable icon overrides" into tm-dev am: 59c535bb71 am: 01e40862e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17359924

Change-Id: I34dc87556728defe033135e7e9c2f6267b1debea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:58:07 +00:00
Sunny Goyal e42f52a41a Merge "Adding a feature flag to disable icon overrides" into tm-dev am: 59c535bb71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17359924

Change-Id: I35e310b08684457bce038169f3d509a1a18f819a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:43:47 +00:00
Sunny Goyal 01e40862e1 Merge "Adding a feature flag to disable icon overrides" into tm-dev am: 59c535bb71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17359924

Change-Id: Ic6bcf642fd1b797d7f4b2115799a140db0456dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:42:55 +00:00
Sunny Goyal 59c535bb71 Merge "Adding a feature flag to disable icon overrides" into tm-dev 2022-04-01 17:26:09 +00:00
Alex Chau 55a848f520 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230 am: 82df031e6b am: f7a2a42af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523009

Change-Id: I741e55fb05c6707c44a220214af8f0e2f33b05cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 11:14:21 +00:00
Alex Chau f7a2a42af7 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230 am: 82df031e6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523009

Change-Id: Ib01495dbcb9660091d979159dc0167adddcf6ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:54:35 +00:00
Alex Chau b99eff7f80 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230 am: 1484d4a261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523009

Change-Id: If9a9140eddc291086a64d0570b470cce89100e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:53:59 +00:00
Alex Chau 82df031e6b Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523009

Change-Id: I80a79a244cee3d9eee37533c7853a9474d023644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:26:41 +00:00
Alex Chau 1484d4a261 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523009

Change-Id: I72b3ac14faa37ee6e8591e74be6657cf76f356da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:25:44 +00:00
Alex Chau bfa953b230 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev 2022-04-01 10:11:59 +00:00
Tracy Zhou 04c81e70b4 Merge "Do not append additional delimiters" into tm-dev am: bb75f59792 am: 0dc400695a am: 95380191ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17528595

Change-Id: I328a7e7fa09b90d9623378ff650fe32663fcb455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 05:24:08 +00:00
Tracy Zhou 95380191ed Merge "Do not append additional delimiters" into tm-dev am: bb75f59792 am: 0dc400695a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17528595

Change-Id: I9d845d35806f803937f1991007eff37305458fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 05:05:30 +00:00
Tracy Zhou 6bf22f786b Merge "Do not append additional delimiters" into tm-dev am: bb75f59792 am: 6811c5b8ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17528595

Change-Id: Ia11c0410168db21e7c9c9855f518225d6b2a5dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 05:05:12 +00:00
Tracy Zhou 0dc400695a Merge "Do not append additional delimiters" into tm-dev am: bb75f59792
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17528595

Change-Id: I04c37d0e2184fc0740bcf003652ce05ee09a86b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 04:50:58 +00:00
Tracy Zhou 6811c5b8ab Merge "Do not append additional delimiters" into tm-dev am: bb75f59792
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17528595

Change-Id: I8661f7a6320c9214104cc1639645721ad8e66548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 04:49:42 +00:00
Tracy Zhou b5f7e4fc19 Fix npe in FrameHandler
Previously we check if the view root is null, but after ag/16308550 we no longer do so

Fixes: 208657242
Test: N/A
Change-Id: I0bb4a1b26ca8b201393587e7d0d922b7d4e08419
2022-03-31 21:46:47 -07:00
Tracy Zhou bb75f59792 Merge "Do not append additional delimiters" into tm-dev 2022-04-01 04:26:20 +00:00
Pat Manning 2f557a3722 Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad am: 4a11331092 am: 2d7813fcdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17400564

Change-Id: I5d16070819cc17e644aa09c895c2e9aa64582855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 03:07:24 +00:00
Pat Manning 2d7813fcdc Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad am: 4a11331092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17400564

Change-Id: I442742dd7c15b7bc07e997688207d150fc960916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 02:46:16 +00:00
Pat Manning 4a11331092 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: If07f392d35106b21795ed79bc6eff62c9e376c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 02:24:21 +00:00
Pat Manning 94bdc131c3 Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad am: a202345353
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17400564

Change-Id: I2a6d7994a21526e8f0901989d432bc3ae8e60168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 02:24:21 +00:00
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