Commit Graph

3029 Commits

Author SHA1 Message Date
Philip Junker
9f07f3414e Merge "Remove unused ringtone sound file." 2022-09-21 07:13:05 +00:00
Prabir Pradhan
ad914db014 Add Android keycodes for stylus buttons
Ensure the new stylus buttons are not yet sent to apps.
DD: go/android-stylus-buttons

Bug: 246394583
Test: Build, Presubmit
Change-Id: I440a359ec8cffb60b9e87f2e51304c9b0320e16f
2022-09-16 15:42:23 +00:00
Philip Junker
84c8e4657e Remove unused ringtone sound file.
Bug: 246947420
Test: build and flash atd4-userdebug
Test: build and flash adt4_atv-userdebug
Test: atest RingtoneManagertest
Change-Id: I5531059aad27b65abff1a964d917e80738969c27
2022-09-16 14:12:54 +00:00
Vaibhav Devmurari
3884f99abe Merge "Add new keycodes to support keyboard backlight up/down/toggle" 2022-09-08 22:48:36 +00:00
Vaibhav Devmurari
bb12898ad3 Add new keycodes to support keyboard backlight up/down/toggle
Test: None
Bug: 245506418
Change-Id: I54b363cb8ae51e7c828cbc9d9dff1d6eb6050e6f
2022-09-08 16:25:12 +00:00
Chris Li
1fd7ea10e4 Merge "Collect embedded TaskFragment window changes" into tm-qpr-dev am: d0208d9292 am: 929e5378a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19561152

Change-Id: I16357ce19bbb742dd0fc98b9fc7aef6416e210ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 06:07:54 +00:00
Chris Li
929e5378a0 Merge "Collect embedded TaskFragment window changes" into tm-qpr-dev am: d0208d9292
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19561152

Change-Id: If22315d886a178ffd74f0a60b21548ac9ab24f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 05:31:19 +00:00
Chris Li
d00861c46e Collect embedded TaskFragment window changes
To make sure the embedded TaskFragment surface will be updated when
Shell transition is enabled.

Bug: 207070762
Test: testApplyTransaction_collectTaskFragmentBeforeApplyChange
Change-Id: Id726b67cd30bd68e3ca4bc2665ab0a9024d76dab
2022-09-07 08:54:57 +08:00
Chris Li
e7e16b0e8b Merge "Add TaskFragmentOrganizer#applyTransaction with request transition" into tm-qpr-dev am: 2c9b75902e am: 85167f8475
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19714429

Change-Id: If235e557072cc4f295e14b0599c3199096bb019b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 07:55:31 +00:00
Chris Li
85167f8475 Merge "Add TaskFragmentOrganizer#applyTransaction with request transition" into tm-qpr-dev am: 2c9b75902e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19714429

Change-Id: I3225c3c79b0a309e9e16abd2f81b92e263a55a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 07:22:46 +00:00
Chris Li
2c9b75902e Merge "Add TaskFragmentOrganizer#applyTransaction with request transition" into tm-qpr-dev 2022-09-01 06:59:10 +00:00
Chris Li
dc7cb3659d Add TaskFragmentOrganizer#applyTransaction with request transition
Instead of having WM Core to "guess" when to request transtiion, let the
organizer to tell whether or not it needs to be applied immediately.

With the shouldApplyIndependently parameter, we can make sure the future
runtime API to change split layout won't affect other ongoing
transition.

Bug: 207070762
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: I658b0ba1ae9decc741f09cb53bfff2c45ea076a0
2022-09-01 12:00:31 +08:00
Antony Sargent
94bc9e51d3 Merge "Make FLAG_KEEP_SCREEN_ON use per-display wakelocks" into tm-qpr-dev am: 4597b40d49 am: 1840a685d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535194

Change-Id: I01cd763c9c650f5ba7a7906d4432874e006f3219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:57:27 +00:00
Antony Sargent
1840a685d6 Merge "Make FLAG_KEEP_SCREEN_ON use per-display wakelocks" into tm-qpr-dev am: 4597b40d49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535194

