Commit Graph
294 Commits
Author SHA1 Message Date
Schneider Victor-tulias fa0bfee97a Add log dumps for taskbar state
Test: created bugreport and checked logs
Bug: -
Change-Id: Ic0c2330b18c8daf181ae5b236e0c4b212d630fa3
2022-01-20 14:41:25 -08:00
Tony Wickham 7b40594bc7 Merge changes I36f6cfb8,I7c784765
* changes:
  Create new window for Taskbar Nav Buttons when taskbar is focusable
  Make taskbar focusable when folder is open to get IME input
2022-01-14 17:12:08 +00:00
Tony Wickham 66971f87e1 Create new window for Taskbar Nav Buttons when taskbar is focusable
Test: Open folder from taskbar, edit name, ensure back button displays above IME and that IME sends input to the taskbar folder name
Bug: 205803170
Change-Id: I36f6cfb835aa7da280f15ea4b0aed8923ce8a012
2022-01-12 14:22:47 -08:00
Tony Wickham c07fb08a1e Make taskbar focusable when folder is open to get IME input
- Remove ActivityContext#supportsIme(), as it's always true now
- Add OnFolderStateChangedListener, which we register when clicking on a taskbar folder icon to set the window focusable/not.
- Also remove Folder.STATE_NONE and instead default to STATE_CLOSED (renamed from STATE_SMALL).

TODO: make sure back button is visible above IME (followup CL)

Test: Open a folder from taskbar while in an app, no animation jump and can change folder name
Bug: 180051157
Change-Id: I7c7847657d462c16677d66b9ffa8b6fe5f164084
2022-01-12 14:22:31 -08:00
Pat Manning 2c4a1d8f7a Create taskbar for kids mode.
Test: manual
Bug: 203749295
Change-Id: I52c05cf8685e6e921bb717e9714d1cb2e5f4a351
2022-01-07 11:25:04 +00:00
Winson Chung 3ed9d508bd Merge "Fix some small related to back button alpha" into sc-v2-dev am: 75867ae0ba am: 747dae3bb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16487030

Change-Id: I1392f9f16613ef9fb0add480260d9d5af3fbed16
2021-12-16 22:58:29 +00:00
Winson Chung 33f1d348ab Temporarily disable SUW specific insets logic am: 361f82b237 am: 3b22691fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16492581

Change-Id: I797fca3adbe2fdd95b0a59607f97b4d5273f1c37
2021-12-16 22:57:14 +00:00
Winson Chung 75867ae0ba Merge "Fix some small related to back button alpha" into sc-v2-dev 2021-12-16 21:59:27 +00:00
Winson Chung 361f82b237 Temporarily disable SUW specific insets logic
Bug: 204384193
Test: Check that SUW is inset

Change-Id: Id00f10f51b52ef8ec375f650fd44bb2c6eb31e09
2021-12-16 18:45:25 +00:00
Winson Chung e62a1996b7 Fix some small related to back button alpha
- Skip updating nav button dark intensity if we're setting it manually
  while SUW is running
- There should only be one alpha StatePropertyHolder for the same view
  otherwise when updating the properties it can clobber a previous state

Bug: 204384193
Test: Disable dark mode on SUW and verify nav buttons show
Change-Id: I450c3a5697954d9b464bdd622847beb2d01f3802
2021-12-16 17:47:53 +00:00
TreeHugger Robot 368eb46da5 Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2 am: 5ebda13e05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607

Change-Id: I8babe4bae067d8feab9d80c41b48994a33bf19df
2021-12-16 00:50:57 +00:00
Tony Wickham 70d237d8f3 Set navBarDarkIntensity based on dark theme in SUW
- Also remove old tinting based on textColorPrimary, as it's no longer necessary with dark intensity tinting.

Test: Run SetupWizardTestActivity in both dark and light theme, ensure back button visible
Fixes: 204384193
Change-Id: I2dc2e94bc0318ded62419b9ae0eed719db289d7f
2021-12-15 21:37:15 +00:00
Brian Isganitis 3523b241cc Merge "Include border spacing to align tasbar icons with hotseat." 2021-12-15 20:17:35 +00:00
Shuming Hao 33e97f1ca4 Merge changes from topic "kingyo-new-buttons-master"
* changes:
  Toggle notification panel when new buttons are clicked in taskbar
  Add new buttons to taskbar
2021-12-15 16:49:19 +00:00
Brian Isganitis 19ab3a5582 Include border spacing to align tasbar icons with hotseat.
The original calculation was including spacing in the the
hotseatCellSize, but that causes us to incorrectly compute the
hotseatIconCenter. If we take advantage of
DeviceProfile.calculateCellWidth, we get the width without the spacing.
Then we can add spacing for every icon to the left of the current one
when figuring out the center.

