Commit Graph

314 Commits

Author SHA1 Message Date
Vinit Nayak
07cccd161f Merge "Respect nav button tinting in SUW" into tm-qpr-dev am: f83d8a00a8 am: f47ba402c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20953768

Change-Id: I5ea97c57ae8e590da7c963c52ec3307b536f410b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 04:18:32 +00:00
Vinit Nayak
1d7e050bc6 Respect nav button tinting in SUW
* Check was originally added with rationale in
b/204384193#comment26, however presently we
do provide insets to SUW as of b/253538830
so looks like now we are getting the correct
info from SysUI
* There is a possibly related issue where buttons
are not tinted correctly on the final page of
SUW (b/265238238)

Test: Went through setup manually via adb
and observed that on light theme with dark
dialog scrim the button changes color
adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity
Bug: 256521774

Change-Id: I080033e21d22fbc366b7248b2d647fec610a5fb9
2023-01-11 21:29:37 -08:00
Alex Chau
c8f4d71590 Merge "Add transientTaskbarMargin above taskbar in overview" into tm-qpr-dev am: d79e53a5c8 am: 8d18eba59e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20782488

Change-Id: I4cd29254cc2f45de9956bd8aa3a626724b3ec8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 19:36:22 +00:00
Alex Chau
1b276a1ba7 Add transientTaskbarMargin above taskbar in overview
- Also removed transient_taskbar_two_panels_size and use sw720dp override instead, to be consistent with how we handle small vs large tablet in overview
- Also made isTransientTaskbar mockable so we can test that in DeviceProfileDumpTest

Bug: 260596114
Test: DeviceProfileDumpTest
Change-Id: I3c2236b95d91246e9581531478e3c97601cfb2ec
2022-12-19 17:23:27 +00:00
Alex Chau
e13b1a22f9 Merge "Polish hotseat and taskbar with 3 buttons" into tm-qpr-dev am: 4537638dfd am: 0d5ca5fe6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20533919

Change-Id: I37921b47514fc4823b2c6ee7d61fbf1ff6ca7c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 12:26:25 +00:00
Alex Chau
4537638dfd Merge "Polish hotseat and taskbar with 3 buttons" into tm-qpr-dev 2022-12-19 11:37:39 +00:00
Brian Isganitis
dcf07f398a Merge "Delay hiding Taskbar EDU until entering home or overview." into tm-qpr-dev am: a1808c3e49 am: ab29830493
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20727418

Change-Id: Ib9c849ea8640417b5d7bd8d5978c8485a04205a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18 23:53:20 +00:00
Brian Isganitis
a1808c3e49 Merge "Delay hiding Taskbar EDU until entering home or overview." into tm-qpr-dev 2022-12-18 22:48:39 +00:00
Thales Lima
6a59006592 Polish hotseat and taskbar with 3 buttons
Change margin spaces and logic of how many items the hotseat and taskbar should show.

Fix: 246424857
Test: DeviceProfileDumpTest
Test: HotseatWidthCalculationTest
Change-Id: I8ec71c56a0aa362483c43d6400c762d12cf45f5b
2022-12-17 11:20:21 +00:00
Alex Chau
5786c775a7 Merge "Set iconsSizePx of Taskbar's DeviceProfile directly" into tm-qpr-dev am: 98d33cdff9 am: a1608fb21a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20747426

Change-Id: I1608c3061545fcffaafd398bdb0195e0637d4db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 17:58:51 +00:00
Alex Chau
a68164d89e Set iconsSizePx of Taskbar's DeviceProfile directly
- After ag/20691430, iconScale no longer scale app icons (I should rename it later, after QPR2), so we'll need to set the desired iconSize directly for Taskbar's DeviceProfile
- Extracted setting iconSizePx and testSizePx out of updateIconSize, as they are no longer affected by scaling. This allows TaskbarActivityContext to set desired iconsize and then call updateIconSize

Bug: 256976071
Test: Test Taskbar icon size in different density
Change-Id: I741c178b59e0d8ecb4c63689e68767622329379c
2022-12-15 17:05:12 +00:00
Brian Isganitis
1e37aae1dc Merge "Polish all apps taskbar unstash behavior for transient and persistent." into tm-qpr-dev am: 8216a26bfe am: 71f9faded9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20713695

