summaryrefslogtreecommitdiff
path: root/libs/WindowManager
AgeCommit message (Collapse)Author
2022-02-14Add leash check in PipTaskOrganizer#fadeExistingPipHongwei Wang
Bug: 197319184 Test: N/A, not sable to reproduce the issue, adding protection based on the stack trace Change-Id: I6363dd425eac6332f59fe1fed074c6518227580f (cherry picked from commit 4353053c87a8512f66f93c6d1b7583b584d21e71) Merged-In:I6363dd425eac6332f59fe1fed074c6518227580f
2022-02-10DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being ↵Mady Mellor
out of sync If onBackPressed was used while the stack was expanded, it was calling setExpanded on BubbleStackView (BSV) and NOT BubbleData. This results in BSV and BubbleData being out of sync which can lead to incorrect behavior. (e.g. using individual bubble dismiss method instead of the stack dismiss method). Test: atest BubblesTest NewNotifPipelineTest Fixes: 217361258 Change-Id: I748fdd49626acaa0e986a9d8038039cada6faa60 Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60 (cherry picked from commit 8f368c53585dfa201fd5bb30e62b02ac8b739254) Merged-In:I748fdd49626acaa0e986a9d8038039cada6faa60
2022-01-21PiP: Disable enterSplit for now.Ben Lin
Bug: 206645013 Test: Enter split button no longer appears Change-Id: I6237dd1c88f50733ab24e45806c413d5777032e9 (cherry picked from commit eab029ce8d58e1d6d4a5e29959b424220f2106d8) Merged-In:I6237dd1c88f50733ab24e45806c413d5777032e9
2022-01-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iaf42323ce36547d1209961307cdc93c65a64066e
2022-01-13Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-devMariia Sandrikova
* changes: DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control." DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom."
2022-01-13DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for ↵Mariia Sandrikova
client-server..." Revert submission 16468379 Reason for revert: Feature development is moving to T. Reverted Changes: Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro... Id6be4a954:Enable a camera app compat control on Large screen... I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-... Bug: 206602997 Change-Id: I9ad876043fd61f708a8f468fffd1ef371bfa0866
2022-01-13DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."Aurimas Liutikas
Revert submission 16468379 Reason for revert: Feature development is moving to T. Reverted Changes: Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro... Id6be4a954:Enable a camera app compat control on Large screen... I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-... Bug: 206602997 Change-Id: I318b89b87cd3b05a3f3dcd428e3d80fe81465011
2022-01-13Merge "Do not override animation when the parent bounds doesn't support ↵Chris Li
split" into sc-v2-dev
2022-01-13Merge "Return non-null empty list if the controller is already invalidated" ↵Winson Chung
into sc-v2-dev
2022-01-13Merge "Active container should contain non-finishing activity" into sc-v2-devChris Li
2022-01-12Do not override animation when the parent bounds doesn't support splitChris Li
Without this cl, we always override animation as long as there is any organzied TaskFragment. And users may see different animation on the same small screen before and after they have unfold and fold. The idea is to only register the remote handler if the app currently has at least one split rule that can fit the current Task bounds. When there can be split, we want to always override the animation to make it consistent. When there won't be any split, we want to allow app to override animation, so they can still provide the same experience as normal phone on small screen. Fix: 207804116 Fix: 196173550 Test: manual test with fold/unfold Change-Id: I3ae194f89b35afc5734338fd3bb350e0cd364c85
2022-01-12Active container should contain non-finishing activityChris Li
Without this cl, the app will crash if a TaskFragment is closing when the new top TaskFragment doesn't contain any non-finishing activity (which should be closed later as well). Before, when #cleanupContainer(), we will also update the new top active container, but we didn't check if it contain any non finishing activity. Fix: 212355346 Test: test with Settings with three finger click Change-Id: I26538b85f1cf8e618a3f1ee6abada5a9f77f2b16
2022-01-12Merge "Avoid NPE while drag divider bar" into sc-v2-devTony Huang
2022-01-11Return non-null empty list if the controller is already invalidatedWinson Chung
- 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-11Merge "Fix possible NPE" into sc-v2-devMady Mellor
2022-01-11Avoid NPE while drag divider barTony Huang
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-11Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-devWinson Chung
2022-01-11Ensure only single pip dismiss magnetized target existsWinson Chung
- 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-10Fix possible NPEMady Mellor
Test: manual - make sure dot works normally / no regression Bug: 213027822 Change-Id: I819f73cb8c7d613796c3d3bb4b55b80b337c6126
2022-01-09Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-01-09Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-01-08Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifab08e6f5047b918b9d9eb318085f9e281b7fb4a
2022-01-08Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I97d5ca669c13fda5f3c25b97f42ee359953fe172
2022-01-07Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size ↵Mariia Sandrikova
compat controls." into sc-v2-dev
2022-01-05Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-devTony Huang
2022-01-04Fix updateRecentTasksSplitPair unexpectlyTony Huang
While split pair switching, split remain as active so it might record new bounds with old top task pair unexpectly. Fix this by set flag to false on startTasksWithLegacyTransition and reset to true after remote animation finished. Fix: 213128767 Test: manual Test: pass existing tests Change-Id: I42b4c79558467dec23b789a3b5cc2f8f38cd1c36 Merged-In: I42b4c79558467dec23b789a3b5cc2f8f38cd1c36
2022-01-03Fix toucn unresponsive after half fold in splitTony Huang
After fold animation finished, it will always set null bounds crop to surface and cause root task surface bounds abnormal. Fix by ignoring root task surface in StageTaskUnfoldController because it would not effect animation. Fix: 211132158 Test: manual Test: pass existing tests Change-Id: Iece8f7e7d437bdff1cf9e738df3acc075729b993
2021-12-30Merge "Adding additional log to track down crash" into sc-v2-devTreeHugger Robot
2021-12-30Adding additional log to track down crashWinson Chung
Bug: 206648922 Test: Manual Change-Id: If34dfc40183729a942e3c8433f3b5ee00ad8e079
2021-12-29Fix launcher crash and correct split behaviorTony Huang
Fix laucher crash while swipe up in split screen. This issue caused by launcher will request 3 runningTaskInfos to do some action, however, it cannot ensure 3 info actually include both splits because only one got focused. Fix this by WA on RunningTasks, update the adjacent task of the focus one too to make sure both split task will be top two while calling getTasks. Correct some split behavior while startTasksWithLegacyTransition too. Bug: 211716649 Test: pass existing tests. Test: Make many split pair then swipe up Change-Id: I2e6deb2ac607b454ca8fc760f0399135a1e8e901 Merged-In: I2e6deb2ac607b454ca8fc760f0399135a1e8e901
2021-12-23[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls.Mariia Sandrikova
Before this change, margin between a hint and a camera compat control was smaller than required 8 dp while for a size compat control it was bigger than 8dp (since ag/16420818). This change makes them consistent and also simplifies layout definition for the size compat button by declaring margings explicitly rather than including them in width and height implicitly. Test: manual Bug: 206602997 Change-Id: I09839e764d2c8904954a594433888bfdc21d56ba
2021-12-23Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2021-12-22Merge "Make sure launcher side can animate divider" into sc-v2-devTony Huang
2021-12-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2e74699a2c1affb6982cf1142cfaa1b199fc93c0
2021-12-21Merge "Add debug logging for null task list" into sc-v2-devWinson Chung
2021-12-21Add debug logging for null task listWinson Chung
Bug: 206648922 Test: Adding logs Change-Id: If2eec374eafd1287253404ba9d6af00612d9be5c
2021-12-21Make sure launcher side can animate dividerTony Huang
Fix divider target should pass to remote animation runner and add mIsDividerRemoteAnimating flag to eusure launcher side controlling the divider surface and shell side do not controll until remote animation finished. Bug: 202914644 Test: manual Test: pass existing tests Merged-In: I6411a609268274355a38c72fcb5d628b76b2340c Change-Id: I6411a609268274355a38c72fcb5d628b76b2340c
2021-12-18Merge changes from topic "camera-compat" into sc-v2-devMariia Sandrikova
* changes: [3/n] Camera Compat UI: Add a camera compat control. [2/n] Camera Compat UI: Add interfaces for client-server communication.
2021-12-17[3/n] Camera Compat UI: Add a camera compat control.Mariia Sandrikova
Test: atest WMShellUnitTests Bug: 206602997 Change-Id: Id9b9a89303387c4ac797fc1382967151a13d38ef
2021-12-17[2/n] Camera Compat UI: Add interfaces for client-server communication.Mariia Sandrikova
Changes: - Listens to changes from the client coming through IActivityClientController#requestCompatCameraControl to ActivityRecord#updateCameraCompatState - ActivityRecord#updateCameraCompatState sends updated state via TaskInfo to WM Shell - ITaskOrganizerController#updateCameraCompatControlState to dispatch the user interactions with the control from WM Shell triggers callback to ActivityRecord#updateCameraCompatStateFromUser - ActivityRecord#updateCameraCompatStateFromUser remembers the user's choice and asks client to apply treatment through ICompatCameraControlCallback Feature is guarded with config_isCameraCompatControlForStretchedIssuesEnabled Test: atest WMShellUnitTests:ShellTaskOrganizerTests, atest WmTests:ActivityRecordTests Bug: 206602997 Change-Id: I083aa6718bd67456bedd9444e9b78740c041f870
2021-12-15Merge "Fix a potential NPE" into sc-v2-devMady Mellor
2021-12-14Fix a potential NPEMady Mellor
I've never been able to reproduce this and the stack traces I have of it don't match existing code, but looking at the code paths I think this could still happen, there are a couple of places where the mMagnetizedBubbleDraggingOut gets nulled out (e.g. on child removed) I've tried to repro by: - canceling the bubbles in the middle of dragging to dismiss - trying to snap the bubble back and then drag it again to dismiss (snap back also nulls it) I see a recent stack of it in pitot so I think it's worth adding the null check. Test: atest ExpandedAnimationControllerTest Bug: 201866808 Change-Id: Ib9425a2b63410c95fddaaea59761dfd18557ed54
2021-12-14Merge "Update PiP exclusion bounds in TaskBarDelegate." into sc-v2-devBen Lin
2021-12-14Update PiP exclusion bounds in TaskBarDelegate.Ben Lin
Navigation bar is only created and used when taskbar is not available. When taskbar is available, we will use TaskbarDelegate to be the one responsible to update pip exclusion bounds as PiP moves. Bug: 210038947 Test: Unfold, enter PiP, stash - PiP can be yanked out Change-Id: I8f789d3b603e41c3d15494afdadce2cddc4d4b9c
2021-12-14Merge changes I3c7a2886,Ib959f44b into sc-v2-devMady Mellor
* changes: Update dropzones to match the size of the existing split Fix how task info is retrieved for split screen
2021-12-14Merge "Mark bubbles as updated when they're added to the stack" into sc-v2-devMady Mellor
2021-12-13Update dropzones to match the size of the existing splitMady Mellor
The dropzones were always split exactly in half on the screen which looks weird if you adjust the split to a different size and then drag new apps into split. This adjusts the dropzones to match the size of the existing split. It also fixes a bug where the existing split bounds weren't being properly calculated in the policy so the drag and drop highlight wouldn't switch to the correct side until you passed through the middle instead of where the divider actually is. Bug: 209504662 Test: manual - 1) have apps in split 2) adjust the divider 3) start dragging a new app into split, pass across the divider => the highlight should immediately switch => the highlight should match the size of the existing split 4) test in landscape & portrait Change-Id: I3c7a288625ad766d0c467d713a451fe8bfc1d669
2021-12-13Fix how task info is retrieved for split screenMady Mellor
Previously this was grabbing the top two tasks from the task list, but this isn't guaranteed to be what's on the screen. Instead, when already in split, use the taskInfo from the split controller. Test: manual - 1) have stuff in split 2) keep dragging different apps into split => verify the app icon shown in the non highlighted side matches the app on that side Bug: 209504662 Change-Id: Ib959f44bc9eaebfb5e3f640d69cb6f3ddccedfcf
2021-12-13Merge "Block split Activity in lock task mode" into sc-v2-devTreeHugger Robot
2021-12-12Merge "[1/n] Camera Compat UI: Refactor size compat mode UI controller." ↵Mariia Sandrikova
into sc-v2-dev