Commit Graph

5569 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
631d95d6c1 Merge "Move deferred task info logic to callback" into tm-qpr-dev am: 53e66f832d am: 52f6f11352
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19374147

Change-Id: I8466dcacc933bfcb2786c2d3a987b70776066c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 08:44:38 +00:00
TreeHugger Robot
52f6f11352 Merge "Move deferred task info logic to callback" into tm-qpr-dev am: 53e66f832d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19374147

Change-Id: If7af9d39bc47e8fb84dc519e237dbba23c599c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 08:24:42 +00:00
TreeHugger Robot
53e66f832d Merge "Move deferred task info logic to callback" into tm-qpr-dev 2022-08-06 08:08:59 +00:00
Winson Chung
184a4a2d0f Merge "Ensure PipTransitionController initializes in order" into tm-qpr-dev am: 385174345e am: 2c68f322b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539262

Change-Id: Iee6dc83502a1add957c18bdce99d9e6487125756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 02:37:57 +00:00
Winson Chung
2c68f322b0 Merge "Ensure PipTransitionController initializes in order" into tm-qpr-dev am: 385174345e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539262

Change-Id: If3379556251f5eb976fde5695856e72e54c9de14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 02:17:39 +00:00
TreeHugger Robot
714c2de06f Merge "FreeformHandler should just intercept, not claim animations" into tm-qpr-dev am: d4714815f1 am: 88212d5b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19536295

Change-Id: I25b0497a86e04676a5794652517e7d9d2addf811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 01:52:51 +00:00
Mady Mellor
5c5b6218e4 If the update is non-interruptive don't re-bubble it
I haven't been able to reproduce this outside of tests on acloud
devices, but if you visit a bubble for the first time (causes an
update to the notif) and then dismiss it sometimes the user dismiss
can happen before  we get the update back from notification manager
service and the bubble will get re-bubbled incorrectly.

To fix this, if a bubble is in the overflow (or active) and there's
an update to the notification that is non-interruptive, we shouldn't
re-bubble that content because there wasn't a new message, just some
change on the notification.