Change-Id: I8917a9a3f4ceb856cf1fecf8699e61fb5a0bf459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 20:10:06 +00:00
Brian Isganitis
338fa3e9ab Delay hiding Taskbar EDU until entering home or overview.
EDU will now end up hiding due to
TaskbarLauncherStateController#onStateChangeApplied closing all AFVs if
we are going to home or overview.

This is a quickfix to make it harder to accidentally close the EDU when
testing out the transient taskbar. We will eventually be moving to a
lighter EDU UI where having gestures occuring behind it will be less
awkward.

Test: Manual
Bug: 260769010
Change-Id: I477abe9339ed10cb3aed8d1a0fbe0e22ac14c7ab
2022-12-13 20:16:29 -05:00
Brian Isganitis
2a2f1b6cd3 Polish all apps taskbar unstash behavior for transient and persistent.
- During gestures from taskbar all apps, unstash immediately in
  transient.
- Overlay closes sooner if all apps is open (still done later for EDU).
- Taskbar stashes in overview when All Apps is opened.
- Transient app-window threshold is ignored if All Apps is opened.

Test: Manual
Fix: 262076812
Change-Id: I46b2dcdc75ee0cc15c1b47da2139ff8c20cf618a
2022-12-13 16:24:35 -05:00
Jon Miranda
c77d4e0715 Merge "Better support transient and persistent taskbar in taskbar's overlays." into tm-qpr-dev am: a76222d209 am: e34202df54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20693438

Change-Id: I6b7bef257cd1553c6a2e79e99c52926b2b3f3012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 12:25:55 +00:00
Brian Isganitis
85ccf120f2 Better support transient and persistent taskbar in taskbar's overlays.
- Transient taskbar nav threshold now works in overlays.
- Delay closing overlay to transient app-window threshold if necessary.
- Persistent taskbar no longer stashes for EDU overlay.
- EDU overlay provides enough bottom padding for transient and
  persistent taskbar.

Test: Manual
Bug: 217261955
Change-Id: I2ae5612ef70a6d09e22f83f8117cdbf2a0a053b8
Fix: 260769010
2022-12-09 11:24:27 -08:00
Jon Miranda
36c8093a4a Merge "Add transient taskbar sizing for twoPanel devices." into tm-qpr-dev am: 01e90b7787 am: 9c053594e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20613321

Change-Id: Ia185a4d3e1eb014109842c37fe5f30e746ba7bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 20:03:28 +00:00
Jon Miranda
01e90b7787 Merge "Add transient taskbar sizing for twoPanel devices." into tm-qpr-dev 2022-12-02 18:58:08 +00:00
TreeHugger Robot
e5b7e43dab Merge "Removing SearchActionItemInfo" into tm-qpr-dev am: cfa199537b am: d48a078c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20537169

Change-Id: If4a0f59f32b7b2e74313ac1076abbcdaf74ab96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 18:22:31 +00:00
Jon Miranda
a4aaf1aced Add transient taskbar sizing for twoPanel devices.
Bug: 259712417
Test: on two panel device, on tablet device
Change-Id: Iae273b6bbfb254288c234aa5882f39eb0b6a88b1
2022-12-01 16:28:29 -08:00
Sunny Goyal
9a616213e1 Removing SearchActionItemInfo
> Instead introducing an interface for handling click events
> Linking this interface to other UI which handle clicks

Bug: 259733681
Test: Presubmit and verified manually
Change-Id: I9cbf2d009d64254f513deb909a151e46e860d039
2022-11-30 10:59:07 -08:00
Vinit Nayak
5b625f32ac Merge "Send corrent SUW insets for taskbar portrait vs landscape" into tm-qpr-dev am: 792a827309 am: 5d84ac3640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20546386

Change-Id: If3ffeb06fa79a1c6d135c2c6bd2cf4cba4a0ba48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 01:44:02 +00:00
Vinit Nayak
792a827309 Merge "Send corrent SUW insets for taskbar portrait vs landscape" into tm-qpr-dev 2022-11-30 00:50:51 +00:00
Vinit Nayak
209dd03b69 Send corrent SUW insets for taskbar portrait vs landscape
* There were two separate blocks of code for sending insets
for Taskbar during SUW, consolidate those
* We also weren't changing Taskbar window height corresponding
to the added insets/change of height for different
orientations in SUW

