Commit Graph

725401 Commits

Author SHA1 Message Date
Issei Suzuki
36709edf70 Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." 2021-10-12 15:19:47 +00:00
Yuri Lin
bf88de825a Merge "Add matchesCallFilter function to NotificationManager." 2021-10-12 15:11:58 +00:00
Chris Li
3866f66fcb Merge "Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app" into sc-v2-dev am: ffe3162917 am: 3d29027eb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16014032

Change-Id: Ic45b5f822b13ba25d9752eb5285f27fb2fd46ed8
2021-10-12 13:37:07 +00:00
Chris Li
3d29027eb3 Merge "Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app" into sc-v2-dev am: ffe3162917
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16014032

Change-Id: I1209013acf69b8881e30d4bf0b852a590bc20682
2021-10-12 13:24:46 +00:00
Jiakai Zhang
4a32dabc73 [automerger skipped] Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd am: d869638896 am: 10b7b59359 am: 59dbf8d356 -s ours
am skip reason: Merged-In I2cca8b206451858e636c6bd04617cf3933f702c6 with SHA-1 381fb640c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173

Change-Id: I952507fbbc3beaea2a799daa39c8d5b1d75037be
2021-10-12 13:19:16 +00:00
Chris Li
ffe3162917 Merge "Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app" into sc-v2-dev 2021-10-12 13:13:12 +00:00
Jiakai Zhang
59dbf8d356 Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd am: d869638896 am: 10b7b59359
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173

Change-Id: Id6163b067e94c58a516422ec396bd0226d34569a
2021-10-12 13:04:03 +00:00
Jiakai Zhang
10b7b59359 Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd am: d869638896
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173

Change-Id: Ib3fd61dbbfbdba03b23ad55d6804ea988c6cab68
2021-10-12 12:48:28 +00:00
Jiakai Zhang
d869638896 Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173

Change-Id: Ia0591b7b2b9f605f12c8124fbb3b3734cf75a58a
2021-10-12 12:38:52 +00:00
Jiakai Zhang
c6af5600fd Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173

Change-Id: I51734a953228e74a8303b4cf5ffc27529241bb37
2021-10-12 12:30:50 +00:00
Jiakai Zhang
12e479b70e Merge "Add the systemserver_fragment to media SDK." 2021-10-12 12:14:50 +00:00
Louis Chang
4086d6aa38 [automerger skipped] Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 am: 343e36ebe7 am: ede512d476 am: c482316542 -s ours am: 5e23a591ae -s ours
am skip reason: Merged-In Ibb8b3c48d483dcb96207ec2395a87b31d8eb107e with SHA-1 e84bd0d141 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: Iee4de5704450f80ca997db09dda36924c0c3d96e
2021-10-12 07:25:30 +00:00
Louis Chang
5e23a591ae [automerger skipped] Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 am: 343e36ebe7 am: ede512d476 am: c482316542 -s ours
am skip reason: Merged-In Ibb8b3c48d483dcb96207ec2395a87b31d8eb107e with SHA-1 e84bd0d141 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: I9da6c6f980ccdda5f5064ead30a1bf93ca888c3b
2021-10-12 07:08:58 +00:00
Louis Chang
c482316542 Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 am: 343e36ebe7 am: ede512d476
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: I8186e46beddbec25bf8ba411b0eff60773643fd1
2021-10-12 06:57:33 +00:00
Louis Chang
ede512d476 Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 am: 343e36ebe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: I96c4866d98587d73520d8c8d2dbe760d879765db
2021-10-12 06:43:13 +00:00
Louis Chang
a36c709a23 Merge "Allowing system uid to embed Task on secondary user" into sc-v2-dev am: 8b701b0813 am: 05e51e6969
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003535

Change-Id: I56e78185e8bfffd57ea6a982cde01364e6a43df9
2021-10-12 06:41:33 +00:00
Louis Chang
343e36ebe7 Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: Ifd0958280d91156ca71481a6f0a76e8c78424f9c
2021-10-12 06:28:55 +00:00
Louis Chang
05e51e6969 Merge "Allowing system uid to embed Task on secondary user" into sc-v2-dev am: 8b701b0813
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003535

Change-Id: I4c9086cdc61599754eddece6b1f2fff06a4e918b
2021-10-12 06:28:07 +00:00
Louis Chang
8b701b0813 Merge "Allowing system uid to embed Task on secondary user" into sc-v2-dev 2021-10-12 06:17:38 +00:00
Louis Chang
d88101f7a4 Merge "Continue the pausing process after automatically entering pip" 2021-10-12 06:16:31 +00:00
Wei Sheng Shih
9640b7d70e Merge "setTurnScreenOn can only used as wakeup" into sc-v2-dev am: 275b113621 am: 4da983564e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951730

