Commit Graph

3523 Commits

Author SHA1 Message Date
Sergey Serokurov
2da6785c98 Merge "Set correct bubble traversal order for a11y" 2022-01-13 18:43:12 +00:00
Jacqueline Bronger
481026d372 Merge "Move PiP via DPAD to the four corners (TV)" 2022-01-13 10:11:10 +00:00
TreeHugger Robot
70125e4740 Merge "Remove CounterRotator surface in finishTransaction" 2022-01-13 06:25:24 +00:00
Sergey Serokurov
721c2957f2 Set correct bubble traversal order for a11y
Bug: 158006052
Test: atest SystemUITests
Test: manual, video recording: https://drive.google.com/file/d/19OrHgS6RmhD522_Kz-nzBptsdODpxGev/view?usp=sharing
Change-Id: Iec291bc9e32f82e1985803ad43cc5bfb24905493
2022-01-12 20:53:33 -08:00
Winson Chung
bc4165d8b5 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev am: a76e46ee03 am: bab740d0b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615270

Change-Id: Ic8c080d0c2fca0969c0f08fcd01033df17161362
2022-01-13 02:17:32 +00:00
Winson Chung
bab740d0b4 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev am: a76e46ee03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615270

Change-Id: I9f09acee30f935206973774fcb143d58f470b9b2
2022-01-13 01:57:27 +00:00
Winson Chung
a76e46ee03 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev 2022-01-13 01:42:19 +00:00
Jacqueline Bronger
f5863c14b1 Move PiP via DPAD to the four corners (TV)
Bug: 203641195
Test: manual
Change-Id: Ib2381ae6ff0b43f444af8e984a4f0e6d9786169b
2022-01-12 17:23:08 +01:00
Jason Chang
fbb89d8c65 Merge changes from topic "new-ohm-bg-panel"
* changes:
  (2/n) Implement BackgroundWindowManager to manage tutorial background
  (1/n) Phase out FEATURE_ONE_HANDED_BACKGROUND_PANEL
2022-01-12 15:33:21 +00:00
Chris Li
c00c3d93d8 Remove CounterRotator surface in finishTransaction
Before, the surface will be removed, and the children will be reparented
to root in a separate transaction when animation is done. That would
cause a flicker because the reparented children may be above the
rotation activity.

Bug: 206094140
Test: manually test expanding PIP
Change-Id: I0f16b7590d4bd0f4c377158d555cb94f28f134cd
2022-01-12 22:09:41 +08:00
Jason Chang
6d4fc4ca09 (2/n) Implement BackgroundWindowManager to manage tutorial background
Using WindowlessWindowManager for adding a surface wihtout depend on
Window Hierarchy, we just add leash with specific theme color at
bottom z-order while One-handed trigger, and remove it when exited.

Bug: 197165590

Test: manually test One-handed mode basic operations.
Test: atest WMShellUnitTests
Change-Id: Ie53684edd4511719516c00dd64c2dfad360a593b
2022-01-12 11:44:19 +08:00
Tony Huang
4d8ce499cb Merge "Avoid NPE while drag divider bar" into sc-v2-dev am: fcfa227cf7 am: 1343931512
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602936

Change-Id: I4345e35c7a7b2b8a56cff04e9c7dc337d55beb00
2022-01-12 01:58:39 +00:00
Tony Huang
1343931512 Merge "Avoid NPE while drag divider bar" into sc-v2-dev am: fcfa227cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602936

Change-Id: I3fe73e84b92c87ec6f009bc7b671d529a857820f
2022-01-12 01:41:24 +00:00
Tony Huang
fcfa227cf7 Merge "Avoid NPE while drag divider bar" into sc-v2-dev 2022-01-12 01:21:28 +00:00
Winson Chung
d0823fc830 Return non-null empty list if the controller is already invalidated
- In the off chance that the controller is already invalidated (due to
  service reconnection to launcher for example), then any calls through
  the previous binder should just return an empty task list.

