Commit Graph

1191 Commits

Author SHA1 Message Date
Mady Mellor
50bcd6ca2b Update the sizes for bubble expanded view
* 16dp on either side / from edge of screen for the bubble view
* 16dp between bubble row & expanded bubble rect (works out to 5dp
  in code: 16dp - 2dp (badge overhang) - 9dp (pointer height)
* max 8dp between the bubbles in the top row
* manage button has some adjustments - 8dp above & below and is total
  32dp from edge of screen; ensure manage button is centered between
  bottom inset & bottom of expanded view

* fixes a bug where there was extra padding being at top of expanded
  view in landscape mode
* removed an unused layout file & unused dimens

Test: visual - expand a bubble, look at spacing of everything on
               screen; do the same in landscape from left and right
               edges of the screen.
Bug: 187715439
Bug: 183658029
Change-Id: I29e699aaf9b6e7bf75447dac6aa6b00a7b272b8b
2021-05-21 14:00:53 -07:00
Mady Mellor
cdbe799cf2 Bubbles don't hang off screen
Bug: 183657577
Test: visual - make a bubble, see it doesn't hang off the edge
Change-Id: Ib640add665bf5050f94573987072a93855f29fab
2021-05-21 14:00:53 -07:00
Mady Mellor
1d75e183c9 Only show the first 2 bubbles in the stack when collapsed
Test: manual - add more than 2 bubbles, note you only see the top 2
             - expand & collapse the stack, note you only see top 2
               after collapse
             - fling the stack around, note once it hits the edge
               you only see top 2 bubbles but while dragging around
               you see all of them following
Bug: 180142824
Change-Id: I168a14e1fba1506f53ed0734b55b44971d128de4
2021-05-21 14:00:46 -07:00
Mady Mellor
d3bd6bfbf3 Make sure Manage button updates for display size changes
Bug: 160284881
Test: visual - have a bubble, expand / collapse it, update display
      size, expand the bubble & check that the sizes have increased
      & look correct
Change-Id: If6db9ae1b720f7f37fab31cbb6a67a48bee2e0f8
2021-05-20 17:55:57 -07:00
Mady Mellor
83f4345f9e Merge "Fix transitions in the background when launching something in TaskView" into sc-dev 2021-05-20 22:55:00 +00:00
Mady Mellor
0abd3000eb Merge changes I65f46028,Ie3f67ccd into sc-dev
* changes:
  Make the pointer for bubbles expanded view rounded
  Update the manage button to the new style
2021-05-20 19:54:53 +00:00
TreeHugger Robot
46e2f5974c Merge "Only resize the menu on hide if it was resized on show" into sc-dev 2021-05-20 19:31:26 +00:00
Mady Mellor
9ac4fb0e34 Merge "Bubbles styling: Update colors to use new theme things" into sc-dev 2021-05-20 16:32:14 +00:00
TreeHugger Robot
a3867cfaa7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-20 14:07:43 +00:00
Bill Yi
8b426d12b3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I73c3b5ee1590289835a2c5bbd43a953091f0a881
2021-05-20 11:09:23 +00:00
Wei Sheng Shih
c56f67e7d9 Merge "Delete the delay for keeping tasksnapshot on screen." into sc-dev 2021-05-20 01:26:29 +00:00
Hongwei Wang
c81fdf89d7 Merge "Add test for move PiP upon Display change" into sc-dev 2021-05-20 01:07:00 +00:00
Jorge Gil
a2a52c1fed Merge "Skip finishResize for non-exit animation if PIP is about to exit" into sc-dev 2021-05-19 22:19:41 +00:00
Mady Mellor
9abaa3be2c Fix transitions in the background when launching something in TaskView
* Allow bounds to be set on launch params for multiwindow activities
* Users of TaskView should pass bounds when starting an activity
  otherwise they will see this animation
* Modify bubbles & controls to pass launch bounds

Test: atest TaskLaunchParamsModifierTests LaunchParamsControllerTests
MultiWindowTests
Bug: 182299605
Bug: 182516248
Change-Id: Ie5337593d776309f8aac0c6991cf846463e519a7
2021-05-19 15:13:17 -07:00
jorgegil@google.com
c109aa6e56 Only resize the menu on hide if it was resized on show
Fixes an issue where a max-size PIP is resized to the
user-resized size after either:
A) single-tap to show the menu and then it times out to hide
it, or
B) single-tap to show the menu and then single tap outside of
the PIP window
This was caused by the resize=true flag being passed into
PipMenuView.hideMenu() from the hide menu timeout runnable or
from PipResizeGestureHandler.onDragCornerResize()

