Commit Graph

969 Commits

Author SHA1 Message Date
TreeHugger Robot
9a7281c51e Merge "Add logs to help debug TwoButtonNavBarTouchController" into sc-dev 2021-04-14 19:40:54 +00:00
Andy Wickham
3aea671e4f Merge "Updates quickswitch animation from Launcher." into sc-dev 2021-04-14 01:56:36 +00:00
Tony Wickham
7b2e3df2d7 Add logs to help debug TwoButtonNavBarTouchController
Test: TaplTestsQuickstep#testSwitchToOverview()

Bug: 13714484
Change-Id: I21740ac0fd6ddf2923fd081a00c84a463f13673b
2021-04-13 16:45:41 -07:00
Andy Wickham
18694a2545 Updates quickswitch animation from Launcher.
- Workspace/All Apps/Hotseat no longer translate down
 - Fading of these elements and scaling of Workspace are tied to the
   wallpaper depth animation
 - At any point in the drag, you can still swipe up to enter Overview

This makes it feel like the apps are tied to the wallpaper and avoids
moving them orthogonally to the finger.

It also makes the "No recent items" animation more elegant.

Demo: https://drive.google.com/file/d/1phuRCqb69vuMp3ijS6PR5lTEcBHScjie/view?usp=sharing&resourcekey=0-2HXtMLUhQ-YU53hYlYV-fQ
Demo with no recent apps: https://drive.google.com/file/d/1wjexqznxs9ZhiUtCDW4-ZK6c7hKDRaXn/view?usp=sharing&resourcekey=0-GugbpJK8_cnFbUBB2Ar30w

Fixes: 174228745
Test: Manual
Change-Id: I1574ff89a0f382b7e63bf03cf4300ec7c695cfec
2021-04-13 15:35:46 -07:00
Tony Wickham
a5788cc24f Merge "Move taskbar to be closer to QSB" into sc-dev 2021-04-13 21:12:49 +00:00
Tony Wickham
5df03e1585 Merge changes from topic "taskbar-hotseat" into sc-dev
* changes:
  Update taskbar to add extra hotseat items instead of recent apps
  Add support for having more hotseat icons in the DB than we show
2021-04-13 18:41:47 +00:00
Tony Wickham
81f8175ab1 Move taskbar to be closer to QSB
- Offset taskbar to be halfway between QSB and bottom of the screen.
- Add taskbar translationY state property to animate when going
  between launcher and an app.
- Draw the taskbar background in TaskbarContainerView instead of
  TaskbarView so it stays pinned to the bottom as TaskbarView
  translates up. If we want to have a background behind the
  taskbar on home, this should move back to TaskbarView so that
  the drawing can be shared by mTaskbarViewOnHome.

Test: visually on home screen, translates when entering and
exiting an app

Bug: 182981881
Bug: 171917176
Change-Id: I44f8b2c770074f7f015dcccbc2befd3453811193
2021-04-13 10:10:54 -07:00
Tony Wickham
be282e9bc8 Update taskbar to add extra hotseat items instead of recent apps
Removes recents-related code including the divider between it and
hotseat.

Test: manually on device

Fixes: 184366189
Bug: 184789479
Bug: 171917176
Change-Id: I7776c98659ded70f53a49befddcd23c8353c6440
2021-04-12 16:20:18 -07:00
Tony Wickham
b87f3cdc1c Add support for having more hotseat icons in the DB than we show
Split InvariantDeviceProfile#numHotseatIcons into two variables:
numDatabaseHotseatIcons and numShownHotseatIcons. These are generally
the same, but different DisplayOptions within the same GridOption
can choose to show different numbers of hotseat icons while sharing
the same database.

numDatabaseHotseatIcons is used for all reading/writing/migrating
purposes, while numShownHotseatIcons determines how many Hotseat
icons to show in the UI.

Test: Existing tests pass, added two new migration tests
Bug: 184789479
Bug: 171917176

Change-Id: I54583504f61a47a4444b6a637ebb7e3ab31528b7
2021-04-12 16:08:15 -07:00
Vinit Nayak
b1bbc0f78d Changes to use new startTasks API
When shell transitions is enabled, this will use the
newer multi-task-launch api and control the animation.

There is no actual animation yet, this just adds the
infrastructure.

Bug: 182002789
Test: enable developer option and enter split via recents
Change-Id: If5be104a86e7b5f743f85efed20b0d2bf1b8bfd1
2021-04-09 12:09:28 -07:00
shawnlin
ffb976c404 Attached the navigation bar to app for launching from Launcher
- Play the nav bar fade-out animation at the same time when the app
  launching animation starts and make the fade-in animation ends at the
  same time when app launching animation ends.