Test: Manual on tablet using device types tablet and multi display.
Fix: 210123477
Change-Id: Ie182718ad3a229ffa8bae031f3ac7f73f8539f49
2021-12-15 01:15:30 +00:00
TreeHugger Robot 3611e9d656 Merge "Ensure some taskbar states are initialized correctly" into sc-v2-dev am: 9b3b2b9c7e am: 4ab25b564e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16463952

Change-Id: I7bcf495a8774df2ac99dd6b9cf3c65f6d5f46461
2021-12-14 23:26:08 +00:00
Winson Chung 7f5e4ca06c Ensure some taskbar states are initialized correctly
- Update FLAG_IN_APP to account for setup state to ensure that the
  stashed state is correct. This needs to be done in the stash
  controller since SUW is the home activity on startup and the
  launcher state controller will not be initialized until after
  SUW finishes
- Initialize the launcher state and resumed flags in case Launcher
  restarts while another app is resumed

Bug: 204384193
Test: Run through SUW, ensure the background is not visible
Change-Id: I5ce061ad16e79226c8428339ccd0b5ac55c07205
2021-12-14 19:08:55 +00:00
Shawn Lin 39ada8ad58 Merge "Notify system to report the rounded corners that task bar draws" 2021-12-13 08:26:01 +00:00
shawnlin beae64cd95 Notify system to report the rounded corners that task bar draws
Task bar draws fake rouned corner above itself and it should notify
system to report that fake ones to apps.

Bug: 196387239
Test: make

Change-Id: I1d9732de71fbe653ed56e468e211b1bfb4dd2b37
2021-12-13 13:33:59 +08:00
TreeHugger Robot 434d537725 Merge "Report contentInsets only based on what they will be inside apps" into sc-v2-dev am: be0360c6d8 am: 86be069897
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16442237

Change-Id: I848ee10d672d713b326fafbe2fdf789ababe1dd2
2021-12-11 02:09:07 +00:00
TreeHugger Robot be0360c6d8 Merge "Report contentInsets only based on what they will be inside apps" into sc-v2-dev 2021-12-11 01:30:26 +00:00
Shuming Hao 22fbc854ea Toggle notification panel when new buttons are clicked in taskbar
This CL adds toggle notification panel function for new buttons in Kingyo taskbar.

Bug: 199333223
Test: m, verify that clicking the new buttons will expand/collapse quick settings and notification panel

Recall: http://recall/clips/993bc14b-98a7-4d7d-98c4-17ba271d4da9
Change-Id: I8c7383d2efa6f15de10a50173cfff86ab20ebb4c
2021-12-10 16:52:47 -08:00
Daichi Hirono db5960de5e Add new buttons to taskbar
Cherry picked from commit 53db50dd0b2bd6ed1842b25396c9c52b7abe1157
after resolving conflicts

The CL adds two new buttons for desktop usage.
No listeners are registered yet.

Recall: http://recall/clips/f52b70ed-c437-4374-a492-e4b7c802520a

Bug: 198355239
Test: m, verify that new buttons are added

Change-Id: I1d4a12da3041e113a978c37c9e36ec085d15e8b3
2021-12-10 16:24:24 -08:00
Tony Wickham c7b8957bbb Report contentInsets only based on what they will be inside apps
This avoids changing them when going from an app to launcher (most obvious when going to overview).

This also allows us to not change insets on apps when opening/closing IME, which reduces potential jumpiness.

Finally, also use this logic for 3P launchers by calling directly from TaskbarDragLayerController instead of TaskbarUIController (which was only overridden by LauncherTaskbarUIController). This fixes some bad issues like sending fullscreen insets when opening a folder from taskbar.

Test: Open Calculator, unstash taskbar, go to overview and ensure no jump as taskbar stashes.
Fixes: 200805319
Change-Id: I4f1cc187398d0051863ff44ea90b7ab9c6aaa8f9
2021-12-10 23:47:18 +00:00
Tony Wickham a38bcacf05 Merge "Fix taskbar being empty" into sc-v2-dev am: 0e0e1cef09 am: 8dedf2f6bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16439570

Change-Id: I103a05b42d340653aec6d1328402037fcf7db783
2021-12-10 22:44:40 +00:00
Tony Wickham 0e0e1cef09 Merge "Fix taskbar being empty" into sc-v2-dev 2021-12-10 22:11:17 +00:00
Tony Wickham 0606773905 Fix taskbar being empty
We set mIconAlignmentForResumedState in endGestureStateOverride(), but then we call applyState() which might aniamte mIAFRS to a different value. To avoid this, set it after applyState() instead.