Bug: 186616706
Test: enter PIP, then:
1) double-tap to MAX, then tap once to show menu and wait for
it to time out - verify it stays in MAX size
2) double-tap to MAX, then tap once to show menu and once
outside of PIP - verify it stays in MAX size
3) pinch-resize to minimum size, tap once, wait for it to
expand a bit, wait for the menu timeout - verify it resizes
down to the minimum size.

Change-Id: I394d49b77f2c6aa42fc4681ef5238c478a474b85
2021-05-19 14:27:59 -07:00
Hongwei Wang
ea24f4c7ab Add test for move PiP upon Display change
Bug: 184941272
Test: atest PipControllerTest
Change-Id: I61372311c0e81c7d6b5dedd49d48b3738b796585
2021-05-19 12:50:02 -07:00
Mady Mellor
3952307a8c Merge "Bubbles styling: flyout changes" into sc-dev 2021-05-19 18:28:10 +00:00
Mady Mellor
9f97f89342 Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev 2021-05-19 18:18:34 +00:00
wilsonshih
532c5a42fb Delete the delay for keeping tasksnapshot on screen.
Tasksnapshot window can block touch event so user may not able
to touch the screen after showing task snapshot. Remove the delay
so app window can response touch event as soon as possible.

Bug: 187227846
Test: atest TaskSnapshotWindowTest
Change-Id: I5fb0fa3a1e6a5e6210d3baf400a84c5892bd2e34
2021-05-19 14:54:01 +08:00
Chris Li
b9034aba83 Merge "Determine whether to support activities in multi window (9/n)" into sc-dev 2021-05-19 05:47:41 +00:00
TreeHugger Robot
4d225a0e3c Merge "Update bubble user education screens to use proper colors" into sc-dev 2021-05-19 04:36:06 +00:00
Hongwei Wang
21f0b70da5 Merge "Do not move PiP upon Display change during exit" into sc-dev 2021-05-19 03:27:00 +00:00
TreeHugger Robot
eea27600d3 Merge "Take PIP snapshot in the shell and use bounds state size for crossfading" into sc-dev 2021-05-19 01:06:32 +00:00
Jerry Chang
6c2ffa9595 Merge "Fix not releasing touching state of the handle on divider bar" into sc-dev 2021-05-19 00:08:08 +00:00
Jorge Gil
845205c00d Merge "Snap the PIP window to the left or right edge after pinch resize" into sc-dev 2021-05-18 23:44:26 +00:00
Hongwei Wang
9238955119 Do not move PiP upon Display change during exit
GMM with Morris triggers Display change when exit PiP to fullscreen mode
and this creates race condition results in bounds (caused by stable
insets) offset on the final app presentation.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bq5i3we32cd8pdxAmcIMzW
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/d4FYwZ8aBnGs4Jn5uQQZVj
Bug: 184941272
Bug: 186184696
Test: manual in both gesture and button nav, see videos
Change-Id: I8e694d441cdcc7f263eb86a11d1b64a844f14c02
2021-05-18 15:51:39 -07:00
Mady Mellor
bba5ed7765 Update bubble user education screens to use proper colors
Bug: 173562716
Test: visual - force user education to show & observe it on the
      stack and manage menu
