Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,068 Commits 3 Branches 0 Tags
faecedc2a728478ff01480b6dae02a7bfaef85bb
Commit Graph

4254 Commits

Author SHA1 Message Date
Jerry Chang
223964ba72 Merge "Consolidate animation to show divider bar" into tm-dev am: 56043e3d57 am: 1d0a63f685 am: 98aed8d834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157809

Change-Id: I27d1e28bbbc0434202cb8a6189d5f1c3c39d1d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:31:48 +00:00
Jerry Chang
98aed8d834 Merge "Consolidate animation to show divider bar" into tm-dev am: 56043e3d57 am: 1d0a63f685 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157809

Change-Id: I4a9eadfb3e3349a47bead097502915bc425fe6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:22:23 +00:00
Jerry Chang
56043e3d57 Merge "Consolidate animation to show divider bar" into tm-dev 2022-05-09 10:57:02 +00:00
Jerry Chang
010ce715e4 Consolidate animation to show divider bar 
Add a fade-in animation for showing the divider bar. And make sure it
animates in-sync with task bar by deferring the fade-in animation until
keyguard dismissed.

When quickswitch or overview switch back to a split pair, the launch
split tasks remote animation will get onAnimationCancelled due to the
app transition was handled by recent animation controller. So leaves
divider bar fade-in animation to launcher when the remote animation got
cancelled.

Fix: 229613465
Fix: 208651526
Test: atest WMShellUnitTests
Test: launch a split pair and a fullscreen app, switch from overview or
      quickswitch back and forth between split pair and the fullscreen
      app. Observed divider bar animates in in-sync with task views.
Test: verified divider bar animates in-sync with task bar after keyguard
      dismissed.
Change-Id: I2f9064a089c446711545afda8204557a708545c5
 2022-05-09 04:22:57 +00:00
Tracy Zhou
288599b3fb Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04c8 am: 9e3f03991d am: ace8b6862a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203341

Change-Id: I8d21888eda3ee308c12e365aa91a7dca295c513f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 07:51:10 +00:00
Tracy Zhou
ace8b6862a Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04c8 am: 9e3f03991d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203341

Change-Id: Iaf46e2850ff4ede488df7d3520c8c25766245697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 07:08:21 +00:00
Tracy Zhou
cf134e04c8 Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev 2022-05-07 05:49:50 +00:00
TreeHugger Robot
73c411eca7 Merge "Fix PiP transition ordering" into tm-qpr-dev am: a8b3591b6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18176064

Change-Id: Ic269715f1b9bd36beaed24fcfcfaf6d67a5d162f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 00:02:16 +00:00
Evan Rosky
4f7be5bd52 Fix PiP transition ordering 
First, this cancels the existing pip animation if it is
told to exit. Without this, an exit animation that
starts before an enter animation finishes will have its
state clobbered by the exit's finishTransition call.

Next, make pip-enter transitions queue-up so that they
don't interleave before other queued transitions (very
common during CTS).

Bug: 231150615
Test: atest PinnedStackTests
Change-Id: I7f162c0b1f24ab845770b805c8fae2252814945e
 2022-05-06 13:03:03 -07:00
Tracy Zhou
6cfc16157c Rename navigationBarHeight to navigationBarFrameHeight 
This is used for surfaces

Bug: 200310506
Test: presubmit tests (since there is no behavior change)
Change-Id: I8c17777d14c1e8445ea426d9154580731b10632d
 2022-05-06 19:47:58 +00:00
Arthur Hung
d0d3b9240e Merge "Fix back gesture send to wrong focus window" into tm-dev am: 4bf81d5758 am: dc621522ac am: e437099db4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990066

Change-Id: Iaf29d93850ddf2cbb0eb335855c739675f05b12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 16:14:36 +00:00
Jacqueline Bronger
500df7f0d3 Merge "Add more information to the TV PiP notification" into tm-dev am: b6de832709 am: 762b8b6972 am: 81dbc596ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197863

Change-Id: Iba4a910613740d16195a991ade268124d4819d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 16:14:11 +00:00
Arthur Hung
e437099db4 Merge "Fix back gesture send to wrong focus window" into tm-dev am: 4bf81d5758 am: dc621522ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990066

Change-Id: I687552fca36b4e3d9b7602338fc060a202783a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:56:04 +00:00
Jacqueline Bronger
81dbc596ce Merge "Add more information to the TV PiP notification" into tm-dev am: b6de832709 am: 762b8b6972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197863

Change-Id: I64980d382d9fb6fb56cbd4a1646fb1fe23b0cb89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:55:41 +00:00
Jacqueline Bronger
f03ab21d16 Merge "Close the TV PiP menu when losing window focus." into tm-dev am: 3448bcdbfc am: 2f17d91075 am: ce4372e823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179543

