Commit Graph

47938 Commits

Author SHA1 Message Date
Xin Li 369dcf68a5 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e24db03da4 -s ours am: 1eff2959d1 -s ours
am skip reason: Merged-In Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c with SHA-1 bd2860f039 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17545030

Change-Id: I9afe65f3ce14ffdb7473e25a9a7763bdaed4e276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:36 +00:00
Xin Li 1eff2959d1 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e24db03da4 -s ours
am skip reason: Merged-In Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c with SHA-1 bd2860f039 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17545030

Change-Id: I3d3f56108117d0b8b8e97e8463ea6e2b64a80cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:35 +00:00
Thiru Ramasamy dde19ea64d Rename "ONE_SEARCH" attributes to "WEB_SEARCH"
* Minor fix to logging

Bug: 210792253
Test: manual
Change-Id: Ib32b945e1fa7696b3b8360dae01e1bd00295ff8d
2022-04-01 23:10:43 +00:00
TreeHugger Robot 5d98da138d Merge "Remove unnecessary offset from the app label ICU string" into tm-dev am: f89d83f4e0 am: 076a0b1ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17504350

Change-Id: Ic1b8fa9ece59693b87cd70c940653d023d5edffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 21:03:42 +00:00
TreeHugger Robot 076a0b1ec1 Merge "Remove unnecessary offset from the app label ICU string" into tm-dev am: f89d83f4e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17504350

Change-Id: Ifb9e1d42cf1dc64296a8e5ed024c28292b0ce4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:49:34 +00:00
Xin Li e24db03da4 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c
Change-Id: Ic3e8c89ef9571af2b88516911f0fe1238a2eb847
2022-04-01 20:32:44 +00:00
TreeHugger Robot f89d83f4e0 Merge "Remove unnecessary offset from the app label ICU string" into tm-dev 2022-04-01 20:28:20 +00:00
Tracy Zhou 5af03c7fcf Merge "Fix npe in FrameHandler" into tm-dev am: 76a99eccc0 am: ce0ada92a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17534537

Change-Id: I96fa0489a9963c3ef0e23e2ec553781a6dc9ad60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:56:29 +00:00
Tracy Zhou ce0ada92a3 Merge "Fix npe in FrameHandler" into tm-dev am: 76a99eccc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17534537

Change-Id: I0aba80058903b3c4c6a4ca6d45f5e28e501640d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:27:09 +00:00
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 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 59c535bb71 Merge "Adding a feature flag to disable icon overrides" into tm-dev 2022-04-01 17:26:09 +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 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 bfa953b230 Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev 2022-04-01 10:11:59 +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 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 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 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
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
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
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
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
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 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
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 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
Jon Miranda 39055bebc9 Merge "Avoid closing PopUpContainer immediately after view is clicked." into tm-dev 2022-03-31 17:08:33 +00:00
Sebastián Franco 89804c42d4 Merge "Fix widget drop animation in 4x5 grid" into tm-dev 2022-03-31 17:05:16 +00:00
Alex Chau e681a1cbd5 Merge "Use Chrome instead of Camera for TwoPanelWorkspaceTest" into tm-dev 2022-03-31 16:15:55 +00:00
Alex Chau 72c4de8c13 Use Chrome instead of Camera for TwoPanelWorkspaceTest
Fix: 227540753
Test: atest -c NexusLauncherTests:com.android.launcher3.ui.workspace.TwoPanelWorkspaceTest#testEmptyPagesGetRemovedIfBothPagesAreEmpty
Change-Id: Ia00e243ef9d56e094da0e23511cc8d62fa606df6
2022-03-31 14:40:20 +00:00
Alex Chau 537552d55d Merge "Update overview scrim color to system_neutral2_200" into tm-dev 2022-03-31 14:39:52 +00:00
Alex Chau 8a7451a565 Allow 5 hotseat icons in tablet 3 button
Fix: 223756731
Test: manual
Change-Id: Iacde8b9506c09a20d6b2b917da8f6589009aadc7
2022-03-31 15:27:35 +01:00
Alex Chau 5f8386cf26 Merge "Using the WindowMetrics API instead of display.getRealSize" into tm-dev 2022-03-31 10:58:40 +00:00
Thales Lima c1ea50a43d Merge "Make inline qsb part of grid attrs" into tm-dev 2022-03-31 08:30:10 +00:00
wilsonshih 64cfa05d59 Update orientation state while gesture animation start.
While quickswitch in landscape mode, the orientation handler would be
update to LandscapePagedViewHandler when receive onLauncherStart,
however, it might be too late because the VelocityTracker can already
tracking with PortraitPagedViewHandler at
AbsSwipeUpHandler#setupRecentsViewUi, which leads the wrong
judgement while PagedView#onTouchEvent handling the ACTION_UP that
the velocity can nearly 0 from mOrientationHandler.getPrimaryVelocity.

By update the orientation handler earlier at onGestureAnimationStart,
the velocity tracking result should stay consistent from ACTION_DOWN
till ACTION_UP.

Bug: 213867585
Bug: 209936664
Bug: 221805258
Test: run below tests w/o shell transition.
atest FlickerTests:QuickSwitchBetweenTwoAppsForwardTest
atest FlickerTests:QuickSwitchBetweenTwoAppsBackTest

Change-Id: If73fa8d88cc372b6f783fb6cdda4148d11a2ee19
2022-03-31 13:03:39 +08:00