Change-Id: Id515bc39ed132e76855f9657255530012ff83347
2021-10-12 04:23:48 +00:00
Wei Sheng Shih
4da983564e Merge "setTurnScreenOn can only used as wakeup" into sc-v2-dev am: 275b113621
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951730

Change-Id: I7c7d40e500954bcc53287895893902104b28d56a
2021-10-12 04:06:32 +00:00
TreeHugger Robot
471056c787 Merge "Provide IconProvider in sysui dagger" into sc-v2-dev am: 274cdd4caf am: cc6b22587f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003788

Change-Id: I72c811b4d47045625e9368fd591130b1f6c44c14
2021-10-12 03:52:11 +00:00
Wei Sheng Shih
275b113621 Merge "setTurnScreenOn can only used as wakeup" into sc-v2-dev 2021-10-12 03:49:24 +00:00
TreeHugger Robot
cc6b22587f Merge "Provide IconProvider in sysui dagger" into sc-v2-dev am: 274cdd4caf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16003788

Change-Id: Ifdd0a1e79ec602164d0e552de52e50ff4405bd8e
2021-10-12 03:37:18 +00:00
TreeHugger Robot
274cdd4caf Merge "Provide IconProvider in sysui dagger" into sc-v2-dev 2021-10-12 03:21:12 +00:00
Shaowei Shen
8da9b5940d Merge "[Output Switcher] Update Ui layout to match with mertial next" into sc-v2-dev am: 152da31edf am: c8a67e2128
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897558

Change-Id: Ib851708d6ebc50fe0241661b5333dfe3e39ae928
2021-10-12 02:19:31 +00:00
Chris Li
53e7502809 Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app
We don't want to allow the client to animate for wallpaper or any
non-app windows.

Bug: 201482129
Bug: 196173550
Test: atest WmTests:AppTransitionControllerTest
      #testOverrideTaskFragmentAdapter_noOverrideWithWallpaper
Change-Id: Ic29db59fc9f9695df9c8ba3a6d812ad217cdd641
2021-10-12 10:03:29 +08:00
Shaowei Shen
c8a67e2128 Merge "[Output Switcher] Update Ui layout to match with mertial next" into sc-v2-dev am: 152da31edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897558

Change-Id: Icdac8821b1a8c834078c25e02f358f3f435806ba
2021-10-12 02:02:56 +00:00
Shaowei Shen
152da31edf Merge "[Output Switcher] Update Ui layout to match with mertial next" into sc-v2-dev 2021-10-12 01:53:42 +00:00
TreeHugger Robot
ab6e5d1412 [automerger skipped] Merge "Animate QS alpha on split shade pull down" into sc-v2-dev am: 59d7598b52 -s ours am: 5a262c656e -s ours
am skip reason: skipped by user dupin

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16011176

Change-Id: I40c76d88ddbe32bfd12f15504a6692aa9a07db91
2021-10-12 01:44:46 +00:00
TreeHugger Robot
5a262c656e [automerger skipped] Merge "Animate QS alpha on split shade pull down" into sc-v2-dev am: 59d7598b52 -s ours
am skip reason: skipped by user dupin

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16011176

Change-Id: Ia5d0beff712b4ad5a9b6fd75af04b2d288967872
2021-10-12 01:28:21 +00:00
TreeHugger Robot
59d7598b52 Merge "Animate QS alpha on split shade pull down" into sc-v2-dev 2021-10-12 01:06:09 +00:00
TreeHugger Robot
5ec5463417 Merge "Rename getSurfaceTransformHint API and switch to using NDK transform constants" into sc-v2-dev am: 492bdf0074 am: 030cee8122
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937682

Change-Id: Ib479110b56925fc373eeee1a2398fd9ad2e46fb7
2021-10-12 01:05:29 +00:00
TreeHugger Robot
030cee8122 Merge "Rename getSurfaceTransformHint API and switch to using NDK transform constants" into sc-v2-dev am: 492bdf0074
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937682

Change-Id: I65045ca90bfa16c885af4c5fde86e4af592d8633
2021-10-12 00:50:11 +00:00
TreeHugger Robot
492bdf0074 Merge "Rename getSurfaceTransformHint API and switch to using NDK transform constants" into sc-v2-dev 2021-10-12 00:35:32 +00:00
TreeHugger Robot
93dad04f7c Merge changes I2516e8d2,I6c4f5c93 into sc-v2-dev am: af816a74d6 am: 21f7271e18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16017765