- To make the nav bar fade-in animation looks like it's attached to the
  app, apply crop rect and translation that the app targets apply to the
  nav target.

Bug: 181638132
Test: manual: click app icon on launcher to launch an activity and
observe the navigation bar animation.

Change-Id: If7e610eca5fccbb747a76c87335a600b018195a6
2021-04-09 04:04:42 +00:00
TreeHugger Robot
63c169561c Merge "Some cleanup in RecentsView" into sc-dev 2021-04-07 21:06:55 +00:00
Sunny Goyal
c82916fecb Some cleanup in RecentsView
> Merging overview and all-apps scrims into a single View
> Decoupling TaskMenuView from taskView

Bug: 184676497
Test: Manual

Change-Id: I49f7249eaa2a800054385ab8e73a441d6a1b5e16
2021-04-06 15:47:33 -07:00
TreeHugger Robot
c07ad47255 Merge "Fix HINT_STATE not tracking the entire height of the screen" into sc-dev 2021-04-06 20:58:26 +00:00
Tony Wickham
fc3bc6098f Merge "Explicitly set which taskbar view is visible at each caller" into sc-dev 2021-04-06 19:37:18 +00:00
Tony Wickham
c9846dc6e7 Merge "Cleanup taskbar touchableInsets" into sc-dev 2021-04-06 18:36:05 +00:00
Samuel Fufa
50c6a37ea9 Merge "[Search][Layout] Fix blank space when predictions are disabled" into sc-dev 2021-04-06 17:56:51 +00:00
Tony Wickham
fbdb50aa48 Fix HINT_STATE not tracking the entire height of the screen
Explicitly use DeviceProfile#heightPx instead of getShiftRange(),
which might be less depending on AllAppsTransitionController

Test: swipe up from bottom on home, ensure workspace scales down
as the gesture goes all the way to the top of the screen

Change-Id: I9c2988d361c22d437c7eb9bea8ed715d06054c59
2021-04-06 10:09:44 -07:00
Samuel Fufa
5461089baa [Search][Layout] Fix blank space when predictions are disabled
This regression is caused due to getExpectedHeight relying on view visibility state while AlphaUpdateListener.updateVisibility was reseting the views visibility.

Bug: 184211402
Test: local
Change-Id: Ib756f5eb8f6356a18a025626008b97fd7c77fec9
2021-04-06 04:05:20 -05:00
TreeHugger Robot
e77fc9cc25 Merge "Add split placeholder view above OverviewScrim" into sc-dev 2021-04-06 02:34:19 +00:00
Tony Wickham
e13a4a4475 Cleanup taskbar touchableInsets
- Remove obsolete visibleInsets hack and isDraggingItem() check
- Have TaskbarController determine whether taskbar is touchable,
  rather than TaskbarContainerView.
- Disallow touches during transition to home (can potentially
  improve this later)

Test: Swupe home, tap taskbar folder during transition, ensure
don't end up in broken state with the uninteractable folder open
Bug: 182512211

Change-Id: Id625ce8b9b876a8a1b450b7d6fb771540e23bc08
2021-04-05 17:33:44 -07:00
Tony Wickham
6a74e65953 Explicitly set which taskbar view is visible at each caller
This makes it more clear which taskbar view is expected for particular
code flows. Also makes it easier to set it to null in cleanup().

Test: call cleanup() while taskbarOnHome is invisible, ensure hotseat
icons go back to being visible
Bug: 182512211
Fixes: 183633496

Change-Id: I680a15582c8034a049b20e035b4d54f5ea5aee04
2021-04-05 16:42:17 -07:00
Vinit Nayak
e3f7d0d1b4 Add split placeholder view above OverviewScrim
Only show single split option for landscape and
seascape overview menu options.

Bug: 181705607
Change-Id: I577fbaed41b5debd007c953851ec2056988057d9
2021-04-05 12:41:06 -07:00
Samuel Fufa
ee9aff9b5b [Search][Motion] Normal<->AllApps transition revamp
Preview video attached to BR

Key changes:

- SearchUiManager#getScrollRangeDelta is removed. AllApps initial vertical offset is now controlled by deviceProfile.allAppsOpenVerticalTranslate.
- ShelfScrimView is renamed to AllAppsScrimView. Scrim no longer does vertical translate with AllApps open.  Shelf/overview related code removed.
- Scrim and AllApps content transition are animated with different interpolators. Scrim color is a blend of accentColor and allAppsScrim with proportion determined by progress*TINT_DECAY_MULTIPLIER

