Commit Graph

4113 Commits

Author SHA1 Message Date
Vinit Nayak
fd9d49cf05 Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 1cb3bafe5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: Ic9383518dfb60bb1ea311f10490af33da79e7a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:09:00 +00:00
Vinit Nayak
0567c3553a Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev 2022-05-03 19:56:34 +00:00
TreeHugger Robot
26f102cc02 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I2fb8cc3c7e2e94184e725110a8444c72bfb460ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:17:33 +00:00
TreeHugger Robot
fe8cf73739 Merge "Fix PipTaskOrganizerTest" into tm-dev 2022-05-03 18:37:57 +00:00
Vadim Caen
3151a65ec8 Add developer option for back animation DO NOT MERGE am: 94f506aa2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I752f23cdeb04c7f514c3de6255eca5e5f681e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:25 +00:00
Vadim Caen
064b49a1a1 Merge "Add developer option for back animation DO NOT MERGE" into tm-dev 2022-05-03 14:13:57 +00:00
TreeHugger Robot
5cc20aa290 Merge "Follow up Androidx dynamic animation api change" into tm-dev 2022-05-02 19:30:44 +00:00
Hongwei Wang
3fbc6c9d0e Fix PipTaskOrganizerTest
Fix the regression from ag/17523158 that the PipParamsChangedForwarder
instance in unit test is null. Added also the check that
PipParamsChangedForwarder does dispatch the aspect ratio change.

Bug: 231134850
Test: atest WMShellUnitTests:PipTaskOrganizerTest
Change-Id: I1161646babaf974d7beca2889805672d68adf5bf
2022-05-02 11:35:21 -07:00
Sally
6fb258098c Follow up Androidx dynamic animation api change
Refactor codes using DynamicAnimation Animation handler api codes
    for following up Androidx codes changes.

Change needed to support AndroidX platform prebuilts, which include changes that fix a severe accessibility bug and setting.

Bug: 167382784
Bug: 221303983
Test: build
Change-Id: Ie75cc4068fa0b49816756650e900b7943f6c97d2
Merged-In: Iaa0e787675f53ac16cf61f2d2b6adae02ab55623
2022-05-02 17:34:16 +00:00
Vadim Caen
cad0761e54 Merge "Add background executor fow WmShell" into tm-dev am: a73a4428ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693175

Change-Id: I8131232d0c86adaec4ae6ef74adbcb9a99cf8a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 17:28:24 +00:00
Vadim Caen
a73a4428ff Merge "Add background executor fow WmShell" into tm-dev 2022-05-02 17:02:59 +00:00
Vadim Caen
94f506aa2a Add developer option for back animation DO NOT MERGE
Bug: 228936326
Test: BackAnimationControllerTest#animationDisabledFromSettings
Change-Id: I857a480e7375cada9171712d737162c7876c087e
Merged-In: Ie7a3acc5674080a22ccdcd0fe31a158a30ee9040
2022-05-02 17:15:06 +02:00
Vadim Caen
e6a1b4e8bc Add background executor fow WmShell
Add a low priority ShellExectuor for background task in WmShell

Test: N/A
Bug: 228936326
Change-Id: I10adafa03aca98a9080fd4ac1e8ba42fa9683914
2022-05-02 14:15:39 +02:00
Jacqueline Bronger
6315c81ded Merge changes from topics "presubmit-am-5a31146ec7864d04ab14351725610831", "presubmit-am-bcec5630c20a4c7ca37a5694c6a3b126" into tm-dev am: a512a9b955
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029564

Change-Id: I92f3630baf4267cdcfe0b8f108513640879e454a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:52:52 +00:00
Jacqueline Bronger
359dd9e3d9 Merge "Handle PiP params changes in onTaskInfoChanged" into tm-dev am: 936456aebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523158

Change-Id: Ic13d063d80d8c34437eccbbb3a9e3493268a0e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:52:00 +00:00
Jacqueline Bronger
a512a9b955 Merge changes from topics "presubmit-am-5a31146ec7864d04ab14351725610831", "presubmit-am-bcec5630c20a4c7ca37a5694c6a3b126" into tm-dev
* changes:
  TV:Fade out PiP content during aspect ratio change
  Reorder PiP menu buttons.
  Improve TV PiP menu buttons
2022-05-02 08:41:46 +00:00
Jacqueline Bronger
936456aebc Merge "Handle PiP params changes in onTaskInfoChanged" into tm-dev 2022-05-02 08:35:59 +00:00
Leon Scroggins
44f36e6a28 Merge "Propagate HDR information to screenshot animation." into tm-dev am: 866f67dc94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17992944

Change-Id: I44edaa03cbdda374a9ca5c8d29d39bd8ae4161e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:57:59 +00:00
Sally Yuen
a947f2181d Merge "Follow up Androidx dynamic animation api change" into tm-dev-plus-aosp 2022-04-29 16:47:55 +00:00
Jerry Chang
4bfa1e6aab Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev am: 535fbd5b46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990062

Change-Id: I8196002ec6e0b5d02a64b5c1aca9466f3bcb9a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:44:55 +00:00
Tony Huang
aee622bc51 Merge "Support exit to full screen to non-split app" into tm-dev am: af014f9eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800505

