Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
823,738 Commits 3 Branches 0 Tags
619dfd599a4e99dff7f89eefa4d8ea08adcaf5de
Commit Graph

5606 Commits

Author SHA1 Message Date
TreeHugger Robot
b10f57a372 Merge "Relax strictness of mocks in DisplayLayoutTests" into tm-qpr-dev am: ff95cd095c am: f4e832b93d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570392

Change-Id: Iff9baf80cde9e033daf9bcd5dd5de1512742cf9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:10:58 +00:00
TreeHugger Robot
ae44aedeed Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev am: f1318aa342 am: a77719c146 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19575630

Change-Id: Ia136a35fd5a797dd113f166c97b9baa4e9ebe9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:10:00 +00:00
TreeHugger Robot
f4e832b93d Merge "Relax strictness of mocks in DisplayLayoutTests" into tm-qpr-dev am: ff95cd095c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570392

Change-Id: I94cc7697a19295dfe0225a037d0e0f2ccce35cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:44:27 +00:00
TreeHugger Robot
a77719c146 Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev am: f1318aa342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19575630

Change-Id: I9cfd65478eb80b25b94b555bfa3172a7ceeae5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:43:38 +00:00
TreeHugger Robot
ff95cd095c Merge "Relax strictness of mocks in DisplayLayoutTests" into tm-qpr-dev 2022-08-10 17:31:51 +00:00
TreeHugger Robot
f1318aa342 Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev 2022-08-10 17:03:50 +00:00
Shan Huang
af54884859 Merge "Fix back to home animation restarts on a second swipe." into tm-qpr-dev am: a33be48b49 am: d2383c693a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19562536

Change-Id: I3aeeaa4ae47a898666eade0fd00fafd6b0577849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 16:35:32 +00:00
Shan Huang
d2383c693a Merge "Fix back to home animation restarts on a second swipe." into tm-qpr-dev am: a33be48b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19562536

Change-Id: I81bca28c3c55c6d935986e144761b3a42af7e1c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 16:09:30 +00:00
Shan Huang
a33be48b49 Merge "Fix back to home animation restarts on a second swipe." into tm-qpr-dev 2022-08-10 15:05:52 +00:00
Winson Chung
179aa5a2c4 6/ Removing unused code from previous cleanup 
- No module overrides DisplayImeController now
- ShellController injects ShellInit & ShellCommandHandler now

Bug: 238217847
Test: atest WMShellUnitTests
Change-Id: I09ca0aa50e83fa9c4bfe203a0e17cb750d4a5a82
 2022-08-10 05:41:12 +00:00
Winson Chung
9b1f03dc73 Relax strictness of mocks in DisplayLayoutTests 
- The mocking of the resources includes resource values that
  aren't currently tested, but should be mocked to be consistent
  with the other values.  We should treat these as warnings and
  not a test blocker (might be a difference in the version of
  mockito used in studio dev)

Bug: 239892577
Test: Run WMShellUnitTests from sysui studio
Change-Id: I03594b6fb0889f29124882a1f61d7b94b4f90b55
 2022-08-10 05:31:40 +00:00
Hongwei Wang
20daf798f9 Merge "Ensure PiP window visible after fold/unfold device" into tm-qpr-dev am: 1a51c35170 am: 43dfd5a9aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572042

Change-Id: I95bb32ebc5ba4319a00e08eaccf598c2b15ef50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 03:00:26 +00:00
Hongwei Wang
43dfd5a9aa Merge "Ensure PiP window visible after fold/unfold device" into tm-qpr-dev am: 1a51c35170 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572042

Change-Id: I220cd4306a97e2d49be6f39a56d7f26a47416a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 02:34:03 +00:00
Hongwei Wang
1a51c35170 Merge "Ensure PiP window visible after fold/unfold device" into tm-qpr-dev 2022-08-10 02:16:30 +00:00
Automerger Merge Worker
2c7fff3cfa Merge "Merge changes from topic "shell_command_handler" into tm-qpr-dev am: be8ad35238" into tm-qpr-dev-plus-aosp am: dcb17446f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19230675

Change-Id: I5240ae7ee6f0c89983d6ff1347732fe2e9624859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 00:42:55 +00:00
Winson Chung
2b7ad8c495 Merge changes from topic "shell_command_handler" into tm-qpr-dev am: be8ad35238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19230675

Change-Id: Ie2e1f3515718036bcdc41d67612cf8f40cb93cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 00:21:04 +00:00
Winson Chung
be8ad35238 Merge changes from topic "shell_command_handler" into tm-qpr-dev 
* changes:
  5/ Fix inverted dependency for ShellCommandHandler
  4/ Separate construction and initializing in a few more controllers
 2022-08-09 23:23:59 +00:00