Change-Id: Ife247add36251dde408568d7cdf6caa0cb3a13b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:39:27 +00:00
Antony Sargent
62aecf34aa Make FLAG_KEEP_SCREEN_ON use per-display wakelocks
This moves from having a single global wakelock held by
WindowManagerService whenever any window on any display has
FLAG_KEEP_SCREEN_ON set, to having one per DisplayContent that is only
held when a window on that Display has the flag set.

Bug: 185157739
Test: atest WmTests
Change-Id: I82dcb693ad2bea0a243be4299dae836a1f53930c
2022-08-31 10:21:35 -07:00
Jenhou (Alan) Huang
5f942ce8d8 Merge "[VolumePanel] Move the Settings' volume panel into a SystemUIDialog" into tm-qpr-dev am: 16219f2ea4 am: 154a6a50b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19482609

Change-Id: Ifbcfdd270d34df3216e0ef6bd5e8f6415e8cb433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 06:12:29 +00:00
Jenhou (Alan) Huang
154a6a50b7 Merge "[VolumePanel] Move the Settings' volume panel into a SystemUIDialog" into tm-qpr-dev am: 16219f2ea4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19482609

Change-Id: I51953caf99f845431d7ceeb7fd102aef308b2837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 05:43:38 +00:00
Alan Huang
e03186af0e [VolumePanel] Move the Settings' volume panel into a SystemUIDialog
Move most of the logic of the Settings' volume panel to a SystemUIDialog
to make the dialogs consistent with other system dialog.

Bug: 202262476
Test: manual build and launch the new dialog.
Change-Id: Ic27dcca77072dee2b78827e1eb58c28022b47265
2022-08-29 18:59:51 +00:00
Chris Li
ea8ec853ae Merge "Fix crash when continueTransitionReady without collecting transition" into tm-qpr-dev am: bd4b118acb am: 5c4bf73532
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19728246

Change-Id: I5c072beebb9dfc8faf963891397a1a15fc73a6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:19:36 +00:00
Chris Li
5c4bf73532 Merge "Fix crash when continueTransitionReady without collecting transition" into tm-qpr-dev am: bd4b118acb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19728246

Change-Id: I7178f73f49ec4529940e1b9fb85309a174a4ea27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 01:45:26 +00:00
Chris Li
bd4b118acb Merge "Fix crash when continueTransitionReady without collecting transition" into tm-qpr-dev 2022-08-26 01:38:31 +00:00
Kunal Malhotra
cc1aa40eac Merge "Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission." into tm-qpr-dev am: 0626b32460
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19646036

Change-Id: I37189e1d23e75dbd2f31733825674a47773e01a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 16:36:57 +00:00
Kunal Malhotra
0626b32460 Merge "Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission." into tm-qpr-dev 2022-08-25 16:29:53 +00:00
Chris Li
5ce3e5d661 Fix crash when continueTransitionReady without collecting transition
1. When deferTransitionReady is called, it should un-ready the sync
   group.
2. Do not call continueTransitionReady when the transition is no
   longer collecting, such as transition timeout or abort.

Bug: 207070762
Test: atest WmTests:TransitionTests
Change-Id: I33a211d574da54ed220c7d0f7c12e201c5e1f681
2022-08-25 10:12:34 +08:00
Evan Rosky
ee8e8d1640 Merge "Add a non-blast mode to sync-engine" into tm-qpr-dev am: f2e3e58c55 am: f4d5421fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19453502

Change-Id: Ica2f8579ad9d4a9eebef7e697d9b191bcfa0ebd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 00:01:45 +00:00
Evan Rosky
f4d5421fc2 Merge "Add a non-blast mode to sync-engine" into tm-qpr-dev am: f2e3e58c55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19453502