Bug: 183001675
Test: Manual
Change-Id: Id6bde7ee65c55c83c2973fe41f458b9364d39ecd
2021-04-05 13:32:51 -05:00
Alex Chau
5bd9ba2a80 Merge "Focus running task in overview grid" into sc-dev 2021-04-02 03:57:58 +00:00
Sunny Goyal
7a5b6f868a Merge "Removing some unused classes" into sc-dev 2021-04-01 20:11:14 +00:00
Alex Chau
dfde4d96ea Focus running task in overview grid
- calculateTaskSize now returns the Rect for focused task
- Introduced calculateGridTaskSize for non-focused task, and translate non-focused tasks to fit the grid
- As Task Rect is now vertically centered, removed ClearAllButton's grid vertical translation
- When ClearAllButton is not shown (e.g. quickswitch), make sure ClearAllButton's scroll won't be used when page snapping. This happens when page scrolls are translated so they're negative.
- Added back ActionsView when task is focused below the TaskView, which become invisible as you scroll
- In Modal state, move the ActionsView down so it won't cover the TaskView

Bug: 175939487
Test: manual
Change-Id: Idfa94a51f856418adc0503cf04211dcb4b1814fe
2021-04-01 14:52:25 +01:00
Zak Cohen
00611188e5 Merge "Overview - update UI to use solid color scrim." into sc-dev 2021-03-31 20:34:00 +00:00
Sunny Goyal
157a9ee7dd Removing some unused classes
Bug: 184183801
Test: Manual
Change-Id: I946b4b4d486d52e467bb3df7dcac65e534803b7d
2021-03-31 12:59:57 -07:00
Zak Cohen
a547b781ee Overview - update UI to use solid color scrim.
Also required updates to colors and status bar icons to match with new
color.

Bug: 179922117
Test: local build and flash on two devices

Change-Id: Ibec54107f52c01f125e6d100abe32434f2067b71
2021-03-31 11:25:41 -07:00
Tony Wickham
7e7116278b Merge changes I2af1792e,Ice314d46,Ib17d4a5e into sc-dev
* changes:
  Invert StateAnimationConfig.PLAY_ANIMATION as SKIP_ALL_ANIMATIONS
  Remove Overview atomic animation support
  In 2 button mode, animate to HINT_STATE instead of OVERVIEW directly
2021-03-30 22:27:07 +00:00
Sunny Goyal
07fb2fea34 Merge "Simplifying all-apps seach pipeline" into sc-dev 2021-03-30 19:50:23 +00:00
Tony Wickham
99af1b2954 Merge "Fix Home->Overview not being logged in 0 button mode" into sc-dev 2021-03-30 19:22:15 +00:00
Sunny Goyal
04e9f39f19 Simplifying all-apps seach pipeline
Bug: 183607616
Test: Verified on device
Change-Id: Id7ded3c244b747a577cdfcf298db6dddf19fa4eb
2021-03-30 10:07:32 -07:00
Vadim Tryshev
419c1092e3 Merge "Fixing a leak in WallpaperColorInfo" into sc-dev 2021-03-30 01:13:40 +00:00
vadimt
1b54846254 Fixing a leak in WallpaperColorInfo
Nulling temp listeners after use

Test: presubmit
Bug: 181356264
Change-Id: I6cace47f1424e2fe59a283bb0e16de523875b6cf
2021-03-29 14:47:06 -07:00
Tony Wickham
52bbcc3976 Invert StateAnimationConfig.PLAY_ANIMATION as SKIP_ALL_ANIMATIONS
This allows the default flag to be 0 instead of PLAY_ANIMATION, and is
aligned with the existing SKIP_OVERVIEW and SKIP_DEPTH_CONTROLLER
flags.

Test: Navigate to various states, works as before
Bug: 175137718
Change-Id: I2af1792e7fbd5bca82afb225290fd6b545368dcf
2021-03-29 11:59:14 -07:00
Tony Wickham
6cd95cd2d8 Remove Overview atomic animation support
- Remove PLAY_ATOMIC_OVERVIEW_SCALE and PLAY_ATOMIC_OVERVIEW_PEEK
- Remove complicated parallel atomic animation support from
  AbstractStateChangeTouchController and subclasses
- Remove some code related to going between Overview <-> AllApps