Hongwei Wang
4f3138bea7 Ensure PiP window visible after fold/unfold device 
We used to do only PipTaskOrganizer#scheduleResizePip without commiting
PipTaskOrganizer#scheduleFinishResizePip upon display change.

Bug: 241961056
Test: Enter PiP in unfolded state then fold the device
Test: atest WMShellUnitTests:PipControllerTest
Change-Id: I1c72c5e6016cd19017b43a8df583e730f15619a1
 2022-08-09 16:00:57 -07:00
Shan Huang
8698cfbae4 Fix back to home animation restarts on a second swipe. 
If a second swipe starts before a back to home animation finishes, it's
possible for subsequent MOVE events to start another back animation.
The fix is to only start back animation when the swipe's DOWN event is not
rejected.

Bug: 240109403
Fixes: 240109403
Test: Follow repro steps in 240109403#10 and make sure a second
animation cannot be started.
Test: BackAnimationControllerTest

Change-Id: Id2a5fb00f632fb9be175ef10cad7fea511d09ae0
 2022-08-09 22:30:49 +00:00
Mateusz Cicheński
792fd0c911 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 am: d06d3cd4a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I321a77e55ca7921347c551baa469e317c08447dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:24:00 +00:00
Mateusz Cicheński
d06d3cd4a9 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I4ff99b5c2f12070cd659b96076df46a92a6cdfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:14:23 +00:00
Mateusz Cicheński
6bd105d566 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev 2022-08-09 17:53:55 +00:00
Chilun Huang
bc42fa7c43 Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev am: 3d3bf180c4 am: 903c1e08cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19533592

Change-Id: I4745ae3367a0b1ba1de1a879012d39727801d5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 12:41:37 +00:00
Chilun Huang
903c1e08cb Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev am: 3d3bf180c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19533592

Change-Id: Ic81dc75bb5cecb44fb4964e77ccec3230fb7232d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 12:24:28 +00:00
Chilun Huang
3d3bf180c4 Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev 2022-08-09 12:06:03 +00:00
Jeff Chang
a032a54f07 Merge "Exit split-screen if one of the splits is empty" into tm-qpr-dev am: e4b7302acc am: b6d79f597c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19523989

Change-Id: I3402f472dc1abd6e588e5d547565e3bedcd22d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 05:35:30 +00:00
Jeff Chang
b6d79f597c Merge "Exit split-screen if one of the splits is empty" into tm-qpr-dev am: e4b7302acc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19523989

Change-Id: I5f576ec82c3c357331e496d79803ddb0ac36936d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 05:09:48 +00:00
Jeff Chang
e4b7302acc Merge "Exit split-screen if one of the splits is empty" into tm-qpr-dev 2022-08-09 04:50:29 +00:00
TreeHugger Robot
be2ccae46b Merge "Show task background surface" into tm-qpr-dev am: 7e8d76adf0 am: f3151b8cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19542257

Change-Id: I5f294a57025b109e4a78df243073565221fc71f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 03:56:06 +00:00
TreeHugger Robot
f3151b8cde Merge "Show task background surface" into tm-qpr-dev am: 7e8d76adf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19542257

Change-Id: Iff84ca3041e390fd253346932b7409da5eb0caaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 03:36:54 +00:00
TreeHugger Robot
7e8d76adf0 Merge "Show task background surface" into tm-qpr-dev 2022-08-09 03:16:13 +00:00
Mateusz Cicheński
2c0fb89e1d Update the min/max allowed pip size on aspect ratio change. 
Test: manually, open YT app, play video go to pip and expand with double tap, close pip
then go to Maps app, start nagivating, enter pip and epand with double tap - no stretching
Bug: 241400465

Change-Id: Ie061be5ed15611b3b6917d084a13f5ee1eba7e3c
 2022-08-08 20:09:25 +00:00
Mady Mellor
4c1a20e1e2 Merge changes from topic "mm-bubble-updates" into tm-qpr-dev am: 7e347d7e82 am: a6e73838aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505611

Change-Id: I8c51463175e63f26bf4e340b6ed51227e8d80f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 18:12:43 +00:00
Mady Mellor
a6e73838aa Merge changes from topic "mm-bubble-updates" into tm-qpr-dev am: 7e347d7e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505611

Change-Id: Iffc084116f049f24e8fdd4aa3f1dad7cafb5695c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 17:55:06 +00:00
Mady Mellor
7e347d7e82 Merge changes from topic "mm-bubble-updates" into tm-qpr-dev 
* changes:
  If the update is non-interruptive don't re-bubble it
  Don't bubble things when we shouldn't
  Ignore updates to bubbles that aren't from the system
 2022-08-08 17:36:27 +00:00
