Commit Graph

1453 Commits

Author SHA1 Message Date
Bill Yi
01613e121b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-26 05:10:58 +00:00
Bill Yi
b5dc7a6787 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9dead0949d59204c8d1a12ff217aff754faaebb2
2021-05-25 16:15:56 +00:00
Vadim Caen
b42455b969 Merge changes from topic "splashscreen-surface" into sc-dev am: fc1efcb428 am: be2ac213fe am: edf6bbea58
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186656

Change-Id: If12039cd518709d54df21eeabdaedf2dc30bbbcf
2021-05-25 15:58:41 +00:00
Vadim Caen
edf6bbea58 Merge changes from topic "splashscreen-surface" into sc-dev am: fc1efcb428 am: be2ac213fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186656

Change-Id: I19f4e6d30a2bd51d92f1747027baec3f16cf001b
2021-05-25 15:41:59 +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
3febf72e82 Merge "Prevent the splashscreenview be replaced after transfer starting window" into sc-dev am: 4bc9052468 am: 0f488562e4 am: b5b74050d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622503

Change-Id: Ifb08f1bb1f702548e3aea7d061c2f85db567d808
2021-05-25 13:22:59 +00:00
Jerry Chang
94d87c64a3 Merge "Do not dismiss split if stages are not visible due to screen is sleeping" into sc-v2-dev am: c200310e02 am: 467aa9197b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14613435

Change-Id: Ie0bfc001de218d0bcd4a560a8abd30692d19958c
2021-05-25 13:19:28 +00:00
Wei Sheng Shih
b5b74050d5 Merge "Prevent the splashscreenview be replaced after transfer starting window" into sc-dev am: 4bc9052468 am: 0f488562e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622503

Change-Id: Ida85b058b11f276deb346788af5c12bd0a698ac2
2021-05-25 12:25:39 +00:00
Jerry Chang
467aa9197b Merge "Do not dismiss split if stages are not visible due to screen is sleeping" into sc-v2-dev am: c200310e02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14613435

Change-Id: Ib587f4c4a9d01fdc25d8cf2e152a6c57e7b3b243
2021-05-25 12:23:11 +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
6033a8a6a9 Merge "Dismiss staged split after folded the device" into sc-v2-dev am: 4048fa7a26 am: b13edd9f5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700845

Change-Id: I3602b2c994e3cdc5bd9b3d3e195d64cbb830e630
2021-05-25 05:34:23 +00:00
Jerry Chang
69e69b94d3 Merge "Dismiss staged split when keyguard is occluded" into sc-v2-dev am: 4b5a0e2a1c am: 09ac674a7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14665438

Change-Id: Id3da59ba0316b08ec90352ffda4f2862d9320a90
2021-05-25 05:33:57 +00:00
Jerry Chang
b13edd9f5d Merge "Dismiss staged split after folded the device" into sc-v2-dev am: 4048fa7a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700845

Change-Id: Icd0fc9969d2b6a0552c8aea89aefe61e04f36f01
2021-05-25 05:28:09 +00:00
Jerry Chang
09ac674a7a Merge "Dismiss staged split when keyguard is occluded" into sc-v2-dev am: 4b5a0e2a1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14665438

Change-Id: I150b002ef1833fc188c07b4032b5fa836554df26
2021-05-25 05:27:55 +00:00
Jerry Chang
22b8953519 Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev am: 85c712a6ba am: 2668ade547
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703484

Change-Id: I232f4317f95aa536fc1fe087ac5f25f4fb7e6c0d
2021-05-25 05:27:48 +00:00
Jerry Chang
d95539fadd Merge "Fix broken layout after switched stage positions" into sc-v2-dev am: 3c96d58450 am: 562b85b6ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700832

Change-Id: I94727a2abf22c0becf2db58c96ef2ece845303b5
2021-05-25 05:27:37 +00:00
Jerry Chang
2668ade547 Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev am: 85c712a6ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703484

