Commit Graph

1244 Commits

Author SHA1 Message Date
TreeHugger Robot
d1fd3c16f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-05-25 18:15:09 +00:00
Bill Yi
1687fdaafa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifcaabc9d4d0aed9b23291d18c339f552fff11536
2021-05-25 16:19:00 +00:00
Vadim Caen
be2ac213fe Merge changes from topic "splashscreen-surface" into sc-dev am: fc1efcb428
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186656

Change-Id: Ie0e17006e404de22c20cce84cf7a43fdf0eb85e7
2021-05-25 15:24:45 +00:00
Vadim Caen
fc1efcb428 Merge changes from topic "splashscreen-surface" into sc-dev
* changes:
  Do not reparent the SC when package is already realeased
  Display Splashscreen AVD in a SurfaceView
2021-05-25 15:24:08 +00:00
Wei Sheng Shih
0f488562e4 Merge "Prevent the splashscreenview be replaced after transfer starting window" into sc-dev am: 4bc9052468
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622503

Change-Id: I8bea1d9e606a5a56d58e26518f57fcbe067a947b
2021-05-25 11:54:47 +00:00
Wei Sheng Shih
4bc9052468 Merge "Prevent the splashscreenview be replaced after transfer starting window" into sc-dev 2021-05-25 11:24:56 +00:00
Jerry Chang
c04541c053 Do not dismiss split if stages are not visible due to screen is sleeping
Pass isSleeping information in TaskInfo to determine whether the task is
sleeping due to display state. Prevent to dismiss staged split when
both stages is not visible due to the display is sleeping, like keyguard
showing or screen off.

Bug: 188010345
Test: atest WMShellUnitTests
Test: verified staged split won't be dismissed while keyguard showing
and screen off.

Change-Id: I0ee8943b035a9e9f937c22d2a228913e597ac79f
2021-05-25 07:09:57 +00:00
Jerry Chang
4048fa7a26 Merge "Dismiss staged split after folded the device" into sc-v2-dev 2021-05-25 05:23:33 +00:00
Jerry Chang
4b5a0e2a1c Merge "Dismiss staged split when keyguard is occluded" into sc-v2-dev 2021-05-25 05:22:21 +00:00
Jerry Chang
85c712a6ba Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev 2021-05-25 05:19:47 +00:00
Jerry Chang
3c96d58450 Merge "Fix broken layout after switched stage positions" into sc-v2-dev 2021-05-25 05:11:23 +00:00
Ben Lin
445ff979f5 Merge changes I8f0af447,I669919d4 into sc-v2-dev
* changes:
  PiP: Show the wallpaper as part of the transition.
  PiP: Implement expand transition.
2021-05-24 22:19:27 +00:00
Evan Rosky
ffac171d4d Merge "Enable remote transition animations to append to the finish transaction" into sc-v2-dev 2021-05-24 19:28:20 +00:00
Jerry Chang
eb7764919f Dismiss staged split after folded the device
Bug: 188010345
Bug: 184795211
Test: atest WMShellUnitTests
Test: observed staged split will be dismissed after device folded

Change-Id: I00ef5ac179fc506f883f8ca519a901273427e595
2021-05-24 16:36:24 +00:00
Evan Rosky
46ba708bb8 Enable remote transition animations to append to the finish transaction
Adds a parameter to the IRemoteTransitionFinishedCallback. This
transaction will be merged into the finish transaction before it is
applied. This is needed by transitions like live-tile recents where
the end-state of the transition is altered during the "animation".

Bug: 172695387
Test: open app, swipe up to overview, resume that same app, screen
      shouldn't turn black anymore.
Change-Id: I6fa1e22288ce087ad17fdfc950a8419e6ba61a47
2021-05-24 09:14:46 -07:00
Jerry Chang
16ec9faad5 Prevent rendering divider bar into wrong orientation
The display area's bounds and orientation changed might be callbacked
seperatedly when the device's folded state changed, causing the
SplitLayout rendered divider bar into wrong orientation. This makes sure
to update divider bar and split layout correspondingly when the
orientation, rotation and root bounds chagned.