Fixes: 253538830
Test: Went through SUW and switched orientations,
no back button overlap

Change-Id: Ifb3bc1c20a793ef062bf338a3bdf933b8ae98c28
2022-11-24 10:29:16 -08:00
Brian Isganitis
817b135167 Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev am: 455eca41be am: 183f07e0da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20514045

Change-Id: I1ef05a3627aa58874d4911acd8fba153b01d2b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:27:09 +00:00
Brian Isganitis
455eca41be Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev 2022-11-21 19:02:44 +00:00
Brian Isganitis
c6ec460e83 Merge "Add a11y titles for taskbar windows." into tm-qpr-dev am: 50b3b62eba am: 57a3312468
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20239440

Change-Id: Ibf1bf6b7c7845c40ac8bcb1e706674f41230fdb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 02:03:05 +00:00
Brian Isganitis
50b3b62eba Merge "Add a11y titles for taskbar windows." into tm-qpr-dev 2022-11-18 01:56:22 +00:00
Brian Isganitis
424c7f4393 Still launch disabled item if we can't handle its click.
See where ItemClickHandler#handleDisabledItemClick returns false for
context. If we do not honor this return value, the framework will not
show a dialog in response to attempting launch the item.

Fix: 258232619
Test: Manual
Change-Id: Ie3b112eea17caf0a84defb331133bda9f3add5b6
2022-11-18 01:09:18 +00:00
Schneider Victor-tulias
cc1b5c7926 Merge "Fix null-pointer exception in all set activity first reveal animation" into tm-qpr-dev am: 193f8992f1 am: 383c950918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20486066

Change-Id: I2cfe3bde11e07d7ce7cb38cec52fb42d8357a84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 22:12:23 +00:00
Schneider Victor-tulias
193f8992f1 Merge "Fix null-pointer exception in all set activity first reveal animation" into tm-qpr-dev 2022-11-17 21:47:18 +00:00
Brian Isganitis
61b01e2c2a Add a11y titles for taskbar windows.
Test: Manual with Talkback.
Fix: 228389333
Change-Id: If30311166fde155d04cf1c9a6865c98d380a93ea
2022-11-17 20:56:04 +00:00
TreeHugger Robot
fd49872770 Merge "Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""" into tm-qpr-dev am: 87ccecb6fc am: 8c49ddde2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20425196

Change-Id: I826fbc5897fff22e932a4d790e76a7adee21298e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:40:37 +00:00
TreeHugger Robot
87ccecb6fc Merge "Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""" into tm-qpr-dev 2022-11-15 22:31:55 +00:00
Schneider Victor-tulias
912a53e677 Fix null-pointer exception in all set activity first reveal animation
Fixes: 259296310
Test: started all set activity and started the first reveal animation
Change-Id: I371f62be81e7f28ce5ecee150abb5d294bb2264d
2022-11-15 12:12:17 -08:00
Jeremy Sim
cf8e94592e Merge "Allow user to select second split app from Taskbar" into tm-qpr-dev am: d5525c3bda am: 3d0b47a5ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20365694

Change-Id: I03cc7692d94a8d0aa99e2822442da6251639f190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:17:47 +00:00
Jon Miranda
f0349354ec Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""
This reverts commit e7011d2b87.

Reason for revert: attempt to fix test issues

- Instead of using SharedPrefs which can be flaky anyways,
  we pass along a boolean to test transient taskbar when
  we are in the test harness

Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: I7c15a97363adc377f29853c1fe60b1960c77bfc3
2022-11-10 11:11:14 -08:00
Jeremy Sim
d5525c3bda Merge "Allow user to select second split app from Taskbar" into tm-qpr-dev 2022-11-10 18:56:22 +00:00
TreeHugger Robot
195e9ef499 Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev am: 8dd01f3ac2 am: b5c134d72c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20416308

Change-Id: Ie5d094942e3e476a8be47de609a47cf52049e621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 02:19:58 +00:00
TreeHugger Robot
8dd01f3ac2 Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev 2022-11-09 01:07:11 +00:00
Jeremy Sim
93fc0f3a7c Allow user to select second split app from Taskbar
This patch makes it so that (when we enable Taskbar in Overview) users will be able to select their second app for splitscreen by tapping the Taskbar icon, or the icon in AllApps.