Change-Id: Ie77908c13e56204e88b83c4df2dfab8944ef232d
2021-05-25 05:26:39 +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
562b85b6ad Merge "Fix broken layout after switched stage positions" into sc-v2-dev am: 3c96d58450
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700832

Change-Id: Ic2c635dc8267270e78759f0eddea05be0499704d
2021-05-25 05:11:33 +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
88f786424b Merge changes I8f0af447,I669919d4 into sc-v2-dev am: 445ff979f5 am: 683826e0ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664317

Change-Id: I03e60affef7d6df6ac9ec401ba0e6c7cc8ff40e8
2021-05-25 00:07:14 +00:00
Evan Rosky
d0a6af85b2 Merge "Enable remote transition animations to append to the finish transaction" into sc-v2-dev am: ffac171d4d am: b8a970ed2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14683057

Change-Id: I8e8df9f4db9e0a3da10f42cd38fe8bdfdf87e1f9
2021-05-25 00:00:56 +00:00
Ben Lin
683826e0ab Merge changes I8f0af447,I669919d4 into sc-v2-dev am: 445ff979f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664317

Change-Id: I0c1a7d1e66b3d88720f1a2b4736f40c6a5a4f2ae
2021-05-24 23:29:06 +00:00
Evan Rosky
b8a970ed2d Merge "Enable remote transition animations to append to the finish transaction" into sc-v2-dev am: ffac171d4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14683057

Change-Id: Id991c8b4bd5155592978c18b66184c4fcae5e7d1
2021-05-24 23:25:27 +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
c8fd105a8b Merge "Split flicker tests into groups" into sc-dev am: 608a439238 am: 3d7bed9d65 am: 0ae3d7e4ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601816

Change-Id: Id39f610eb07e9d93fb9c0903a08c2d5d183e3f7c
2021-05-22 10:33:18 +00:00
TreeHugger Robot
0ae3d7e4ce Merge "Split flicker tests into groups" into sc-dev am: 608a439238 am: 3d7bed9d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601816

Change-Id: Ie8c043cd662b3e1498db9017f6b638f6c5440ac1
2021-05-22 10:18:56 +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
a1f09862cf Merge "Fix overflow not receiving onBackPress events" into sc-dev am: 3c01aa0fea am: 1cb37ca0af am: 9a844201fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14684140

Change-Id: Ie2914b90cc7af99c343f007a395d9629a3caf1ce
2021-05-22 02:00:53 +00:00
Mady Mellor
9a844201fc Merge "Fix overflow not receiving onBackPress events" into sc-dev am: 3c01aa0fea am: 1cb37ca0af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14684140

Change-Id: Ie8b7287fa679b17456bd1d14e8a948944196949c
2021-05-22 01:46:07 +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
b8909bbc9f Merge "Update the sizes for bubble expanded view" into sc-dev am: 268e44c5f5 am: 46ffa8098c am: d4601d02a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626187

Change-Id: I1d8c48084cbc4a8047eff3150592d0dbda559344
2021-05-22 00:48:31 +00:00
Mady Mellor
eca2e9c8d6 Merge changes Ib640add6,I168a14e1 into sc-dev am: db99d2664e am: 5f204c1b3b am: 66fda136d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626186

Change-Id: Ic430d1cb1aa335b67bf29f2025069e98d755c057
2021-05-22 00:46:57 +00:00
Mady Mellor
d4601d02a1 Merge "Update the sizes for bubble expanded view" into sc-dev am: 268e44c5f5 am: 46ffa8098c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626187

Change-Id: I9a428c1b5586d4797ab985c4a0c936871c7d2405
2021-05-22 00:34:39 +00:00
Mady Mellor
66fda136d5 Merge changes Ib640add6,I168a14e1 into sc-dev am: db99d2664e am: 5f204c1b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626186

Change-Id: Ic992d03e4cabc88c1d4d0637bf7d3d202aad3f58
2021-05-22 00:32:58 +00:00