Change-Id: I80b019d33ffd5d7a98a71f88ea8fb0b168d6f13b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:44:13 +00:00
Leon Scroggins
866f67dc94 Merge "Propagate HDR information to screenshot animation." into tm-dev 2022-04-29 15:16:21 +00:00
Jacqueline Bronger
442ba6ca2c TV:Fade out PiP content during aspect ratio change
This avoids stretching the content - the content will only be shown
again once it has been redrawn by the app for the new ratio.

Content should stay visible during the enter and move animation, i.e.
whenever the ratio stays the same.

Bug: 230741005
Test: manual - enter PiP, change aspect ratio, expand, move

Change-Id: Ie95f4a480a622c7403f342e0ac25660fd2af197f
2022-04-29 11:26:06 +02:00
Jacqueline Bronger
2a3d045604 Reorder PiP menu buttons.
Order: fullscreen, close, app actions, system actions

Bug: 228050454
Test: manual
Change-Id: I14f6bf1ad9a900daa8b4b33b2be29896c5691149
2022-04-29 11:26:06 +02:00
Jacqueline Bronger
2f757eec2f Improve TV PiP menu buttons
- Save focused button when moving and changing orientation (e.g. during
  expanded mode being toggled)
- Focus the first button when the menu is opened
- Makes sure all buttons are visibly reachable by setting the right
  gravity based on orientation and whether all the buttons fit
- Scrolls to the focused button if it happens to go out of bounds during
  any change
- Fade buttons out and in during orientation change
- Scale buttons to 1.1x when selected
- Fix move button description (typo in resource reference)

Bug: 220109276
Bug: 219887361
Test: manual

Change-Id: Ibe1b2ee3e505bd218c49f6cd0cbcbf7956452b26
2022-04-29 11:26:06 +02:00
Jacqueline Bronger
bb2980a0e0 Handle PiP params changes in onTaskInfoChanged
Before, there were two paths for listening to pip params changes, either
via onTaskInfoChanged (only handle aspect ratio changes the same way for
all form factors) and PinnedTaskListener.
Now all PiP params changes are handled in onTaskInfoChanged and use
similar listeners to allow for different behavior for different form
factors.
Also adds a TvPipTaskOrganizer so that only relevant params are checked.

Bug: 218456378
Bug: 220042536
Bug: 228854691
Test: atest PinnedStackTests

Change-Id: I673ab69ee9253db782c41da96695b5a374345086
2022-04-29 11:25:44 +02:00
Jerry Chang
535fbd5b46 Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev 2022-04-29 06:56:20 +00:00
Tony Huang
af014f9eb6 Merge "Support exit to full screen to non-split app" into tm-dev 2022-04-29 06:28:58 +00:00
Sally
dc5b93b371 Follow up Androidx dynamic animation api change
Refactor codes using DynamicAnimation Animation handler api codes
for following up Androidx codes changing.

Copied from ag/17010932

Bug: 167382784
Bug: 221303983
Test: build
Change-Id: Iaa0e787675f53ac16cf61f2d2b6adae02ab55623
2022-04-28 23:51:42 +00:00
Chilun Huang
86371a0a2b Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887806

Change-Id: I1d1858aef49a9326e0efa1cbb2b633f59f964546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:55:00 +00:00
Chilun Huang
6efe0b12b5 Merge "Set the correct size to the container of icon view" into tm-dev 2022-04-28 02:12:01 +00:00
Alec Mouri
3d03ed3626 Propagate HDR information to screenshot animation.
The screenshot animation must know whether the screenshot contains HDR
layers so that it can correctly inform SurfaceFlinger whether its layer
can be dimmed.

This is due to the interplay of the following:
1. Devices are now able to configure DisplayManager to send
   significantly lower SDR white points relative to display brightness
   to SurfaceFlinger when HDR is simultaneously on-screen.
2. AIDL composer is required to support per-layer dimming, so that SDR
   layers may be dimmed to preserve the relative luminance of HDR video
   content.
3. Because the screenshot does not contain an HDR transfer function,
   SurfaceFlinger will treat the layer as SDR, and attempt to dim it.
4. Screen rotations containing HDR layers must request SurfaceFlinger to
   present the rotated screenshot at display brightness, to override
   (3) above. Otherwise, HDR content captured in the screenshot will
   suddenly dim during the rotation animation.
5. Also due to (3), DisplayManager no longer thinks that there is HDR
   content on screen, so a prior patch treated layers that requested to
   to be dimmed to be reported as HDR
   (I1d1b0dcaf230300ca34b84ea407d0817feb2c664). Otherwise, the display
   brightness will decrease during the animation and ramp back up
   afterwards.
6. But because of (5), screenshots that only contained SDR layers were
   incorrectly treated as HDR, which caused the display brightness to
   ramp up during the animation.

This patch fixes (6) by allowing for the screenshot animation to learn
whether the screenshot contains HDR layers, and request dimming
capabilities accordingly.