Change-Id: I6988e2c433f17b69de4aed44c1af3bacb475caf9
2021-05-18 15:51:32 -07:00
Ben Lin
17af0292a8 Merge "PiP: Add stash a11y support." into sc-dev 2021-05-18 21:08:32 +00:00
Chris Li
30248a1952 Determine whether to support activities in multi window (9/n)
When a Task is detached but is still stored as a recent Task, it should
be allowed to launched into split screen.

Bug: 176061101
Test: atest WMShellFlickerTests:EnterSplitScreenFromDetachedRecentTask
Test: atest WmTests:RecentTasksTest
Change-Id: Ic72901ca76f4acb6e68926062675ecc290b399be
2021-05-18 21:07:52 +00:00
jorgegil@google.com
5e946e95ae Skip finishResize for non-exit animation if PIP is about to exit
This handles the case were exitPip is called while there is a
animateResize PIP ongoing, such the menu expand/unexpand animation.
When that was the case, the first finishResize was applied at the same
time as the exit WCT, resulting in bad frames at the end of the exit
animation.
This CL makes it so that the first finishResize is skipped if we
know exitPip is handling the exit and will eventually call its
own finishResize operation.

Bug: 185306679
Test: enter PIP with YT, tap on menu to show it and immediately
tap on the app launcher icon to expand PIP - verify the exit
transtion runs smoothly

Change-Id: Iac49f69cc698f1ac5d88fd408c204e2281b70ac7
2021-05-18 13:29:18 -07:00
jorgegil@google.com
ef11620ccf Snap the PIP window to the left or right edge after pinch resize
Restrict the PIP resize to the left and right edges only,
instead of allowing the top or bottom edges as snap targets.

Bug: 186610221
Test: pinch to resize and let go at the center top or bottom
edge - verify it snaps to either side of the screen

Change-Id: Ifbc96fddc000ccb2ae344755a9276f24e67d4571
2021-05-18 11:23:04 -07:00
Ben Lin
debdf699e1 Merge "PiP: Move resetting mAllowTouches into scope of MenuView" into sc-dev 2021-05-18 17:41:23 +00:00
Mady Mellor
70e798e474 Make the pointer for bubbles expanded view rounded
Test: manual - open a bubble and note that the pointer is rounded
Bug: 183658029
Change-Id: I65f460289dc7128aa95e9ad7575a3bb39be629bf
2021-05-18 10:01:50 -07:00
Mady Mellor
7376a67ad0 Update the manage button to the new style
Also fixes a bug where the overflow view would still leave space
for the manage button even though we don't show something there.

Bug: 183658858
Test: manual - open a bubble and observe the manage button, should
               be on a dark background with light text regardless
               of light / dark theme.
Change-Id: Ie3f67ccd26ad4d75a3ed21a3dee43e2f74d07022
2021-05-18 10:01:43 -07:00
Mady Mellor
367d8ea45f Bubbles styling: Update colors to use new theme things
- Bubble expanded view arrow is now based on backgroundColorFloating
- Bubble overflow expanded view also uses backgroundColorFloating
- Bubble overflow button uses colorAccentPrimary for the circle
  & a dark accent color for the '+' shape
- Manage menu uses colorSurface, had to rename the file bc sysui
  has a file with same name but different colour which was clobbering
  ours

Test: make a bubble & observe UI in light and dark mode, check
      the arrow in the expanded view, the overflow button & expanded
      state, and tapping on the manage menu
Bug: 183658029
Bug: 183658858
Change-Id: Iab5e5536036a8eaecd1c547e5dcfc9d4e77fe5d4
2021-05-18 10:00:38 -07:00
Mady Mellor
56b1e99d02 Bubbles styling: flyout changes
- no longer show a pointer with the flyout
- use the same color as the notifications
- increase the padding slightly

Test: manual - create some bubbles and observe the
        flyout