Bug: 238896626
Test: atest BubblesTest
Test: atest --no-bazel-mode --iterations 20 PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.ExpandAndDragToDismissTest
      (with vadim's changes & other CLc)
Change-Id: If0b7b3d3d1875ddd1df6a1412db8c42456de35c5
2022-08-05 17:20:10 -07:00
Mady Mellor
55524d2a78 Don't bubble things when we shouldn't
I haven't been able to repro these issues outside of tests on
cuttlefish, but I think logically these fixes make sense & seem to
resolve the test issue.

- Ensure non-notifying updates to bubbles in the overflow don't
  clobber the FLAG_BUBBLE state
- onRankingUpdate should only bubble stuff up if it's not active and
  not in the overflow (previously just not active)

Bug: 238896626
Test: atest BubblesTest#testNonInterruptiveUpdate_doesntOverrideOverflowFlagBubble
Test: atest --no-bazel-mode --iterations 20 PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.ExpandAndDragToDismissTest
      (with vadim's changes & another CL)
Change-Id: Id588c1130e62533a23dc931dfb4fe3c92125a905
2022-08-05 17:20:09 -07:00
Mady Mellor
6a2fc4a908 Ignore updates to bubbles that aren't from the system
The new notif pipeline code adds a concept of updates from the system
vs from sysui. Currently bubbles is responding to all updates but
I think we really only care about updates from the system (i.e. from
NotificationManagerService).

Bug: 238896626
Test: atest BubblesTest#testNonSystemUpdatesIgnored
Test: atest --no-bazel-mode --iterations 20 PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.ExpandAndDragToDismissTest
      (with vadim's CLs and a 2nd change to be uploaded)
Change-Id: I3ffd6eb0f0a07448b2117924be514347c6e80b16
2022-08-05 17:20:03 -07:00
Winson Chung
385174345e Merge "Ensure PipTransitionController initializes in order" into tm-qpr-dev 2022-08-05 23:34:46 +00:00
TreeHugger Robot
88212d5b29 Merge "FreeformHandler should just intercept, not claim animations" into tm-qpr-dev am: d4714815f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19536295

Change-Id: Ib5330c3c098242a634020c3bc931bcdf7a6c9b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 23:08:52 +00:00
TreeHugger Robot
d4714815f1 Merge "FreeformHandler should just intercept, not claim animations" into tm-qpr-dev 2022-08-05 22:30:55 +00:00
TreeHugger Robot
facc40b2b8 Merge "Optimizing some icon generation code in bubble" into tm-qpr-dev am: ac622814ba am: b980cc92c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19528335

Change-Id: Iff15694693a68995f9ee2b4e4242adc36af90982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 22:12:04 +00:00
Winson Chung
46a3f2020c Merge "Ensure default and remote transition handlers are first" into tm-qpr-dev am: 5d5cae6cc9 am: f91f652e5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19538820

Change-Id: I1314d126b2eadabb8d9b2d21981977c791781b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 22:11:31 +00:00
TreeHugger Robot
b980cc92c3 Merge "Optimizing some icon generation code in bubble" into tm-qpr-dev am: ac622814ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19528335

Change-Id: Idd0c189c094e5bbccff4789c3a2226013e09c8c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 21:44:04 +00:00
Winson Chung
f91f652e5a Merge "Ensure default and remote transition handlers are first" into tm-qpr-dev am: 5d5cae6cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19538820

Change-Id: I4650e43d11053efcd0b402995e359f865903c9cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 21:42:25 +00:00
TreeHugger Robot
ac622814ba Merge "Optimizing some icon generation code in bubble" into tm-qpr-dev 2022-08-05 21:14:12 +00:00
Winson Chung
5d5cae6cc9 Merge "Ensure default and remote transition handlers are first" into tm-qpr-dev 2022-08-05 21:07:45 +00:00
Winson Chung
df8bbef557 Ensure PipTransitionController initializes in order
- This is the only transition controller that isn't using ShellInit,
  which means that it currently adds itself as a handler too early.

Bug: 238217847
Test: atest PinnedStackTests
Test: atest WMShellFlickerTests:com.android.wm.shell.flicker.pip.AutoEnterPipOnGoToHomeTest
Change-Id: Ia6dd437d52b8e7f249c86ed4b013fcbf04c31265
2022-08-05 20:48:55 +00:00
TreeHugger Robot
fa9025f7a0 Merge "Fix some issues that make caption insets remain" into tm-qpr-dev am: e2823f9a50 am: 550601869a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492314

Change-Id: I3501a9f4373ddcb25b0219db562d0e7345ba5b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 20:00:20 +00:00
TreeHugger Robot
550601869a Merge "Fix some issues that make caption insets remain" into tm-qpr-dev am: e2823f9a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492314

Change-Id: I3294437619a3bf27ecb295dcdfaf1e50ca9d3acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:15:19 +00:00
Winson Chung
cc5e0d2b62 Ensure default and remote transition handlers are first
- When Transitions migrated to ShellInit, the default/remote handlers
  got added after PipTransitionController (which should really also
  use ShellInit (to be fixed in a follow up CL)).  For now, we can
  be explicit about where they should be added in the list.

Bug: 241515409
Bug: 241484248
Test: atest PinnedStackTests
Test: atest WMShellFlickerTests:com.android.wm.shell.flicker.pip.AutoEnterPipOnGoToHomeTest
Change-Id: I696327004e06e7ddd402a509fa18c86c60b244d4
2022-08-05 18:49:47 +00:00
TreeHugger Robot
e2823f9a50 Merge "Fix some issues that make caption insets remain" into tm-qpr-dev 2022-08-05 18:45:00 +00:00
Evan Rosky
c0888dcbfc FreeformHandler should just intercept, not claim animations
There are already animations for most of these operations (eg. in
launcher), so instead of "claiming" the transition animation
and doing nothing, this should just update state (window decor)
and then let other handlers play the animations.

Bug: 241486751
Test: launch app from launcher, go back.
Change-Id: Ic5d01b76c04d6adab484d53d24d1a89b001a4c80
2022-08-05 10:32:44 -07:00
Jerry Chang
4730869154 Prevent updating invlid child task surfaces in the sync queue
The task surface might be released before running in the sync queue for
the case like trampoline launch, so check if the surface is valid before
processing it in StageTaskListener.

Fix: 239490752
Test: atest WMShellUnitTests
Test: no crash when dragging a "clean" shortcut of Files to enter split
Change-Id: I8f927f644149cf9b24f4c9110f8ac745bb558dcd
2022-08-05 03:23:01 +00:00
Sunny Goyal
24f130cbfd Optimizing some icon generation code in bubble
> Generating only one bitmap when creating appIcon
> Extracting the scale during icon generation for main icon
  instead of running icon normalizer again
> Avoiding unnecessary color extraction on main icon

Bug: 238937089
Test: Verified on device
Change-Id: Ia01801f15e5982593852f05c2512d0f1f737f5f7
2022-08-04 09:02:20 -07:00
TreeHugger Robot
3cb6c6d306 Merge "Correct wrong drag destination in dragDividerToDismissSplit" 2022-08-04 15:34:12 +00:00
TreeHugger Robot
eed79bf6ec Merge "Only restash TV PiP if necessary on immediate placement" 2022-08-04 14:22:22 +00:00
Tony Huang
84789855ad Merge "Fix split overlay by drag drop launch" into tm-qpr-dev am: effcf27740 am: 885c0c6431
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19465509

Change-Id: I669c1dd25f95c459311341703f3b177ce0b12416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 05:25:51 +00:00
Jerry Chang
b1e4053c45 Use the proper transaction when finishing a split screen transition
It will restore the shifted split layout after entered overview panel,
this makes sure to update the proper finish transaction so the split
layout will be updated properly after animated the transition.

Also support to modify the finish transaction when a transition got
merged, so we can append clean-up operations for the cases like merging
an enter split screen transition to another handler.

Fix: 238856352
Test: enabled shell transition, verified split layout has been
      shifted/restored properly after re-entering a split pair.

Change-Id: I630c54ed7c25246634c314eb9b2561a8556d8570
2022-08-04 05:15:41 +00:00
Tony Huang
885c0c6431 Merge "Fix split overlay by drag drop launch" into tm-qpr-dev am: effcf27740
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19465509

Change-Id: Ice2dca775ac99de1e495a152683eb47cb9992d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 05:08:41 +00:00
Tony Huang
effcf27740 Merge "Fix split overlay by drag drop launch" into tm-qpr-dev 2022-08-04 04:44:19 +00:00
Chilun Huang
0395d39cfb Correct wrong drag destination in dragDividerToDismissSplit
Correct wrong drag destination in dragDividerToDismissSplit

Bug: 231399943
Test: atest WMShellFlickerTests:DismissSplitScreenByDivider
Change-Id: Iec102381ebb1f2d7da66b8f479d0734c45a5ba73
2022-08-04 12:02:18 +08:00
Chilun Huang
545cce4fba Merge "Add CUJ for switch apps by double tap divider" 2022-08-04 02:32:39 +00:00
Ben Lin
85b360b981 Merge "Don't resize PiP on aspect ratio change if nothing changed." into tm-qpr-dev am: f5b0a3e3f7 am: cd0bb94e98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19484732

Change-Id: Ifed3db690a60ec5b0a5f93ed1c90d6cd49e73138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 21:03:42 +00:00