Fix: 189101216
Test: atest WMShellUnitTests
Change-Id: Ie5d7132e4122b82d9b5b404a40f97cca3095ce2c
2021-05-24 16:12:25 +00:00
Jerry Chang
3c0e223f83 Dismiss staged split when keyguard is occluded
Dismiss staged split if there's show-when-locked activity showing on top
of keyguard. Add a callback to monitor keyguard occluded state and
delegate it to StageController in WMShell, so that it could dismiss
staged split properly when keyguard is occluded.

Bug: 188010345
Fix: 187360909
Test: WMShellUnitTests
Test: launch show-when-locked activity while keyguard showing and staged
split activated, observed the staged split will be dismissed.

Change-Id: If93b36f3fcef969d449c505086459997c27b8c75
2021-05-24 05:33:00 +00:00
Jerry Chang
d18a7bb158 Fix broken layout after switched stage positions
Invoke onBoundsChanged to make sure it always updates bounds of both
stages in window hierachy after switched stage positions.

Fix: 189046868
Test: atest WMShellUnitTests
Test: trigger staged split, snap divider to non-middle position,
observed double tapping divider bar will update split layout properly.

Change-Id: I5556cc94a19758f737076f241426deee2ca24a22
2021-05-24 03:40:53 +00:00
TreeHugger Robot
3d7bed9d65 Merge "Split flicker tests into groups" into sc-dev am: 608a439238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601816

Change-Id: I579c9f2588bd492f3abc87fdfe7c1038e7433874
2021-05-22 10:02:13 +00:00
TreeHugger Robot
608a439238 Merge "Split flicker tests into groups" into sc-dev 2021-05-22 09:44:36 +00:00
TreeHugger Robot
cb993ce24a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-22 06:22:44 +00:00
TreeHugger Robot
3282a3e195 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-05-22 05:55:48 +00:00
Mady Mellor
1cb37ca0af Merge "Fix overflow not receiving onBackPress events" into sc-dev am: 3c01aa0fea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14684140

Change-Id: Ieee08a475afe8f39e06b2cc447eb990c4c0f411a
2021-05-22 01:25:20 +00:00
Mady Mellor
3c01aa0fea Merge "Fix overflow not receiving onBackPress events" into sc-dev 2021-05-22 01:05:06 +00:00
Mady Mellor
94100e60fe Merge "Update the sizes for bubble expanded view" into sc-dev am: 268e44c5f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626187

Change-Id: I362a0530ae15576da679529a7735f9b3c75a56d2
2021-05-22 00:24:27 +00:00
Mady Mellor
268e44c5f5 Merge "Update the sizes for bubble expanded view" into sc-dev 2021-05-22 00:19:00 +00:00
Mady Mellor
c58ba3c816 Merge changes Ib640add6,I168a14e1 into sc-dev am: db99d2664e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626186

Change-Id: I532b29196a9081b9ad24e1e6f4010d98ae3b026f
2021-05-22 00:17:34 +00:00
Mady Mellor
db99d2664e Merge changes Ib640add6,I168a14e1 into sc-dev
* changes:
  Bubbles don't hang off screen
  Only show the first 2 bubbles in the stack when collapsed
2021-05-22 00:05:19 +00:00
Bill Yi
219aa1c147 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2161158783ffab9d61df68536b2f705d3039d08
2021-05-21 23:23:10 +00:00
Bill Yi
da919949fe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idb36b573577f1277b6f81fb9329a3f0d273a9d21
2021-05-21 23:21:39 +00:00
Mady Mellor
1171155422 Fix overflow not receiving onBackPress events
Normally the bubble window isn't focusable so when the overflow
is opened/closed the window flags get adjusted so that the overflow
can get focus & key events.

Test: manual - expand the overflow and hit back button / gesture back
Bug: 185131171
Change-Id: I00f0063b3c7dd54327152d886bd74a8d1eec4231
2021-05-21 14:48:15 -07:00
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
Ben Lin
d9e72a7b34 PiP: Show the wallpaper as part of the transition.
This is usually taken care by RemoteAnimation, but since PiP takes
control of the entire thing that is no longer the case. So let's just
handle it.