Specific repro:
1. Open Calculator
2. Go to Overview
3. Dismiss Calculator
  3a. This calls endGestureStateOverride() because the running tile ends
  3b. Previously, we called mIAFRS.updateValue(1) but then applyState() animated it to 0 because we're still in Overview which is an unstashed state. Now the animation to 0 is before setting explicitly to 1.
4. Go home (this sets mIconAlignmentForLauncherState = 1)
5. Open Calculator again. Previously, mIAFRS was already 0 so animating to 0 was ignored. Now, mIAFRS starts at 1 (which is right since launcher is resumed).

Test: see above
Fixes: 210109500
Change-Id: I13f40908f8636291d63ef4b885ac9d08bbf4d393
2021-12-10 18:20:13 +00:00
TreeHugger Robot 86afc595d1 Merge "Only inset IME by 48dp instead of 60dp when taskbar is present" into sc-v2-dev am: 5692501806 am: 1b578f3b71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16433862

Change-Id: Idc3d1364d374fb33e5845f249be80ba3408c9b0c
2021-12-10 00:24:54 +00:00
Tony Wickham 1a2d581cf0 Only inset IME by 48dp instead of 60dp when taskbar is present
- Update providedInternalImeInsets whenever taskbar height changes, since the insets are subtracted from the taskbar window height. This ensures the IME always has the same bottom inset (48dp) regardless of taskbar's window size
- Also translate nav buttons down to center in the new size when IME is showing

Test: Open IME from home and in apps, both in gesture nav and 3 button mode. Ensure IME bottom inset is always 48dp and nav buttons center within that space
Fixes: 201115344
Change-Id: I5ed25b0ffc08145b2221cc5c960e669cc21b2aa7
2021-12-09 22:17:21 +00:00
Tracy Zhou 283d65085e Merge "Add content descriptions to task bar nav buttons" 2021-12-08 21:19:36 +00:00
Tony Wickham 35f3a45487 Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev am: b5a051ca0b am: b05ad5dcbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16407666

Change-Id: I6e97086358b20240c05ce06d3f2b600d9e139263
2021-12-08 18:13:17 +00:00
Tracy Zhou 74fd7af92d Add content descriptions to task bar nav buttons
Fixes: 209608812
Test: manual
Change-Id: Iba50abfb2a3d33104b6d88574df0bc7b5daf1d3a
2021-12-08 10:44:31 +00:00
Tony Wickham 24675d36b7 Improve quick switch from home to taskbar
- Add LauncherState#isTaskbarAlignedWithHotseat() which defaults to !isTaskbarStashed(), but is always false for quick switch from home
- Replaced FLAG_TRANSITION_STATE_START_STASHED and FLAG_TRANSITION_STATE_COMMITTED_STASHED with FLAG_STATE_TRANSITION_RUNNING and a reference to mLauncherState. STATE_START is equivalent to TRANSITION_RUNNING changing to true, and STATE_COMMITTED is equivalent to TRANSITION_RUNNING changing to false. Then can get details from the state such as whether taskbar is stashed and icon alignment from mLauncherState

Test: quick switch from home, both with taskbar stashed in apps and not
Fixes: 194728611
Bug: 204657916
Change-Id: I6cf84ec73a4036e14cc7268667c6f62100884c27
2021-12-07 13:13:48 -08:00
Tony Wickham 9566290e13 Cleanup some taskbar/hotseat handoff issues
- Clearly distinguish Home <-> App icon alignment (ForResumedState and ForGestureState) from Home <-> Home states (ForLauncherState) by renaming onIconAlignmentRatioChanged() to onIconAlignmentRatioChangedForAppAndHomeTransition (for the former)
- Make sure initial state is properly applied by treating all flags as changed
- onIconAlignmentRatioChangedForStateTransition only runs when launcher is resumed (fixes 208648294)
- Animate taskbar background alpha when going between home and app, separate from icon alignment (bug: 204657916)
- Only copy hotseat's alpha to taskbar when hotseat is originally visible (also bug: 204657916)

Test: Open an app on small screen, open large screen and ensure taskbar stays at the bottom instead of aligning with non-present hotseat (bug: 208648294)
Test: Swipe up and down on home scren, ensure taskbar background never appears and there's no jump between taskbar and hotseat
Change-Id: Iea59965118f2bdbd8ce49279f76fb01fbd61f60b
2021-12-06 17:16:19 -08:00
Tony Wickham f1951ce1f7 Fix taskbar stash misalignment when going from app to overview
Keep taskbar unaligned with hotseat if we're stashing anyway