Bug: 230068567
Test: screen rotation
Change-Id: I6bbb2433f976e368bfe2c04e084e110cfb551c15
2022-04-27 21:43:48 +00:00
Jerry Chang
37f8c719fe Skip running app pair flicker tests since it's deprecated
Remove app-pair flicker tests from presubmit and mark them with @Ignore
since app-pair is not currently used but kept in codebase for backup.

Fix: 223076688
Fix: 226869067
Fix: 214190843
Fix: 200778092
Fix: 200777653
Test: atest WMShellFlickerTests
Change-Id: I328d87f87bf9c5f01d86474b850d7d3056aa3ed9
2022-04-27 18:01:38 +00:00
Shawn Lin
1fc4ebb093 Merge "Move kids mode relative logic to wm shell" into tm-dev am: b9109dd6ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17903530

Change-Id: I182a49a1f0d0d5f67d6019a52e49c1af0de1fb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:24:27 +00:00
Shawn Lin
b9109dd6ae Merge "Move kids mode relative logic to wm shell" into tm-dev 2022-04-27 08:18:55 +00:00
Chilun Huang
1620411503 Set the correct size to the container of icon view
Wrong container size causes some icon to be cropped. Set the icon size specified by spec as the container size to correct it.

Bug: 228928242
Bug: 229954549
Test: Manual resize the split and check the icon on both phone and large
      screen device.
      Manual drag to split and check the icon on both phone and large
      screen device.
Change-Id: I556f2c1a44852439242a16a6216121036b8aed5e
2022-04-27 05:11:01 +00:00
Shan Huang
14e0274069 Merge "Remove the occasionally crashy MotionEvent logging." into tm-dev am: 4e612ce971
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17914946

Change-Id: I0d01786a9b154bca4256fdc405cf0eff6628ff10
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 15:41:58 +00:00
Shan Huang
4e612ce971 Merge "Remove the occasionally crashy MotionEvent logging." into tm-dev 2022-04-26 15:20:53 +00:00
Robert Horvath
6ed7edb83c Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: Ifc8a6b819a29733ed0363998082e2fc59147aee5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 08:30:52 +00:00
Robert Horvath
943ffdb6c1 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev 2022-04-26 08:28:52 +00:00
Vinit Nayak
1d45696be2 Revert "Revert "Remove check for preventing re-parenting non-spl..."
Revert "Revert "Use new onStartSplitLegacy when starting split f..."

Revert submission 17918609-revert-17779173-startSplitLegacy-OOWPZEFFGI

Reason for revert: Running through TH
Reverted Changes:
I6d81e0584:Revert "Use new onStartSplitLegacy when starting s...
I754bc308f:Revert "Remove check for preventing re-parenting n...

Change-Id: I190cc9bda28c85a675c3bd8edc2ca2bb43ed677c
2022-04-25 19:55:31 +00:00
Mariia Sandrikova
5d9ad9be99 Merge "Exception for Kids Mode from ignoreOrientationRequest." into tm-dev am: 42f304140f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17760471

Change-Id: Ie2b295bac38711e8abc96c790ccf12f7062ebd4e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:23:53 +00:00
Mariia Sandrikova
42f304140f Merge "Exception for Kids Mode from ignoreOrientationRequest." into tm-dev 2022-04-25 14:11:11 +00:00
shawnlin
402727731f Move kids mode relative logic to wm shell
1. Move KidsModeSettingsObservor to wm shell.
2. Create a ForceShowNavBarSettingsOberver for wm core.

Bug: 230072077
Test: atest KidsModeTaskOrganizerTest
Change-Id: I1b3edf1fc804b9dac190fcc92b7b62bfc3366d64
2022-04-25 20:10:41 +08:00
Mariia Sandrikova
9182b74df1 Exception for Kids Mode from ignoreOrientationRequest.
Fix: 229304143
Test: manual and DisplayContentTests
Change-Id: I3136db620afdf016a900f3441ee3010ae9662f0f
2022-04-24 16:28:31 +00:00
Santiago Etchebehere
822d98e070 Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev am: 791c612714
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17918610

Change-Id: If89e8267f13ec08fe99a80d150965befed31a74c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 21:27:16 +00:00
Santiago Etchebehere
791c612714 Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev 2022-04-22 21:07:18 +00:00
Santiago Etchebehere
d7816f0bba Revert "Remove check for preventing re-parenting non-split apps"
Revert "Use new onStartSplitLegacy when starting split from overview"

Revert submission 17779173-startSplitLegacy

Reason for revert: Broken build: b/230129218
Reverted Changes:
I01590e53c:Remove check for preventing re-parenting non-split...
I696749f76:Use new onStartSplitLegacy when starting split fro...

Change-Id: I754bc308f37eea2fc50eda2b9df068adf711a268
2022-04-22 21:02:22 +00:00
TreeHugger Robot
e0908a1bed Merge "Remove check for preventing re-parenting non-split apps" into tm-dev am: b9fc2e8d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779267

Change-Id: I99fb6cba277faac48d8d72aa178e6a5f8038e05e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:08:59 +00:00
TreeHugger Robot
b9fc2e8d7e Merge "Remove check for preventing re-parenting non-split apps" into tm-dev 2022-04-22 20:03:37 +00:00