Change-Id: Ib9005e82cd084d2e08f2bf6191fb006e4e664a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 23:32:47 +00:00
Evan Rosky
f2e3e58c55 Merge "Add a non-blast mode to sync-engine" into tm-qpr-dev 2022-08-24 23:12:36 +00:00
TreeHugger Robot
cbe2a51d60 Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" into tm-qpr-dev 2022-08-24 14:40:58 +00:00
TreeHugger Robot
057c36a345 Merge "[2nd attempt] Revive use of VF font for regular style of roboto font" 2022-08-24 06:04:46 +00:00
Chris Li
ca4cd1a963 Merge "Wait for TaskFragmentOrganizer to finish handling transaction" into tm-qpr-dev am: 3294ef42e4 am: 570d249c9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19564031

Change-Id: I860a58b9810dff8f844e1116c812ef95eea01516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 05:56:05 +00:00
Chris Li
570d249c9c Merge "Wait for TaskFragmentOrganizer to finish handling transaction" into tm-qpr-dev am: 3294ef42e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19564031

Change-Id: I55787b4ac6e4018b19ad03d33ca9e86e5ac000e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:11:14 +00:00
Evan Rosky
9110a8af74 Add a non-blast mode to sync-engine
This adds a "method" to sync-engine where an app just draws
internally and reports (no sync).

The transition system can then use this to implement its own
screenshot-based sync mechanism. For now, this uses legacy logic
around "changeTransition" to decide which levels to take
screenshots at (since screenshots are slow).

This also adds a per-window method override to handle situations
where one window/sub-hierarchy needs to use or not-use a
method (specifically, seamless-rotation needs BLAST even if
the rest of the transitions are screenshot).

Bug: 242056267
Test: atest TransitionTests SyncEngineTests
Change-Id: Iee6ee85bafb8967e2e1e662cd3275fba1efbbdea
2022-08-23 16:51:43 -07:00
Chris Li
4e9c5b44b1 Wait for TaskFragmentOrganizer to finish handling transaction
When a TaskFragmentTransaction is sent to the organizer during a
transition, have the transition wait for the organizer to finish
handling the transaction.

Bug: 207070762
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: I4b7955171cd8ce386686ff2cd64b7c04a6436ddf
2022-08-23 09:46:05 +08:00
Siarhei Vishniakou
92aa9080eb Require CONFIG_HID_PLAYSTATION for DualSense key layout
Some olders kernels don't yet support HID_PLAYSTATION. While they are
working on supporting this driver, provide this temporary solution.

Before this patch, if the key layout is loaded, but there is no
HID_PLAYSTATION, then the mappings on the device will be incorrect.

With this patch, this key layout will not be loaded unless there is a
CONFIG_HID_PLAYSTATION enabled on the device.

Instead, when the main layout cannot be loaded, we make another attempt
to load a fallback layout. This way, the mappings on DualSense can be
correct even if the HID_PLAYSTATION module is not loaded.

In this CL, the fallback layout was tested using controllerTester.

Bug: 228005926
Test: tested mappings with a DualSense controller on a device that does
not have CONFIG_HID_PLAYSTATION

Change-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
2022-08-23 01:23:29 +00:00
Kunal Malhotra
4a06c40b87 Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission.
Test: manual test
Bug: 217934898
Change-Id: I3f52d4ca32c22c54fa9b1663954a43b44d9000a0
Merged-In: I3f52d4ca32c22c54fa9b1663954a43b44d9000a0
(cherry picked from commit c69aa1be70)
2022-08-17 17:07:32 +00:00
Seigo Nonaka
89abe560d7 [2nd attempt] Revive use of VF font for regular style of roboto font
The test failure reported in 241721843 due to previous attempt
should be fixed by Ibce61016fca7a8fe075e266e111927c43b5c4729

Bug: 241503271
Test: The app reported in 170915650 and 183170917 works.
Change-Id: I7db85f2562237291005c6459f4d73fcfdaa2f873
2022-08-16 08:14:56 +00:00
Naomi Musgrave
fe102a340a Merge "[Partial Screenshare] Respond to task changes" into tm-qpr-dev am: f5a7752bf2 am: 56e0f4a61d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570090