Bug: 206648922
Test: Manual (haven't been able to repro)
Change-Id: Iff6193fa89c2baecc527e589f17ae41b82575a48
2022-01-11 19:57:26 +00:00
Mady Mellor
f4d2b4d416 Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c am: 04b46aed49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16603090

Change-Id: I28c9bf16b1754aabd5c0ee423a610d44d8923863
2022-01-11 18:51:00 +00:00
Mady Mellor
04b46aed49 Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16603090

Change-Id: I50140f087019333fc4ca5b3668cddc20a2ead3b9
2022-01-11 17:53:27 +00:00
Mady Mellor
d76f9c199c Merge "Fix possible NPE" into sc-v2-dev 2022-01-11 17:36:43 +00:00
Jason Chang
f25e1e90c2 (1/n) Phase out FEATURE_ONE_HANDED_BACKGROUND_PANEL
Remove DisplayArea feature FEATURE_ONE_HANDED_BACKGROUND_PANEL
We are going implement One handed panel throught
WindowlessWindow mechanism instead.

Bug: 197165590

Test: manually test One-handed mode basic operations.
Test: atest WMShellUnitTests
Change-Id: I3ba106a266e69bf61cdd43c0043852eed14dc365
2022-01-11 23:57:53 +08:00
Tony Huang
f0d69e7d47 Avoid NPE while drag divider bar
Task topActivityInfo is nullable, we should check it is null or
not before access it.

Bug: 213894166
Test: pass existing tests
Change-Id: Iedda57145586b6d5c2e151308ddca1e2e36035c0
2022-01-11 14:58:17 +08:00
Winson Chung
398d740004 Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev am: f92999a5e1 am: 049cf6bb1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602749

Change-Id: I017f40d8b236de6e75afce5b28e8a4049396239f
2022-01-11 06:49:09 +00:00
Winson Chung
049cf6bb1e Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev am: f92999a5e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602749

Change-Id: Ibe881d27475564731817bd7b868118e6333d9614
2022-01-11 06:21:52 +00:00
Winson Chung
f92999a5e1 Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev 2022-01-11 06:08:29 +00:00
Chris Li
b258c0fd58 Merge "Fix ExitPipWithDismissButtonTest with Shell transition" 2022-01-11 02:30:08 +00:00
Chris Li
9131c6a128 Merge "Fix WallpaperWindowToken visible update with Shell transition" 2022-01-11 02:29:29 +00:00
Winson Chung
b5e0878776 Ensure only single pip dismiss magnetized target exists
- If init() is called multiple times, the previous magnetized targets
  can cause the wrong target position to be calculated when trying (or
  not trying) to dismiss

Bug: 213348722
Test: Manual
Change-Id: Ic1f972cc60eafca2302ad168065c974c8a0ee924
2022-01-11 00:22:42 +00:00
Mady Mellor
0be1b45d64 Fix possible NPE
Test: manual - make sure dot works normally / no regression
Bug: 213027822
Change-Id: I819f73cb8c7d613796c3d3bb4b55b80b337c6126
2022-01-10 21:07:31 +00:00
Ats Jenk
5bf2bc35a8 Merge "Use a separate icon factory for app badge icons" 2022-01-10 19:55:51 +00:00
Bill Yi
7b3ea9bc04 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-10 04:00:15 +00:00
Bill Yi
042719f4df Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-10 03:59:18 +00:00
Chris Li
2490b439d0 Fix ExitPipWithDismissButtonTest with Shell transition
Fix: 210965692
Test: atest WMShellFlickerTests:ExitPipWithDismissButtonTest
Change-Id: I828095f55e7400b661513b853372a3bef5466663
2022-01-09 22:59:36 +08:00
Chris Li
c8a3d88def Fix WallpaperWindowToken visible update with Shell transition
With Shell transition, when mVisibleRequested is changed, it will wait
until the transition finish to update the isVisible(). As a result, if
there is a visible change before the previous transition is finished,
it will be skipped.

For example, when we first open a fullscreen app and then immediately
enter pip:
1. TRANSIT_OPEN will call to hide wallpaper and set mVisibleRequest to
false, but not commit visible until transition animation is finished.
2. TRANSIT_PIP will call to show wallpaper, but if it is started before
the OPEN transition is finsihed, it will not update the wallpaper
mVisibleRequested, which will leave the wallpaper hidden.

Fix: 210965575
Bug: 210965692
Test: atest WMShellFlickerTests:ExpandPipOnDoubleClickTest
Change-Id: I2578aafd024a3c9a6ec96079d4dc6cb740c890d2
2022-01-09 19:35:16 +08:00
TreeHugger Robot
581ad142f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:21:03 +00:00
TreeHugger Robot
34171e053d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:20:12 +00:00
Bill Yi
9f612755b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifab08e6f5047b918b9d9eb318085f9e281b7fb4a
2022-01-08 05:06:10 +00:00
Bill Yi
fbe8128ea1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie9444c2d04adc95f33300624391b888094c38422
2022-01-08 05:02:23 +00:00
Bill Yi
301d5c5963 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I97d5ca669c13fda5f3c25b97f42ee359953fe172
2022-01-08 05:00:53 +00:00
Bill Yi
664ed31d10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I17b0b00359d964dce6474934b5b0bc97a117025d
2022-01-08 04:57:14 +00:00
Sergey Serokurov
9ea6fc5541 Merge "Make only top bubble clickable when stack is collapsed" 2022-01-07 23:25:26 +00:00
Sergey Serokurov
79623ef98d Make only top bubble clickable when stack is collapsed
Bug: 157934340
Test: atest SystemUITests
Test: manual, screen recording https://drive.google.com/file/d/12itDLsVQZrCQVYMjgJhuWlTslOJdyGqy/view?usp=sharing
Change-Id: I865a8d508965e88e78e516143915fd895d4f3782
2022-01-07 12:29:27 -08:00
Ats Jenk
71d2ccffc7 Use a separate icon factory for app badge icons
We were reusing the same BubbleIconFactory for bubble icons and app
badge icons. BubbleIconFactory extends BaseIconFactory and resizes all
created icons to one size. BubbleIconFactory was configured to resize
icons to the size of bubbles as defined by bubble_size dimensions,
currently at 60dp.
Badge icon size is defined by bubble_badge_size and is currently at
24dp. Using the same BubbleIconFactory for both icons meant that we were
resizing all badge icons to be the same size as bubbles, at first. And
then, when actually using them, sizing them down again.
This change introduces a separate BubbleBadgeIconFactory with relevant
code moved from BubbleIconFactory. And mainly, it defines the icon size
as the size of the badge. Avoiding resizing.

Test: visually verified that the badge icon looks the same
Bug: 189173831
Change-Id: Ie032bbc15eb0fd3e78636796bafb05149e262850
2022-01-07 10:44:17 -08:00
TreeHugger Robot
f7714c7271 Merge "Set cutout mode to shortEdges on flicker" 2022-01-07 18:25:19 +00:00
Nataniel Borges
dd1d5b61b1 Set cutout mode to shortEdges on flicker
Use short edges on the flicker tests so that the test apps cover the full screen in both raven and in flame devices. With default cutout, some assertions will need to be updated to consider the letterbox layers, as well as app windows not covering the entire display

Bug: 209935473
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Iaeabe2033adc2890605bbef7bce139569f402c4b
2022-01-07 16:22:46 +01:00
Chris Li
ceabc8c201 Merge "Enter PIP when exiting prev PIP with Shell transition" 2022-01-07 13:46:22 +00:00
Mariia Sandrikova
d2ccf6edac Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273 am: 0cb2c45802
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: I0cf5f6fa171d2cd9f402cd1439c3418631718cc9
2022-01-07 11:23:05 +00:00
Mariia Sandrikova
0cb2c45802 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: Ib282c2fc1fd01d26841ee2003cd604d4150e569f
2022-01-07 11:02:56 +00:00
Mariia Sandrikova
b6c52ec273 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev 2022-01-07 10:49:20 +00:00
Chris Li
5f59127cb3 Enter PIP when exiting prev PIP with Shell transition
Before, the dismissPip() is not collected in the enter PIP transition.
Now, the Task that leaving PIP windowing mode will also be part of the
TRANSIT_PIP transition.

Fix: 213300721
Test: manual test with two Pip apps
Change-Id: Iaab34a7969ff4cb5d9768754d643d5f32913f57a
2022-01-07 18:38:28 +08:00
Riddle Hsu
320dfd646e Fix layer order of wallpaper with counter-rotator in default handler
The layer of wallpaper should always be at the bottom. Otherwise other
windows below it will be invisible during a transition animation.

Also put the same usages of CounterRotator to a new helper class.

Bug: 206094140
Test: adb shell setprop persist.debug.shell_transit 1; reboot
      atest com.android.server.wm.flicker.launch.OpenAppWarmTest
      Or use shell command "am start" to launch a landscape
      activity while wallpaper is visible in portrait.

Change-Id: Ia78450af45185782ce2268393e2a8b6bb8b4c794
2022-01-07 02:24:57 +00:00
Chris Li
6ecdc3894b Merge "Fix SetRequestedOrientationWhilePinnedTest with Shell transition" 2022-01-07 02:06:10 +00:00