Test: Swipe up from app with taskbar present to overview, check frame by frame to ensure icons morph directly into the handle instead of above it
Fixes: 208697792
Change-Id: If3238286b3383e75eb71fbd3b97d34bb3b44340b
2021-12-06 15:15:34 -08:00
Tony Wickham 94c97fbe59 Merge "Fix taskbar jumping when going home" into sc-v2-dev am: 3d206ca917 am: a19a64e97f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16374170

Change-Id: I8c7ee58d94bd0608aec7ddbff5e864782aedf4cc
2021-12-06 20:51:24 +00:00
TreeHugger Robot 78b066d230 Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 79b56b0659 am: f3bcecf5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16388220

Change-Id: I306259c20ca095772e1ddb036a9c9edf7bfc05b2
2021-12-03 19:15:15 +00:00
TreeHugger Robot 79b56b0659 Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev 2021-12-03 18:40:37 +00:00
Alex Chau 149acef8d7 Revert "Align OverviewActionsView for 3 button taskbar"
This reverts commit 6e906f3436.

Reason for revert: b/204891006
Bug: 189807374
Change-Id: I1b3f93d44b1691aa3d2cc90222ac93067a5cf6b4
2021-12-03 15:17:51 +00:00
Alex Chau ef14a30767 Merge "Align OverviewActionsView for 3 button taskbar" into sc-v2-dev am: 402252f4b6 am: f7360e8fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16185565

Change-Id: Ic0e11fc3d1d69a3e179791c5f6e59bb774c808ca
2021-12-03 12:57:03 +00:00
Alex Chau 402252f4b6 Merge "Align OverviewActionsView for 3 button taskbar" into sc-v2-dev 2021-12-03 12:30:49 +00:00
Tony Wickham e59a723af3 Fix taskbar jumping when going home
- Set resumed state immediately when finishing recents controller to launcher, otherwise there's a race where we start animating gesture state to 0 before animating resumed state to 1, which causes the jump in the bug

Test: Swipe from app to home 10 times, no jump
Fixes: 203725820
Change-Id: Ie8a1add29902a9961ba4d7861ba5424ab656f1c8
2021-12-02 12:19:32 -08:00
Tony Wickham 34a5ec9f1c Merge "Remove TaskbarLauncherStateController#setIconAlpha()" into sc-v2-dev am: 3d2a1a7368 am: a14fd14c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16374169

Change-Id: Id60002f4dc45aff2c6a721ae0c8a480d32a228e4
2021-12-02 19:02:43 +00:00
Tony Wickham 3d2a1a7368 Merge "Remove TaskbarLauncherStateController#setIconAlpha()" into sc-v2-dev 2021-12-02 17:39:08 +00:00
Tony Wickham 488bca7934 Remove TaskbarLauncherStateController#setIconAlpha()
Instead use setTaskbarViewVisible directly. Now that we stash when going to overview, we shouldn't have any launcher state where we need to fade out TaskbarView icons

Test: quick switch from home (follow up CL)
Bug: 194728611
Change-Id: I03e1fa4037b7e8a08494f6b7e065d144c4bc4e1b
2021-12-01 15:27:44 -08:00
Schneider Victor-tulias a3fe68dcb1 Implement AccessibilityDelegateImpl for the Taskbar
- Added accessibility actions to open pop up menu
- Added accessibility actions to open an app/shortcut to the top/left or bottom/right

Fixes: 204453506
Bug: 198438631
Test: attempted all actions individually, attempted combinations of actions (eg. open pop up menu -> move to left/right)
Change-Id: I76a4237035a0ebfe88b8b5f147b574bb2629f20c
2021-11-30 23:02:55 -08:00
Vinit Nayak 1144fa8c3d Merge "Add task unpinning support for 3 button taskbar" into sc-v2-dev am: f198f6e492 am: b3f069e06c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16339859

Change-Id: Ifb1a086f3a93f14ee7a8889c110b991c7b7701d9
2021-12-01 05:06:34 +00:00
Vinit Nayak f198f6e492 Merge "Add task unpinning support for 3 button taskbar" into sc-v2-dev 2021-12-01 04:34:06 +00:00
Vinit Nayak 570653346f Add task unpinning support for 3 button taskbar
Bug: 199544447
Test: Tested on small and large screen
Change-Id: Ib7785992ef11825cd07a929e2cb623d02ef246f1
2021-11-30 17:18:09 -08:00
TreeHugger Robot cc5f08b080 Merge "Fix potential memory leak by setting mControllers = null" into sc-v2-dev am: 96f3f2214c am: e9dcc967cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16367281

Change-Id: I0df1213a585102c484e1456cdf21c8a017d76189
2021-12-01 00:55:30 +00:00