Change-Id: I7b9e83f3a02fdaec1a2a11d2854a460de31a0887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 11:27:41 +00:00
Naomi Musgrave
56e0f4a61d Merge "[Partial Screenshare] Respond to task changes" into tm-qpr-dev am: f5a7752bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570090

Change-Id: If3ba9ede80fc52a1a5d85604d947b05bb4e8f4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 11:00:56 +00:00
Naomi Musgrave
0d9ba1c04a [Partial Screenshare] Respond to task changes
Destroying the MediaProjection notifies the client app through the
MediaProjection callbacks that the app should handle the session
ending prematurely.

This may happen if setting up task recording failed, or if the
user exited the task that is being recorded.

Registering a listener to the task for configuration changes
also enables handling of the task entering/exiting split
screen.

Fixes: 219761722
Fixes: 237526949
Fixes: 236971595
Test: atest WmTests:ContentRecordingControllerTests
Test: atest WmTests:ContentRecorderTests
Change-Id: I415fb70433a031889f0486e99bb7d3b664333414
2022-08-11 18:03:53 +00:00
Chavi Weingarten
619dfd599a Merge "Use layer mirroring when screen recording via VD" 2022-08-10 21:58:58 +00:00
Chavi Weingarten
e64bae455e Use layer mirroring when screen recording via VD
When a Display has the flag VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR, the
content on the display is expected to mirror another display. This was
previously done by setting the same layerStack. This change removes that
behavior and instead will create a mirror hierarchy of the other display
and place it at the root of the new Display. This is leveraging the work
done for ContentRecorder, but using it as default for all displays
instead of only for VD created by MediaProjection.

Test: Screen record via MediaProjection
Test: Screen record via DisplayManager
Test: ContentRecorderTests
Test: DisplayContentTests
Bug: 237664947
Change-Id: I18b36dadc43ba1c37f9516ff10d24bb8683c04ac
2022-08-09 16:45:56 +00:00
Seigo Nonaka
5a0d5d22e7 Revert "Revive use of VF font for regular style of roboto font"
This reverts commit 76bd1e532f.

Reason for revert: https://buganizer.corp.google.com/issues/241722510
Bug: 241722510

Change-Id: I85c32b194df289416046cc50e7e67436dada4302
2022-08-08 04:52:30 +00:00
Seigo Nonaka
76bd1e532f Revive use of VF font for regular style of roboto font
Bug: 241503271
Test: The app reported in 170915650 and 183170917 works.
Change-Id: I96a49530deed5711784c984023f5f9b57f01e6b3
2022-08-05 14:27:58 +09:00
Yanli Wan
8eaf9c2fd8 Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am: 3544e25a4e am: 96986f64df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461336

Change-Id: Ifff636467c2963e9f7c9fe85d6d127a863040d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 19:47:55 +00:00
Yanli Wan
96986f64df Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am: 3544e25a4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461336

Change-Id: I8546e339d3627dc8d3df4cf8e58064ae2628a1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 19:30:00 +00:00
Yanli Wan
3544e25a4e Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev 2022-08-03 19:18:52 +00:00
Kunal Malhotra
c69aa1be70 Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission.
Test: manual test
Bug: 217934898
Change-Id: I3f52d4ca32c22c54fa9b1663954a43b44d9000a0
2022-07-29 22:20:20 +00:00
Chris Li
e730864484 Merge "Fix open ActivityEmbedding split with Shell transition" into tm-qpr-dev am: 447919823c am: 12cc95ad18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19321172

Change-Id: Ic232586f37bde53698b16168ec46a922cae45c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 07:06:59 +00:00
Riddle Hsu
5283f44bb6 Merge "Skip reveal animation with invisible starting window" 2022-07-27 07:03:05 +00:00
Chris Li
12cc95ad18 Merge "Fix open ActivityEmbedding split with Shell transition" into tm-qpr-dev am: 447919823c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19321172

Change-Id: Ia471a71ba97cf89fa8c214734012075a9b1a33c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 06:55:37 +00:00