Change-Id: Id507d9c4eb95826e40dabe20d150c5d256f1421e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:46:49 +00:00
Jacqueline Bronger
091eb24c8c Merge "Close the TV PiP menu when losing window focus." into tm-dev am: 3448bcdbfc am: 2f17d91075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179543

Change-Id: Ibee181773c7ec0e0a417bcd565493298e3b4d7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:34 +00:00
Robert Horvath
573bc40c22 Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c am: 6b5a11cf3e am: 046b75f851 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962

Change-Id: I6315ef1f5ed21b8cc8ef8f7c454b7ba398c3ca79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:44:01 +00:00
Robert Horvath
faa548f4af Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c am: 6b5a11cf3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962

Change-Id: Ie365eacc179eab5cd579bb7bdafa25be4ed95120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:42:34 +00:00
TreeHugger Robot
29089f7185 Merge "Add accessibility action menu items for divider" into tm-dev am: 55dd1c3792 am: 8701caa278 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18155923

Change-Id: Iac16501b6bc77beea61df8596bac04b7726a61c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:39:32 +00:00
TreeHugger Robot
63d5b4e528 Merge "Add accessibility action menu items for divider" into tm-dev am: 55dd1c3792 am: 830ba881cb am: 79404d0ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18155923

Change-Id: I1e139c0fd64a93e5c007d9c440e722459a985006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:36:21 +00:00
Arthur Hung
4bf81d5758 Merge "Fix back gesture send to wrong focus window" into tm-dev 2022-05-06 11:12:19 +00:00
Jacqueline Bronger
b6de832709 Merge "Add more information to the TV PiP notification" into tm-dev 2022-05-06 10:39:27 +00:00
Arthur Hung
7d870f9ec2 Fix back gesture send to wrong focus window 
Ensure we could get the proper focused window token what it's during
updating the focus if user touched down on another non-focused window.

It also called `startBackNavigation` when received first move that next
to down event to ensure the `WMS.onPointerDownOutsideFocus` could be
processed first.

Test: atest BackAnimationControllerTest BackNavigationControllerTests
Test: enabled split-screen, trigger back gesture on non-focused window
Bug: 230442550
Bug: 227724016
Change-Id: I81c4f02d43299c03f94dc295bb23ba80d46bded8
Merged-In: I81c4f02d43299c03f94dc295bb23ba80d46bded8
 2022-05-06 03:11:40 +00:00
Jacqueline Bronger
ce4372e823 Merge "Close the TV PiP menu when losing window focus." into tm-dev am: 3448bcdbfc am: 2f17d91075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179543

Change-Id: I7f074fc1731e20aad315f64ffaf51d7b099f594e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 17:40:21 +00:00
Robert Horvath
046b75f851 Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c am: 6b5a11cf3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962

Change-Id: I3d4cab2e5edf03d8fd69399ea7d3421881c02496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 17:31:45 +00:00
Jacqueline Bronger
3448bcdbfc Merge "Close the TV PiP menu when losing window focus." into tm-dev 2022-05-05 16:49:10 +00:00
Robert Horvath
7bea00698c Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev 2022-05-05 16:03:31 +00:00
TreeHugger Robot
830ba881cb Merge "Add accessibility action menu items for divider" into tm-dev am: 55dd1c3792 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18155923

Change-Id: Ib99c500432617e95ba61ed6403af9884dcc9aef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 11:12:42 +00:00
TreeHugger Robot
55dd1c3792 Merge "Add accessibility action menu items for divider" into tm-dev 2022-05-05 10:54:21 +00:00
Jacqueline Bronger
5996319de6 Close the TV PiP menu when losing window focus. 
Bug: 219885877
Test: manual - open a PiP, then long press HOME -> menu should close
Change-Id: I20b255f78e9e21a05a8138ef09ab00cce3f2521c
 2022-05-05 10:43:55 +02:00
Tony Huang
1f69d5221b Merge "Remove stagesplit backup package" into tm-qpr-dev am: 1e2ddcc2b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157294

Change-Id: I8d730af6811facfac64fc03aadfc7485dcf12908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 03:25:20 +00:00
Tony Huang
1e2ddcc2b7 Merge "Remove stagesplit backup package" into tm-qpr-dev 2022-05-05 02:55:02 +00:00
Mateusz Cicheński
8d6e03df0f Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: 56375b707c am: a9c3f08998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I5140a371c535382266ff958df4054e2c3d17f795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:49:45 +00:00
Mateusz Cicheński
085c037c1a Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: dd74651995 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I39e4d8e1af952254e3ef25a7487fea3e3901f09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:42:07 +00:00
Mateusz Cicheński
56375b707c Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I42449831c44dc5a2bb548f725bf4e4636d31b1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:18:16 +00:00
Xiaowen Lei
0b61ab32c6 Merge "Add WM transit types for dream activity." into tm-qpr-dev am: 15e2cd9298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17696084

