Commit Graph

4159 Commits

Author SHA1 Message Date
Leon Scroggins
8ceef30c1e Merge "Propagate HDR information to screenshot animation." into tm-dev am: 866f67dc94 am: 44f36e6a28 am: 9f486a0c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17992944

Change-Id: I2a4837e77758b5cbc9db1c8bc60d954ee03b9ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 20:46:54 +00:00
Sally Yuen
fac7ee13de Merge "Follow up Androidx dynamic animation api change" into tm-dev-plus-aosp am: a947f2181d am: 5ca1959f53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18075046

Change-Id: Iea4fba3e728e5db2de1a650dfbdb948100256b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 20:39:14 +00:00
Automerger Merge Worker
06b0a479e0 Merge "Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev am: 535fbd5b46 am: 4bfa1e6aab" into tm-d1-dev-plus-aosp am: 4af27eb298
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990062

Change-Id: I77a0fab3e3424c8d7f9775c13b66a83d203b9d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:38:45 +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
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
Hongwei Wang
dc1a990c59 Merge "Resize PiP on display density dpi change" into tm-qpr-dev am: 186005319a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969584

Change-Id: I700c4d5243f9e78839fe256c6902a1ab52c28fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:39:31 +00:00
Evan Rosky
529149c40d Merge "Unmark ExitPipViaIntent flaky for shell-transitions" into tm-qpr-dev am: 692e5f7dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946853

Change-Id: I2dc431d19b99aba655175d2c54e6334d0fc9979a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:38:50 +00:00
Hongwei Wang
186005319a Merge "Resize PiP on display density dpi change" into tm-qpr-dev 2022-04-28 18:47:34 +00:00
Evan Rosky
692e5f7dd5 Merge "Unmark ExitPipViaIntent flaky for shell-transitions" into tm-qpr-dev 2022-04-28 16:51:15 +00:00
Tony Huang
fbd0fe3e72 Merge "Support exit to full screen to non-split app" into tm-qpr-dev am: c648bf0a74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892631

Change-Id: If893c18287b1088a2faa485aa56ba824dc8a7aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:21:48 +00:00
Chilun Huang
c54e60968b Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12b5 am: 24263521f9 am: 49a1c3544e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887806

Change-Id: I60edbb4f7bbfb6101ca9df805a003e06f877fa6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:09 +00:00
Tony Huang
c648bf0a74 Merge "Support exit to full screen to non-split app" into tm-qpr-dev 2022-04-28 04:15:44 +00:00
Chilun Huang
49a1c3544e Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12b5 am: 24263521f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887806

Change-Id: Ibf7e76af8a37e2ec450590eb47bed40ba27cd805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:29:28 +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
Evan Rosky
86dfc432f9 Merge "Unmark flakiness for PipKeyboardTestShellTransit" into tm-qpr-dev am: 97dca04490
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946616

Change-Id: I33e5cc6f7a24caa5ed3a87d9f1b9a8b44f04c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 23:12:41 +00:00
Evan Rosky
97dca04490 Merge "Unmark flakiness for PipKeyboardTestShellTransit" into tm-qpr-dev 2022-04-27 22:23:55 +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
Evan Rosky
2fefe88ef5 Merge "Use end-bounds for pip-animations that start in the end state" into tm-qpr-dev am: 09f9f98e9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17919867

Change-Id: Ic8a6fe111486e28f95f7cba6f029b89a97c61453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:33:01 +00:00
Evan Rosky
09f9f98e9b Merge "Use end-bounds for pip-animations that start in the end state" into tm-qpr-dev 2022-04-27 17:01:47 +00:00
Shawn Lin
ecc12cf63d Merge "Move kids mode relative logic to wm shell" into tm-dev am: b9109dd6ae am: 8944a2ed80 am: 768819289f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17903530

Change-Id: I1b0f5a6737c607a8529f4dc012fa95a222effacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:11:21 +00:00
Shawn Lin
768819289f Merge "Move kids mode relative logic to wm shell" into tm-dev am: b9109dd6ae am: 8944a2ed80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17903530

Change-Id: Ie6fd0cf78dae88905c49f7248cdb3c5bc3cfd9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:47:07 +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
Hongwei Wang
23e05492ba Resize PiP on display density dpi change
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hucGOzgPr3NzCKndSnwpKo
Bug: 229561096
Bug: 229561218
Test: follow the reproduce steps in bug, see video
Change-Id: I9797197a63ed9574caaba7319d0b058821bdab36
2022-04-26 23:29:38 +00:00
Evan Rosky
9e49d65eb7 Unmark flakiness for PipKeyboardTestShellTransit
This doesn't appear to be flaky anymore (see dashboard), so
unmarking flaky.

Unfortunately, it looks like non-shell-transit is still marked
flaky, so we can't "unify" the test suite yet.

Bug: 227313015
Test: atest WMShellFlickerTests:PipKeyboardTestShellTransit
Change-Id: I501fab0aa9316a56b944452b66708e4e8c831700
2022-04-26 10:59:05 -07:00
Shan Huang
25d8002705 Merge "Remove the occasionally crashy MotionEvent logging." into tm-dev am: 4e612ce971 am: 14e0274069 am: 28a75937a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17914946

Change-Id: I62fea9a6b91d3b39a7447bcf54410e135ec46952
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 16:32:44 +00:00
Shan Huang
074b859ea0 Merge "Remove the occasionally crashy MotionEvent logging." into tm-dev am: 4e612ce971 am: 9cfb1b4718
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17914946

Change-Id: Ic524358e1c522e979d2d29e419b06be133b9e9f5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 16:12:02 +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
cfabe313db Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 am: bc356e6115 am: 4ab3c75be4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: Idb4c5f1a90413fb786cd994abc6bc59d16b80a8a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:41:34 +00:00
Robert Horvath
4ab3c75be4 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 am: bc356e6115
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: I83f704fdaf73e37e1df3cb9c8e612e57fcc710ff
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 10:36:55 +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
Evan Rosky
da1359f12f Unmark ExitPipViaIntent flaky for shell-transitions
statusBarlayerRotatesScales is still flaky for legacy, so I split
those up.

Bug: 227006499
Test: atest WMShellFlickerTests:ExitPipViaIntentTest
Change-Id: I3129303f854e9fae743421d8bb94fbba0422665f
2022-04-25 16:12:40 -07:00
Evan Rosky
95eb1049e9 Use end-bounds for pip-animations that start in the end state
PIP animations usually animate from start to end bounds. However,
there are some animations where the whole animation is in the
end bounds (specifically fade-in). So, make sure to sync the
pip bounds-state to the end-bounds when doing one of these
animations.

Bug: 227214914
Test: atest WMShellFlickerTests:PipRotationTest
Change-Id: I85d5afdcd6b72a82628bf157781dd446a297846a
2022-04-25 10:47:36 -07:00
Mariia Sandrikova
d6071f6259 Merge "Exception for Kids Mode from ignoreOrientationRequest." into tm-dev am: 42f304140f am: 6cedb4485a am: 2d2c7cf8f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17760471

Change-Id: I74823d4e892b2843b2e93197cbfa7c907b42e57b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:13:20 +00:00
Mariia Sandrikova
2d2c7cf8f6 Merge "Exception for Kids Mode from ignoreOrientationRequest." into tm-dev am: 42f304140f am: 6cedb4485a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17760471

Change-Id: I79133b7b9cb280bccdac546433c2c88ac4754724
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:58:06 +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