Change-Id: I889d8a3d20d158e65eac9cbe3e590eedb7947a2f
2021-10-12 00:20:37 +00:00
Lucas Dupin
1ec71012d1 Animate QS alpha on split shade pull down
When pulling down the shade in split mode, the quick settings alpha
should be directly connected to the drag down gesture and the same that
we have for the notification shade.

Test: manual
Bug: 200804740
Fixes: 196722669
Change-Id: I6532c8a78826a5b60609dc66557abc49a3f140c5
Merged-In: I6532c8a78826a5b60609dc66557abc49a3f140c5
2021-10-12 00:08:39 +00:00
Lucas Dupin
f9f0ff5c36 Merge "Animate QS alpha on split shade pull down" 2021-10-12 00:07:48 +00:00
TreeHugger Robot
21f7271e18 Merge changes I2516e8d2,I6c4f5c93 into sc-v2-dev am: af816a74d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16017765

Change-Id: I5b788fa5a5bac5912d82342be103ae6f4fd78f4e
2021-10-12 00:07:02 +00:00
TreeHugger Robot
af816a74d6 Merge changes I2516e8d2,I6c4f5c93 into sc-v2-dev
* changes:
  Don't expand the keyguard if it's fading away.
  Don't play screen off animation if we are upside down unless that's allowed.
2021-10-11 23:50:51 +00:00
Vishnu Nair
8eb0c64cf4 Rename getSurfaceTransformHint API and switch to using NDK transform constants
NDK exposes ANativeWindowTransform/NATIVE_WINDOW_TRANSFORM_*. These
constants are aligned with HAL definitions and are used internally to
specify buffer transforms. Native consumers of the transform hint
 are expected to generate ANativeWindowTransform from the hint.

Aligning the SDK and the NDK transform values will make the API
less confusing.

Bug: 196167822
Test: atest AttachedSurfaceControlTest
Change-Id: Ib20be045f6c8c6d7befef93a839a27098da55ffa
2021-10-11 16:28:20 -07:00
Taran Singh
7c7bb9ab40 Merge "Remove binder tracing from IMS" into sc-v2-dev am: 53a1d2e0e0 am: 5ddc05cd3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16033402

Change-Id: I48a6e566d01aba312c63e59ffcd39721b53cc79d
2021-10-11 20:48:34 +00:00
Caitlin Cassidy
099977ee5d Merge "[Ongoing Call] Hide the status bar in immersive mode if the user has swiped it away." into sc-v2-dev am: acf2a8d3d9 am: a8ba7e00de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16010040

Change-Id: I5a25eed6f3d65f0dc47d893ffc3572fbc31c9697
2021-10-11 20:47:47 +00:00
Jakub Pawlowski
fb58e975f6 Merge "bluetooth: Set special delay for LeAudio auto connect" am: a457cb6f90 am: 929d2e04ee am: 56d58ee593 am: e11c2b61b7 am: a3d896e434
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830517

Change-Id: I6df296144060e73dfbdb5478612547932d4ab25a
2021-10-11 20:46:25 +00:00
Taran Singh
5ddc05cd3a Merge "Remove binder tracing from IMS" into sc-v2-dev am: 53a1d2e0e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16033402

Change-Id: Ic77ae824c5424229f5af0cfb95ac86e87595ab1a
2021-10-11 20:43:04 +00:00
Caitlin Cassidy
a8ba7e00de Merge "[Ongoing Call] Hide the status bar in immersive mode if the user has swiped it away." into sc-v2-dev am: acf2a8d3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16010040

Change-Id: I6edc02053fb269d0de1d7e91c4b6c4433f1c239e
2021-10-11 20:42:09 +00:00
Michael Groover
6aded8856c Merge "Remove unused receiver and corresponding code from NPMS" 2021-10-11 20:36:06 +00:00
Taran Singh
53a1d2e0e0 Merge "Remove binder tracing from IMS" into sc-v2-dev 2021-10-11 20:33:53 +00:00
Jakub Pawlowski
a3d896e434 Merge "bluetooth: Set special delay for LeAudio auto connect" am: a457cb6f90 am: 929d2e04ee am: 56d58ee593 am: e11c2b61b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830517

Change-Id: Ifc08d3975a8e11c40d81153d683ee48c15d8f0c4
2021-10-11 20:32:20 +00:00