Jerry Chang
3090e91f00
Merge "Make sure to release split layout when returning to home" into tm-dev am: c3cd94f727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17399124
Change-Id: Ifb63b92b2b7a64380519b2ca18d65ddfc16328db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 00:42:08 +00:00
Jerry Chang
c3cd94f727
Merge "Make sure to release split layout when returning to home" into tm-dev
2022-03-31 00:37:38 +00:00
Hongwei Wang
26f3ccc4bd
Merge "Deprecate getSfInstance usage in PiP component" into tm-dev am: b68626be54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326024
Change-Id: I7d90d179167999c297029c20c089284e3037a2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 00:23:44 +00:00
Wei Sheng Shih
5116b59993
Merge "Use WeakReference for the TaskSnapshotWindow in inner Window." into tm-dev am: 91da83b715
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17291306
Change-Id: I7539f58fba614d282d6eebffef6c8d3f93745606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 00:21:01 +00:00
Hongwei Wang
b68626be54
Merge "Deprecate getSfInstance usage in PiP component" into tm-dev
2022-03-31 00:12:04 +00:00
Wei Sheng Shih
91da83b715
Merge "Use WeakReference for the TaskSnapshotWindow in inner Window." into tm-dev
2022-03-30 23:59:22 +00:00
Mady Mellor
69175bc83b
Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev am: 8649b5088a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17390549
Change-Id: I81356c547c3946a7e72347d7b2e72f3a14cadc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 23:13:50 +00:00
Mady Mellor
8649b5088a
Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev
2022-03-30 23:03:18 +00:00
Hongwei Wang
b3319339d2
Merge "Handle PiP shadow radius in WMShell" into tm-dev am: b2a5b198cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17456722
Change-Id: I8139bf9beecb75d27c12a27152bec007ae298735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 22:26:41 +00:00
Hongwei Wang
b2a5b198cd
Merge "Handle PiP shadow radius in WMShell" into tm-dev
2022-03-30 22:23:51 +00:00
Nataniel Borges
ccd6711dbf
Merge "Wait for correct surface to disappear on transition" into tm-dev am: a8acc4954d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17472004
Change-Id: Ibe14826902cbc2185dd477ee0306720c4aa837d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 21:48:23 +00:00
Hongwei Wang
74092d1e49
Deprecate getSfInstance usage in PiP component
...
- Deprecated also the custom animation handler in PhysicsAnimator
- Ensures the transactions within PiP have VsyncId being set
Bug: 222697646
Test: verify PiP functionalities still work
Change-Id: Ib9a9bab2ffdc11b887271f4a05ee9953865db8b1
2022-03-30 12:50:54 -07:00
Nataniel Borges
a8acc4954d
Merge "Wait for correct surface to disappear on transition" into tm-dev
2022-03-30 15:57:43 +00:00
Shan Huang
129fb50941
Merge "Fix back taking multiple swipes." into tm-dev am: 342dccd988
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452931
Change-Id: I415d6dfc0857ab3e934ec9bda3926eeaa5878e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 15:06:53 +00:00
Shan Huang
342dccd988
Merge "Fix back taking multiple swipes." into tm-dev
2022-03-30 15:00:45 +00:00
TreeHugger Robot
fe07a1029e
Merge "Enable passing shell transition tests" into tm-dev am: 8599104286
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17401040
Change-Id: Ied56660c8598ff4a903083e3a9350d20860c6307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:50:12 +00:00
Jerry Chang
b3d0379faa
Make sure to release split layout when returning to home
...
When returning to home from recent apps, the splitting tasks were
already hidden while performing the recent transition, so dismiss split
screen directly without requesting dismiss transition. Also reorder to
make sure it collects all clean-up operations before finishing the
transition.
Fix: 226682648
Bug: 206487881
Test: verify with the repro steps of the bug
Change-Id: I05e7ae6fa26631203d652ccb532fb57f532794d7
2022-03-30 06:52:18 +00:00
Mady Mellor
bd04e7d58f
Use KeyguardStateController to listen for unlocked shade state
...
Using keyguard state controller allows us to check the occlusion
state and hide / show based on that as well.
Test: manual - have screensaver turn on and ensure bubbles are hidden
Test: atest BubblesTest NewNotifPipelineBubblesTest
Bug: 223913857
Change-Id: I29992ed76c7cdd4e99b4920849c143f6520f9c42
2022-03-30 00:24:40 +00:00
Shan Huang
83e901d8d7
Fix back taking multiple swipes.
...
Bug: 226417634
Bug: 226723586
Test: Try swiping back on multiple devices. It seems it's easier to
repro on bluechip devices. A good test case for me was to bring up and
dismiss all apps folder repeatedly on a p22 device.
Change-Id: I4dc5f5ee1f67822206a5e0442f26a52114cf63f0
2022-03-29 17:28:41 +00:00
Nataniel Borges
786e62ef54
Enable passing shell transition tests
...
- App close: with home / with back
- Launch app: cold / warm / from overview
- Bubbles: expand / launch / dismiss
Bug: 214452854
Bug: 213852103
Bug: 219690120
Bug: 217777115
Bug: 205288792
Fixes: 219693385
Fixes: 219688533
Fixes: 218604389
Test: atest FlickerTests:com.android.server.wm.flicker.close
Change-Id: Ib9b290baac911d42fdc8ac87755fd8df98fdb272
2022-03-29 16:46:15 +00:00
Colin Cross
fd91137818
Merge "Add kotlin-annotations to WindowManager-Shell" am: b8e11a0afd am: 21b19f0f4f am: 3ba75e7300 am: 9a92d62767
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031024
Change-Id: I0e6bbde7832b29f58a5bc998ade7f7c2b58a789d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:41:32 +00:00
Colin Cross
9a92d62767
Merge "Add kotlin-annotations to WindowManager-Shell" am: b8e11a0afd am: 21b19f0f4f am: 3ba75e7300
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031024
Change-Id: I378d8f29f6a8686f505ea5f46bad880bb5c05caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:30:07 +00:00
Nataniel Borges
9b6e35749e
Wait for correct surface to disappear on transition
...
Waiting for the wrong surface makes the transition crash
Fixes: 227308870
Test: atest ExitPipViaExpandButtonClickTest
Change-Id: I3be2da3c344301586cc61201b962ffce3937e77d
2022-03-29 13:40:34 +00:00
Kholoud Mohamed
d705e2c8ae
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class"
2022-03-29 11:01:20 +00:00
Jerry Chang
64d76ce090
Merge changes from topic "splitscreen_singletop" into tm-dev
...
* changes:
Consolidate split screen rotation in shell transition
Add a single-top root task for split screen
2022-03-29 02:13:29 +00:00
Jerry Chang
d426553663
Merge changes from topic "splitscreen_singletop"
...
* changes:
[automerge] Consolidate split screen rotation in shell transition 2p: 31838fb8dd 2p: 1eab1cfdc3
[automerge] Consolidate split screen rotation in shell transition 2p: 31838fb8dd
Consolidate split screen rotation in shell transition
2022-03-29 02:13:28 +00:00
Jerry Chang
3f9e3b01d6
Merge changes from topic "splitscreen_singletop"
...
* changes:
[automerge] Add a single-top root task for split screen 2p: d6b42472ea 2p: 24550bb4ad
[automerge] Add a single-top root task for split screen 2p: d6b42472ea
Add a single-top root task for split screen
2022-03-29 02:13:28 +00:00
Sebastián Franco
07a0cd3db8
Merge "Brighten theme-icons when in Dark mode and add dark color for taskbar" into tm-dev am: 97a605b1d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004229
Change-Id: Iadf7b2d77cfcf92e3ee0f3b19dd024f65c9bf0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:26:08 +00:00
Sebastián Franco
97a605b1d1
Merge "Brighten theme-icons when in Dark mode and add dark color for taskbar" into tm-dev
2022-03-29 00:00:33 +00:00
Hongwei Wang
2708c3a74d
Handle PiP shadow radius in WMShell
...
Deprecate also the shadow radius for PiP in Task
Bug: 206508708
Test: Verify the PiP enter/exit/move/resize transitions
Change-Id: I8ff83dd4e626a3455373fed6c908cf131ecae8fe
2022-03-28 16:43:46 -07:00
Vadim Caen
09f7f6f69b
Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-dev
...
* changes:
Remove callback before WindowState removal
Improve startBackNavigation stability
2022-03-28 18:53:26 +00:00
Vadim Caen
7983db27f0
Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8"
...
* changes:
[automerge] Improve startBackNavigation stability 2p: 6a074eca5c 2p: bde88441fa
[automerge] Improve startBackNavigation stability 2p: 6a074eca5c
Improve startBackNavigation stability
2022-03-28 18:53:26 +00:00
Colin Cross
3ba75e7300
Merge "Add kotlin-annotations to WindowManager-Shell" am: b8e11a0afd am: 21b19f0f4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031024
Change-Id: I740e4f08d4eba1b0488c0218044024a5ad591ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 18:47:12 +00:00
Colin Cross
b8e11a0afd
Merge "Add kotlin-annotations to WindowManager-Shell"
2022-03-28 18:07:14 +00:00
TreeHugger Robot
42ce2e6cab
Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into tm-dev am: 7436573ad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400027
Change-Id: Ibfa3f4ebbbc83cf8eb70a0e2b0d7a9617d549dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 11:28:49 +00:00
TreeHugger Robot
7436573ad9
Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into tm-dev
...
* changes:
Fix NPE when PiP actions, but no close action set
Fix gravity issue when enabling expanded PiP (TV)
Fix orientation change between PiPs when collapsed
2022-03-28 11:26:31 +00:00
TreeHugger Robot
9a7a3f70e1
Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5"
...
* changes:
[automerge] Fix orientation change between PiPs when collapsed 2p: 84dedaffac 2p: 881d7db718
[automerge] Fix orientation change between PiPs when collapsed 2p: 84dedaffac
Fix orientation change between PiPs when collapsed
2022-03-28 11:26:31 +00:00
Tony Huang
50faf89e94
Merge "Fix NPE when rotation after split dismissed" into tm-dev
2022-03-28 09:41:26 +00:00
Tony Huang
4561e829f0
Merge changes from topic "presubmit-am-9124f8c741194f318a8638911cb53b3e"
...
* changes:
[automerge] Fix NPE when rotation after split dismissed 2p: b5594c6538 2p: 049f0edb63
[automerge] Fix NPE when rotation after split dismissed 2p: b5594c6538
Fix NPE when rotation after split dismissed
2022-03-28 09:41:25 +00:00
Treehugger Robot
952326b9cf
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-28 06:29:55 +00:00
wilsonshih
c8da7519c5
Use WeakReference for the TaskSnapshotWindow in inner Window.
...
Use WeakReference for the TaskSnapshotWindow so it can be clear at GC.
Also clear the TaskSnapshotWindow reference in
mStartingWindowRecords since it should be removed immediately.
Still observer the native Binder reference could hold the reference to
the TaskSnapshotWindow$Window object, from the local test it can be
released after force GC(need to trigger on system_server and systemUI).
So at least with this patch, TaskSnapshotWindow object can be released
immediately.
Bug: 225363815
Test: open several tasksnapshot starting window, verify the memory can
be released on perfetto.
Test: atest TaskSnapshotWindowTest StartingSurfaceDrawerTests
Change-Id: Iaa0a266c2c6756cef24d92cde57a6debc947e133
2022-03-28 12:18:48 +08:00
Bill Yi
cf26612579
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia6249741219e3c3890c1dd2c04edc30a4a5c5f83
2022-03-27 02:21:49 +00:00
Bill Yi
541d27c599
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I881eb98e260fed0895bb7748083c2726435c5c07
2022-03-27 02:20:26 +00:00
Tiger Huang
72bb62d920
Merge "Send InsetsState to the client via IWindow#resized" into tm-dev am: 5b19a1584a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352245
Change-Id: Icb1133a84c150eaa292b63b97ba2b65b88d6b005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-26 04:14:45 +00:00
Tiger Huang
5b19a1584a
Merge "Send InsetsState to the client via IWindow#resized" into tm-dev
2022-03-26 03:50:44 +00:00
TreeHugger Robot
a758c8b6dc
Merge "Introduce TaskView.setObscuredTouchRegion." into tm-dev am: 3ab801d3ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323498
Change-Id: I902dde831a03ecad17a57461c288f848017f1bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-26 02:20:53 +00:00
TreeHugger Robot
3ab801d3ca
Merge "Introduce TaskView.setObscuredTouchRegion." into tm-dev
2022-03-26 02:04:15 +00:00
Mady Mellor
0d4f344b91
Merge "Make sure to update the manage button click listener after rotation" into tm-dev am: e8756a5689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391540
Change-Id: I4e348d15e2a49b4ac435bcc179310a6956c95cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:09:26 +00:00
Mady Mellor
e8756a5689
Merge "Make sure to update the manage button click listener after rotation" into tm-dev
2022-03-25 17:03:43 +00:00
kholoud mohamed
284246f7e6
RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
...
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
(cherry picked from commit b7aedc6f3d )
Merged-In: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
2022-03-25 16:14:51 +00:00