Jerry Chang
2bcf36ff95 Merge "Fix no action menu for split pairs in overview panel" into tm-qpr-dev am: e7b58c4754 am: 2c84df5716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19499673

Change-Id: I72f679b401858ab4c56183d73c0b0de34ac9d369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:15:57 +00:00
Jerry Chang
2c84df5716 Merge "Fix no action menu for split pairs in overview panel" into tm-qpr-dev am: e7b58c4754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19499673

Change-Id: I8a13bdb4298dab5fa657787f5859bfb668b7441a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:55:34 +00:00
Jerry Chang
e7b58c4754 Merge "Fix no action menu for split pairs in overview panel" into tm-qpr-dev 2022-08-08 14:38:13 +00:00
Jerry Chang
80f3eae51f Merge "Prevent updating invlid child task surfaces in the sync queue" into tm-qpr-dev am: 3d8e5f7e5a am: a5f2118f33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19534870

Change-Id: I1aa35044151037fbf685eb7a6ce70bfb1cf171f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:12:05 +00:00
Jerry Chang
a5f2118f33 Merge "Prevent updating invlid child task surfaces in the sync queue" into tm-qpr-dev am: 3d8e5f7e5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19534870

Change-Id: Iac665038366c30eb1e3c752bd55ddf1d337a3970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 13:26:09 +00:00
Jerry Chang
3d8e5f7e5a Merge "Prevent updating invlid child task surfaces in the sync queue" into tm-qpr-dev 2022-08-08 12:59:42 +00:00
Jeff Chang
9236649034 Exit split-screen if one of the splits is empty 
Unusual use cases result in the split being empty.The case happens if
the intent is the same app but not support multi-instance, we should
exit split and expand that app as full screen.

Moreover, apply the same evicts logic from startShortCut to startTask
on this CL.

Bug: 235193477
Test: Launch Google calendar and drag the app to split screen
Change-Id: I1081aaa8303a551f140668c953cd2fd7c4dd3c54
 2022-08-08 18:08:39 +08:00
Jerry Chang
31fa86cdb3 Fix no action menu for split pairs in overview panel 
The splitting tasks will be reparented to RecentAnimationSplitTasks
overlay layer in order to animate them together. However, the other
animating apps should also be placed to the same overlay layer so all of
them can be layered properly during the transition.

Fix: 239630217
Test: action menu shows above split pairs in overview panel
Change-Id: Idf4038fe575e37cdf9db16ba672208df45160ec1
 2022-08-08 09:38:57 +00:00
TreeHugger Robot
2280b3a69e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-08 07:33:17 +00:00
Jerry Chang
7be7140e02 Merge "Use the proper transaction when finishing a split screen transition" into tm-qpr-dev am: a2227ca9b0 am: 2cb2a5b825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416506

Change-Id: I4b7e499a738d792f74b7955fc2318f7e1bd5cc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 04:38:08 +00:00
Jerry Chang
2cb2a5b825 Merge "Use the proper transaction when finishing a split screen transition" into tm-qpr-dev am: a2227ca9b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416506

Change-Id: I807ef88a1672ee0ec3a076b0a13af36db805824d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 04:20:29 +00:00
Chilun Huang
0b6fe5788c Prevent new instance if drop on split-screen with the same app 
Avoid apply MULTIPLE_TASK if launching the same activity on
split-screen.

Bug: 241181313
Test: atest WMShellUnitTests
Change-Id: If8a82336044047cf0abd05cab940680269e4ec5f
 2022-08-08 12:06:34 +08:00
Jerry Chang
a2227ca9b0 Merge "Use the proper transaction when finishing a split screen transition" into tm-qpr-dev 2022-08-08 04:04:12 +00:00
Bill Yi
bb2db874ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4622e254c4886b4cf25c1eaada9878b118b1f52e
 2022-08-07 03:28:53 -07:00
Winson Chung
38caa7a7df 5/ Fix inverted dependency for ShellCommandHandler 
- Instead of ShellCommandHandler referencing the controllers that it
  needs to dump/call on, invert it so that controllers register a
  dump/command callback when they are initialized

Test: atest WMShellUnitTests
Test: atest SystemUITests
Test: adb shell dumpsys activity service SystemUIservice WMShell
Test: adb shell dumpsys activity service SystemUIservice WMShell splitscreen <cmd>
Test: adb shell dumpsys activity service SystemUIservice WMShell help
Bug: 238217847
Change-Id: I673e5f7dd11ed7af326d52da8e793356169f1d8f
 2022-08-07 04:41:40 +00:00