Test: Swipe between states in all 3 navigation modes
Bug: 175137718
Change-Id: Ice314d46946c3a983cdc6ccf1a67effb5da9156e
2021-03-29 11:59:06 -07:00
Tony Wickham
c5d168da82 In 2 button mode, animate to HINT_STATE instead of OVERVIEW directly
When reaching HINT_STATE_TWO_BUTTON, we goToState(OVERVIEW) with a
haptic, to keep the same feeling as before.

Test: Swipe up from home on nav bar, ensure it goes to overview
Bug: 175137718
Change-Id: Ib17d4a5e9e33b8bf9b074f926faa6d0e2fb487fa
2021-03-29 11:58:50 -07:00
Sunny Goyal
7cb9327c28 Merge "Moving some common functionality to IconLoaderLib" into sc-dev 2021-03-26 16:42:04 +00:00
Tony Wickham
b9bbe994eb Fix Home->Overview not being logged in 0 button mode
At some point we made a change to clearState() from onDragEnd(),
which means the detector is in IDLE state instead of SETTLING. As
long as we aren't still in DRAGGING state, we should log.

Test: wwlogcat
Change-Id: I0f1098bd09cd1296b06f8cb3ebe400c2a25156ca
2021-03-25 15:11:57 -07:00
TreeHugger Robot
0a74a35a41 Merge "Slightly improve Taskbar animations to launcher" into sc-dev 2021-03-25 18:36:37 +00:00
Sunny Goyal
572aca4ce2 Moving some common functionality to IconLoaderLib
Bug: 183641907
Test: Manual
Change-Id: Icfc7ebb140e4e1678b0715beee2e0e513e707b9e
2021-03-25 10:06:53 -07:00
Alex Chau
5d225245b6 Merge "Fix taskbar crash after cleanup" into sc-dev 2021-03-25 11:28:55 +00:00
Tony Wickham
02e9f1e12f Slightly improve Taskbar animations to launcher
- Move Taskbar scale to LauncherState
- Rename TaskbarVisibilityController to TaskbarAnimationController and
  add mTaskbarScaleForLauncherState to TaskbarAnimationController
- Set OverviewState#getTaskbarScale() = 1f so Taskbar doesn't scale
  up when going from an app to Overview
- Increase home animation duration so Taskbar animation aligns better

Test: Taskbar scales up when going home, doesn't scale up when going
to overview
Bug: 182512211

Change-Id: I6f448e76de98d7ff337ae93234d4bb7ce6254d50
2021-03-24 10:31:12 -07:00
Tony Wickham
11bc3118c9 Merge "Remove dead taskbar code" into sc-dev 2021-03-24 17:20:18 +00:00
TreeHugger Robot
bbfef42e48 Merge "Prevent setting task thumbnail during swipe to overview" into sc-dev 2021-03-24 01:46:34 +00:00
TreeHugger Robot
b9d201a5d6 Merge "Remove some unused hotseat/qsb scaling code" into sc-dev 2021-03-24 00:16:01 +00:00
Tony Wickham
aea0cbf9d3 Fix taskbar crash after cleanup
- Set LayoutTransition after adding initial views
- End running transitions in cleanup
- Only run update listener if LayoutTransition is active

Test: No crash after taskbar cleanup()
Bug: 182512211
Change-Id: I1049857935d09235388c1ef1fe4d89ef53b79aa5
2021-03-23 15:35:46 -07:00
Vinit Nayak
706ff85fe5 Prevent setting task thumbnail during swipe to overview
Previously we were setting the incorrect thumbnail when
swiping to overview, then taking a task screenshot right
when the animation ends and replacing the first thumbnail.
This sometimes caused a flicker of the old thumbnail, now
we avoid setting the thumbnail at all for the taskview that
is being swiped up.

Another edge case handled here is when switching nav modes
and then immediately entering overview, Recents receives an
onConfigChange for changing task icon size. That would cause
all taskviews to null out both their existing icon and
thumbnail, now only the icon gets nulled out.
Existing issue where switching to 3 button nav and then
entering overview shows blank icon, doesn't register for
receiving the updated task snapshot fast enough.

Fixes: 179307265
Test: Ask assistant for weather, swipe to overview
Ask assistant for time, swipe to overview, no flicker

Switch nav modes to gesture, swipe to overview.
There's a flicker for config change, but thumbnail is correct

Change-Id: I300b29f999f6d6876f82bc0189b44f4c10ae33fe
2021-03-23 12:00:06 -07:00