This was done by performing a check to SplitSelectStateController when a taskbar icon is hit. If we are currently in split select mode, Taskbar/AllApps icons will no longer launch their respective fullscreen apps, but instead confirm the split attempt. The confirmed app will either be an already-running instance of the app, or a fresh instance of the app (if none is currently running). The split confirmation function is located in TaskbarUIController, where it is accessible to both LauncherTaskbarUIController (for 1P Launcher) and FallbackTaskbarUIController (for 3P launchers).

Also cleans up ~2 lines of unused code from the old splitscreen instructions toast.

Outstanding issues:
- When selecting a second app from within AllApps, the AllApps shade does not animate away in a satisfying way
- When selecting a second app and launching a fresh instance of that app, the animation appears to come from the wrong location
- Intent + Intent splitting does not currently work
- If the selected app is already running with multiple instances, it picks the oldest instance. Ideally, the newest instance is preferred.

Bug: 251747761
Test: Manual testing with Taskbar in Overview flag enabled
Change-Id: I302dc092740bb880f9134ba8e2e587c4f2c29d01
2022-11-08 14:38:05 -08:00
Jon Miranda
e7011d2b87 Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."
This reverts commit d5a6b5f688.

Reason for revert: Breaks tests due to "SharedPreferences in credential encrypted storage are not available until after user is unlocked"

Bug: 258256906
Change-Id: I1de69249685f9d2e71183357cf3eda8d443c7d97
2022-11-08 21:56:52 +00:00
Jon Miranda
c00b037650 Merge "Have responsive taskbar UI during swipe up gesture." into tm-qpr-dev am: caa398ed35 am: b71037c58b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20333665

Change-Id: Ia711d47f8c4d6cd3cd2c9a5201bde2f92ace9f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 18:58:44 +00:00
Jon Miranda
caa398ed35 Merge "Have responsive taskbar UI during swipe up gesture." into tm-qpr-dev 2022-11-08 17:53:05 +00:00
Jon Miranda
12cdc89c7e Merge "Add TaskbarModeSwitchRule to test both transient/persistent taskbar." into tm-qpr-dev am: 881588bfb5 am: 416680d8f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391679

Change-Id: Ibcc62df1f17de580c3c6f2b18749d5ef6e3be933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 17:10:33 +00:00
Jon Miranda
29f7474056 Have responsive taskbar UI during swipe up gesture.
- Makes taskbar threshold an absolute Y threshold
  instead of a distance threshold.
- Moves handle, taskbar view, and taskbar background
  during the swipe up gesture

Next CL will address transforming the nav handle <-> taskbar
and ensuring that there's a clean handoff

Bug: 246631059
Test: swipe up on taskbar, release. see bounce
      swipe up on taskbar to go home, proper icon alignment
      swipe up on taskbar, pause for overview, see bounce
      -> further movement should not move taskbar
      test launcher3

Change-Id: I141236fd72428cda7edd0ff116de1d478d18c722
2022-11-08 14:50:02 +00:00
Jon Miranda
d5a6b5f688 Add TaskbarModeSwitchRule to test both transient/persistent taskbar.
- Lays the foundation for transient taskbar tests.
- Does not add flags that would add ACTION_OUTSIDE in tests.
  We can address testing this functionality in a separate CL

Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: I44acc5e589b959e6d4bc93fdc369e503c54e7d87
2022-11-07 14:18:37 -08:00
Jon Miranda
82278364d1 Merge "Revert "Revert "Add a way to stash/unstash transient taskbar.""" into tm-qpr-dev am: 8ed5ac05fd am: 1b4a697e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20356225

Change-Id: I681f41d4be494e5fb4f079d37a63f3873167c8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 07:02:48 +00:00
Jon Miranda
8ed5ac05fd Merge "Revert "Revert "Add a way to stash/unstash transient taskbar.""" into tm-qpr-dev 2022-11-03 05:58:38 +00:00
Jon Miranda
575d699edc Revert "Revert "Add a way to stash/unstash transient taskbar.""
This reverts commit afc3bff10b.

Reason for revert: fixing launcher tests broken by original change

We'll only add flags for transient taskbar case

Bug: 256988243
Bug: 256987492
Change-Id: I8915ef5345816316bfb71efc9fc667e4e8db824c
2022-11-02 11:07:27 -07:00