Bug: 183657745
Change-Id: I21ac5c1ce187e553e94ec41c81f9b43e8e914658
2021-05-18 10:00:19 -07:00
Mady Mellor
76fa21b5dc Fix some sizes that weren't changing for font scale / display size`
Test: manual - have some bubbles
             - change font & display size
             - add a new bubble
	     => ensure UI elements have changed size & match the size
	        of the new bubble (manage text, overflow empty statei
		text, pointer size, manage menu contents)
Bug: 160284881
Change-Id: I2de45ba0975e2e0295abf8b350b9c2fb11ef73a8
2021-05-18 09:59:29 -07:00
Evan Rosky
bd26d8f134 Merge "Add leashes in launcher adapters in lieu of cross-process sync" into sc-dev 2021-05-18 15:32:33 +00:00
Vadim Caen
eacda76449 Merge "Draw splashscreen edge to edge" into sc-dev 2021-05-18 11:22:54 +00:00
Winson Chung
05555262dd Merge "Revert "Skip finishResize for non-exit animation if PIP is about to exit"" into sc-dev 2021-05-18 04:57:38 +00:00
Bill Lin
9e2013a5d2 Merge "Integrate OneHandedTutorialHandler with OneHandedState" into sc-dev 2021-05-18 00:25:32 +00:00
Bill Lin
a92eeb798d Merge "Update divider touch-region with DividerHandle position properly" into sc-dev 2021-05-18 00:23:46 +00:00
Ben Lin
ea4f7e5b2a PiP: Move resetting mAllowTouches into scope of MenuView
Previously we used to reset mAllowTouches backed on callbacks from
TaskOrg's animation finish, but there is a race where it's possible the
callback from the animation finish happens before the menu state
updates, which causes the callback to no-op. Instead, since we only
disable allow touches during #showMenu, just keep it in the scope and
re-enable it when the same animation has ended (or cancelled).

Bug: 188464003
Test: Move PIP to smaller, tap (to cause it to grow larger), and tap on
an icon, and expect icon to work and launch Settings, etc.

Change-Id: Iea3fff3c279dcdfa7eb922cb59302ea53ac618fd
2021-05-17 16:10:20 -07:00
Jorge Gil
66548b1f7a Revert "Skip finishResize for non-exit animation if PIP is about to exit"
This reverts commit fa915cb52c.

Reason for revert: b/188455492

Bug: 188455492
Change-Id: Ie18a8cd234a8ecf5a7fc0d6c5cdf05f158f3a7e6
2021-05-17 23:08:25 +00:00
Ben Lin
4e04b705e3 Merge "PiP: Damp resizing after going over max size." into sc-dev 2021-05-17 18:00:08 +00:00
Ben Lin
54441572a9 Merge "PiP: Use vertical/horizontal padding base on PiP orientation." into sc-dev 2021-05-17 17:59:39 +00:00
Ben Lin
750ddcc618 Merge "PiP: Constrain pinch-resize input to start inside PiP bounds." into sc-dev 2021-05-17 17:58:23 +00:00
Jorge Gil
29a2e2480a Merge "Skip finishResize for non-exit animation if PIP is about to exit" into sc-dev 2021-05-17 17:24:11 +00:00
jorgegil@google.com
75e94750f5 Take PIP snapshot in the shell and use bounds state size for crossfading
Since the width/height of the SC should not be used anymore,
we'll use the pre-resize bounds to scale the surface before
animating the crossfade.

Bug: 186669773
Test: Enter PIP in seamless resize demo, resize with seamless
turned off uses a crossfade animation with the correct size

Change-Id: I1405be9208ac9e7cc34283e3d97dc431f0cb643c
2021-05-17 10:15:09 -07:00
Jerry Chang
63e732e89e Merge changes from topic "staged_split_ime" into sc-dev
* changes:
  Adjust split layout with IME animation in split (5/N)
  Adjust split layout with IME animation in split (4/N)
  Adjust split layout with IME animation in split (3/N)
  Adjust split layout with IME animation in split (2/N)
  Adjust split layout with IME animation in split (1/N)
2021-05-17 17:00:59 +00:00