Change-Id: Ic81a0ee4e60819871a7ee3675aefd8fe19c0d05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 23:08:50 +00:00
Xiaowen Lei
15e2cd9298 Merge "Add WM transit types for dream activity." into tm-qpr-dev 2022-05-04 22:45:17 +00:00
Mateusz Cicheński
3befbcf252 Revert "Move PiP when it occludes a keep clear area with naive a..." 
Revert "Add the extra dependencies to ArcPipController."

Revert submission 17542127-keep_clear_areas

Reason for revert: Keep clear areas implementation is being moved to tm-qpr-dev, removing it from the tm-dev branch.

Test: n/a

Reverted Changes:
I3cbc46170:Move PiP when it occludes a keep clear area with n...
I15ac00f8e:Add the extra dependencies to ArcPipController.

Change-Id: Id7ca9259aaa2a133233d5249717ed5710349d9fc
 2022-05-04 21:01:57 +00:00
Mady Mellor
2deac5bdf8 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev am: e8ee9cd8d4 am: c676e56364 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011489

Change-Id: I9b6c103cd4827c777b13e0ad38f5ec19e3c2a271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:54:27 +00:00
Mady Mellor
89f07928c5 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev am: e8ee9cd8d4 am: 43ce369818 am: 7b8694ba66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011489

Change-Id: Iba00e43a07ecb289aff0c77d09649082ff0a5558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:05:57 +00:00
Mady Mellor
43ce369818 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev am: e8ee9cd8d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011489

Change-Id: Ib1a240a9f0b20b18b72ff58cbf5f1c419e4b5cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:01:50 +00:00
Mady Mellor
e8ee9cd8d4 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev 
* changes:
  If something is suppressed from the notification list don't bubble it
  Tell NoMan to update the auto-expand flag
  Allow SysUI to update BubbleMetadata#FLAG_AUTO_EXPAND_BUBBLE
 2022-05-04 18:00:21 +00:00
Darrell Shi
8176ed8b17 Add WM transit types for dream activity. 
This change adds two WM transit types for opening and closing dream
activities, which allows the system to define transition in and out of
dreams, that are currently being overriden by other transitions.

Set the priority to be just below keyguard transit. The keyguard
occlude/unocclude already correctly handles the dream open/close
animation.

Bug: 222507937
Bug: 220311554
Test: atest WmTests:AppTransitionControllerTest
Test: manually on device by entering and exiting dreams over keyguard,
launcher, and settings. observed animation and relevant types of WM logs.

Change-Id: Iedfa279d56cd9d4c4679cb3b697ee74a98ef727b
 2022-05-04 17:13:52 +00:00
Jacqueline Bronger
c096f52c55 Add more information to the TV PiP notification 
Includes general information as well as the system and app actions (or
media actions if there are no app actions)

Bug: 204173025
Bug: 199490119
Test: manual - check notification content from aosp notification listener

Change-Id: I6a15e443ad8f1fa17bd76e52c002909faa1c44db
 2022-05-04 15:08:51 +02:00
Tony Huang
c700472091 Remove stagesplit backup package 
Bug: 199236198
Test: build pass
Test: pass existing tests
Ignore-AOSP-First: remove whole folder
Change-Id: I8747f314c5e7fa50812d220fdf527874fc654b85
 2022-05-04 17:36:18 +08:00
Chilun Huang
45b0372fc5 Add accessibility action menu items for divider 
Allows user to resize the screen via the menu items of the divider.

Bug: 204502843
Test: manual check the menu items
Test: atest WMShellUnitTests

Change-Id: Idc888b977e0e69c7d5c40f26a89f5af9ad5ad9cd
 2022-05-04 03:16:07 +00:00
TreeHugger Robot
66688f0d8c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-03 20:48:34 +00:00
TreeHugger Robot
b16fa64cc8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
Vinit Nayak
d199012df6 Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 1cb3bafe5f am: fd9d49cf05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: Ia2b03ce9cf6171dd4d78dad5edbbce177c0c3e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:34:59 +00:00
Vinit Nayak
c59bba906d Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 1cb3bafe5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: I53bc4c3d9974c69886158b572339295e9ee32034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:26:23 +00:00