Mady Mellor
72500c81e8
Merge "Hide the stack education view when user taps" into sc-dev am: cdfc535609 am: 938929c329 am: ab34e9bfae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753038
Change-Id: Icfecb552abaeb9999798c319b3df5c3486649f11
2021-06-01 21:04:50 +00:00
Mady Mellor
ab34e9bfae
Merge "Hide the stack education view when user taps" into sc-dev am: cdfc535609 am: 938929c329
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753038
Change-Id: I2ebefd6af194cdada9536d41871fd7c9555f103c
2021-06-01 20:43:21 +00:00
Mady Mellor
938929c329
Merge "Hide the stack education view when user taps" into sc-dev am: cdfc535609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753038
Change-Id: I6bb25986c9a5b22bb8674e97cc63c3a36a3e8127
2021-06-01 19:42:24 +00:00
Mady Mellor
cdfc535609
Merge "Hide the stack education view when user taps" into sc-dev
2021-06-01 19:35:46 +00:00
Wei Sheng Shih
9b6a709754
Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7 am: 4244ff3aa8 am: bc0d2d0814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155
Change-Id: Icdd657bdacbfd986cbdaf3cd624f50df3370b391
2021-06-01 09:11:25 +00:00
Wei Sheng Shih
bc0d2d0814
Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7 am: 4244ff3aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155
Change-Id: I0b26907e4ee34e87d28f5038d983b492ac2c8d0b
2021-06-01 08:47:02 +00:00
Wei Sheng Shih
4244ff3aa8
Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155
Change-Id: Ic806e0c7dd36a2c1f7f7b1180fe2d0869b95bf85
2021-06-01 08:25:05 +00:00
Wei Sheng Shih
c464bbf453
Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155
Change-Id: I3201d3fdeba1797bc11a1aeee539f7226d088d03
2021-06-01 08:19:02 +00:00
wilsonshih
5cdbeb1a42
Ensure no starting window leak in WMShell before adding.
...
Before adding the snapshot start window, remove any existing window
at the same task if any. Also make sure if starting window was create
failed, the window should be remove after it been added.
Bug: 185318171
Test: manual test without ag/14308714
Change-Id: I5de7d54907bc0318c6d979c44ca8e64a5fcea062
2021-05-31 21:23:19 +08:00
Mady Mellor
baae5baaed
Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev am: 2430a0b314 am: b1ad3da49d am: 3ca7a4aae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707598
Change-Id: I22bcd9e961541d8b3577b29cf32e0796c46e36ef
2021-05-28 03:26:52 +00:00
Mady Mellor
3ca7a4aae0
Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev am: 2430a0b314 am: b1ad3da49d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707598
Change-Id: I7f28c58606fbcdaa775d0896f1fbe5b170b4f635
2021-05-28 03:12:31 +00:00
Mady Mellor
b1ad3da49d
Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev am: 2430a0b314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707598
Change-Id: I709265f9c33d01aeb7d61e47680aab9bf8ae3b7b
2021-05-28 03:01:35 +00:00
Mady Mellor
f985539cb1
Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev am: 2430a0b314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707598
Change-Id: Id514c7811ad8d5c72869c27930c6236e9503cb12
2021-05-27 23:08:33 +00:00
Mady Mellor
2430a0b314
Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev
...
* changes:
Flexible maximum number of bubbles to show
Add shadows back to bubble avatar
Update sizes for the bubble avatar
2021-05-27 22:51:57 +00:00
Mady Mellor
1a916f5b1a
Hide the stack education view when user taps
...
This was only hiding if you interacted with the bubble, now it
will hide if you tap anywhere.
Also makes sure the bubbles are ordered above the education.
Bug: 189225662
Test: manual - wipe device, get first bubble, tap anywhere other
than the bubble & observe that the user education
fades away.
Change-Id: I3750ca79de717e81492070b38d1af0518f1a7a3f
2021-05-27 15:51:01 -07:00
Mady Mellor
238f122f47
Flexible maximum number of bubbles to show
...
* adjust the default spacing so that its small enough that 5 bubbles
can show on crosshatch (5 is the default)
* Add max bubbles to BubblePositioner, replace the other usages
Test: atest BubbleDataTest
Test: manual - have 5 bubbles
- adjust screen size to largest
- open the stack
=> notice that the number of bubbles have changed and
they all fit on the screen without overlap
- repeat & check the different densities
Bug: 187715444
Change-Id: I4794ed89541eeb573c367748f980cf7ffe45d3f3
2021-05-27 13:41:22 -07:00
Mady Mellor
5f00d56451
Add shadows back to bubble avatar
...
* Add shadows back -- icon lib is no longer adding shadows but
bubbles should still have them for background protection.
* The shadow is active on all bubbles when:
- the stack is being dragged around & bubbles trail behind it
- the stack is expanded (the bubbles can be dragged to dismiss &
can show on top of the expanded view or overflow)
* When the stack is resting, only the top two bubbles show a shadow
& the bubbles below that animate their Z translation so the change
is smooth.
* Also put the # of bubbles we show in the stack in a static int &
updated usages
Test: visual - add 5 of the 'test bubbles' from the test app
and notice the white backgrounds don't blend together
due to the shadow & that they are distinct when
placed on a white background
- drag / fling the stack around & notice shadows show
for all the bubbles while moving but once they come
to rest you don't see a stack of shadows
Bug: 183657577
Change-Id: I0c273f4d0261db9eac1b49ef584fd62fbb67cc9a
2021-05-27 13:40:43 -07:00
Mady Mellor
bb53cce0db
Update sizes for the bubble avatar
...
* Update sizes of badge & bubble; also simplify some of the sizing
code, we can do it with just the overall size
* Simplified things, instead of the inner / outer sizes just use
the overall size
Test: visual - create a bubble and look at the size of the bubble and
badge
visual - have some bubbles, change display size, create a new
bubble & verify that all of the sizes are the same
Bug: 183657577
Change-Id: Ibd8609a8737bb0a57519fa70fba17138bb69b379
2021-05-27 10:32:02 -07:00
Bill Yi
63150c7799
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8ac875e9c2da0ca1616c0f35626e8d2dbc41e24
2021-05-27 13:02:18 +00:00
Bill Yi
0ba64a4d0c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22ee13f97f7a193c756c49757564dc919e0e1d89
2021-05-27 13:00:57 +00:00
Bill Yi
5a20d4ff08
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic89d1c68f73f211c351ecd85d691bb64ec06f98d
2021-05-27 12:59:35 +00:00
Vadim Caen
847c9f75ae
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: I7c295f6f285fdd54f5be77d26eaaddeba9194bed
2021-05-26 11:04:14 +00:00
Wei Sheng Shih
f157e9d083
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: Ib800aeba8e00d4ace57c155c78af82dffa782fc5
2021-05-26 10:53:07 +00:00
Bill Yi
01613e121b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-05-26 05:10:58 +00:00
TreeHugger Robot
364128ac07
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-25 20:34:37 +00:00
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
Bill Yi
7974c35e5d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4e76272c308193ffdcbca7aa00fb4aa0b15e66b9
2021-05-25 16:17:34 +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