Bug: 165793917
Test: Enter PiP with ENABLE_SHELL_TRANSITIONS flag on
Change-Id: I8f0af4472c20016f856f33f903bd9a431cd5ef3a
2021-05-21 11:42:08 -07:00
Ben Lin
51d1d7c1d9 PiP: Implement expand transition.
Video: http://recall/-/gu5DjQFZPMFpwgaXdl4cV3/hJhcmBJWGG3IHgn6Vw9Xoa
Bug: 165793917
Test: Exit PiP with ENABLE_SHELL_TRANSITIONS flag on
Change-Id: I669919d44df2b1954ce3cbce9328faf10c24171f
2021-05-21 11:37:52 -07:00
Mady Mellor
fba001d997 Merge "Make sure Manage button updates for display size changes" into sc-dev am: ea1518faf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626184

Change-Id: I249136425d9222cbdd235b48de094fd1520862d1
2021-05-21 18:27:09 +00:00
Mady Mellor
ea1518faf1 Merge "Make sure Manage button updates for display size changes" into sc-dev 2021-05-21 18:01:24 +00:00
Jorge Gil
f6bd7f81ea Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev am: 37c329784f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668168

Change-Id: I1f1e15411a8c9608e355b4d42878ded605381fa2
2021-05-21 15:51:54 +00:00
Jorge Gil
37c329784f Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev 2021-05-21 15:20:18 +00:00
Vadim Caen
cb81f1716d Display Splashscreen AVD in a SurfaceView
If the splashscreen uses an animated icon, we need to display it in a
surface view to avoid any jank if the view is passed to the client.

Test: CtsWindowManagerDeviceTestCases:SplashscreenTests#testHandleExitIconAnimatingActivity
Bug: 181757194

Change-Id: I7e2745a68626849374f5ebb9011c2e8c3b3b92c3
2021-05-21 13:13:15 +02:00
Tony Huang
c3acdff9e8 Merge changes I1ea02fa9,I033a79dc,Iac219a8e into sc-v2-dev
* changes:
  Make AppTransition animations sharable (6/n)
  Make AppTransition animations sharable (5/n)
  Make AppTransition animations sharable (4/n)
2021-05-21 07:46:13 +00:00
Ben Lin
bf09fa1d8a Merge "Pass in finishTransaction to TransitionHandler#startAnimation" into sc-v2-dev 2021-05-21 06:20:33 +00:00
Wei Sheng Shih
9e14f714d4 Merge "Tracking launch activity to decide next splash screen style." into sc-dev 2021-05-21 04:42:00 +00:00
Wei Sheng Shih
fffb1502cf Merge "Drawing the legacy icon similar to the Launcher." into sc-dev 2021-05-21 04:39:29 +00:00
Winson Chung
f369d35b27 Merge "Keep PIP screenshot layer below input consumer layer" into sc-dev 2021-05-21 03:33:30 +00:00
Winson Chung
ef3443f2cc Keep PIP screenshot layer below input consumer layer
Fixes: 188830778
Test: Resize w/o seamless resizing and try touching the PIP
Change-Id: I55c45fc670cd3acc3b674809eb3afea626f34f06
2021-05-21 03:32:42 +00: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
Ben Lin
a8b3618691 Pass in finishTransaction to TransitionHandler#startAnimation
When iterating through registered transitions and finding one and
marking as active, WM sets a reset transition which runs at when the
transition handler runs its finish callback. However, not all transition
handler wants a complete reset of the transition; in PiP's case, it
actually wants to set the final position to the new PiP x and y
coordinates. Passing in the finish transition to #startAnimation will allow
each transition handler to customize and overwrite values as necessary.

Bug: 165793917
Test: Enable Transitions, enter PIP - PIP animates correctly now
Change-Id: I741a04c1a9123c924383168c0db48646ef34059d
2021-05-20 17:32:46 -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