Commit Graph

3376 Commits

Author SHA1 Message Date
Bryce Lee
6eca586fee Merge "Revert "Change default showClockAndComplications to false."" into tm-dev am: 1e71fa646c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17057408

Change-Id: Id6793ade278ea1dc158e330420c47209970be193
2022-03-04 15:52:57 +00:00
Bryce Lee
d3f2dc954f Revert "Change default showClockAndComplications to false."
This reverts commit ae8b96964c.

Reason for revert: causes overlay elements to not appear.

Test: manual
Bug: 222307681
Change-Id: I2d1f55227774a39f4b2dbe927ddd3aa1a5178351
2022-03-02 13:42:29 -08:00
TreeHugger Robot
deb46fef63 Merge "Add getter for filter in Field" into tm-dev am: 91e92eb085
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16966133

Change-Id: I9390c1d5f321502ce2386cbae986bc7ca057a9d9
2022-03-01 06:30:08 +00:00
TreeHugger Robot
91e92eb085 Merge "Add getter for filter in Field" into tm-dev 2022-03-01 06:09:16 +00:00
TYM Tsai
9b53f411f2 Add getter for filter in Field
Add getFilter method to retrieve filter set by setFilter.

Bug: 217554272
Test: atest DatasetTest
Change-Id: I70a5c2f332c656f453cb0992f89d76879bfa7412
2022-03-01 09:03:59 +08:00
Darrell Shi
0ff78e2421 Merge "Change default showClockAndComplications to false." into tm-dev am: f1c62fc74c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16945211

Change-Id: I71421b4717d389127c0871f51a896d25504cc821
2022-03-01 00:24:22 +00:00
Darrell Shi
f1c62fc74c Merge "Change default showClockAndComplications to false." into tm-dev 2022-02-28 23:59:27 +00:00
Darrell Shi
ae8b96964c Change default showClockAndComplications to false.
This makes sure existing behaviors don't change, and only dreams that
specify show dream overlay complications get them.

Test: atest DreamOverlayServiceTest
Bug: 214456383
Fix: 214456383
Change-Id: I5c94484d5af592159a07257137a138e41d0c6b53
2022-02-28 18:24:07 +00:00
Kathy Chen
4607806a5e Merge "Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it." 2022-02-25 04:12:13 +00:00
TreeHugger Robot
65d7ab9df4 Merge "Replace LinkedList by a more performant collection" 2022-02-25 02:02:21 +00:00
Kathy Chen
542fc25dff Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it.
Test: CTS test
Bug: 219740201
Change-Id: I8fa9df9cab9965d84d301760f4f7fba08dc44f54
2022-02-24 21:10:04 +00:00
Nikolas Havrikov
8c055784be Replace LinkedList by a more performant collection
This is a semi-automatic change.
See https://errorprone.info/bugpattern/JdkObsolete for the rationale.

Test: make
Bug: 221046110
Change-Id: I1ed1116d032e59b229be68a98f31292d972b012b
2022-02-24 10:51:23 +00:00
Sharon Su
7d1d33b11c Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." 2022-02-23 21:42:38 +00:00
Lucas Silva
68453bc360 Merge changes I26362ce1,I4ec34b99 into tm-dev
* changes:
  Pipe the dream label to the dream overlay service.
  Pipe the preview boolean to the dream overlay service.
2022-02-23 15:28:14 +00:00
Sharon Su
1611a8d1c5 Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API.
Test: Manual test on device
Bug: 218570612
Change-Id: Ie12b570f1e6400ab9e289b882e5821921a609e0a
2022-02-23 00:23:31 +00:00
Joanne Chung
04b037e07d Fix NPE when calling dispatchTouchEvent in FloatingToolbarRoot
Bug: 220328857
Test: manual
Change-Id: Ib41e6910e001ecb71c82f12db22b94ef7329a3fd
2022-02-23 01:54:33 +08:00
Lalit Maganti
464451edf3 Merge "base: remove onBind and onMessage from TraceReport API surface" am: b27a57a7b6 am: 47f0797eb0 am: 14bd0aa16b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991971

Change-Id: I870c79b77799a9173c6a75fb302f307e0e621ef6
2022-02-18 20:39:13 +00:00
Lucas Silva
9b69bbaa30 Pipe the dream label to the dream overlay service.
The preview overlay needs access to the user-facing label for the dream,
to show the user which dream they are previewing.

Test: atest DreamOverlayServiceTest
Bug: 219747041
Change-Id: I26362ce1fefcd5c9557e99ad2f44374f04017c29
2022-02-18 20:00:55 +00:00
Lucas Silva
52f6324514 Pipe the preview boolean to the dream overlay service.
This will allow us to change which complications are shown based on if
we are in preview mode.

Test: atest DreamOverlayServiceTest
Test: locally on device
Bug: 219747041
Change-Id: I4ec34b990fec5e09114a71719c0271da7758aac7
2022-02-18 19:59:16 +00:00
Lalit Maganti
47f0797eb0 Merge "base: remove onBind and onMessage from TraceReport API surface" am: b27a57a7b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991971

Change-Id: I179283866b8043eebb0e1ff847bdeaeef85eba58
2022-02-18 19:52:24 +00:00
Lalit Maganti
73f1063c39 base: remove onBind and onMessage from TraceReport API surface
Bug: 217554856
Change-Id: I9e60d20d5a7f159ad80a6ca256dd59c644aa4bc1
2022-02-18 16:33:32 +00:00
TreeHugger Robot
2f07bb4f06 Merge "Dump DefaultSelectionToolbarRenderService toolbar information" 2022-02-17 17:54:47 +00:00
Joanne Chung
4d851fc359 Dump DefaultSelectionToolbarRenderService toolbar information
Dump toolbar information to help debug.

Bug: 219664390
Test: dumpsys activity service DefaultSelectionToolbarRenderService

Change-Id: I332d3289dc2533a7583453853f1ec9324b67d088
2022-02-17 22:15:29 +08:00
Daniel Kim
b524be699f Merge "Rename ProximityCallback to ProximityUpdateCallback" 2022-02-17 06:37:02 +00:00
Abodunrinwa Toki
62599cbdcc Merge "Ensure that TextViewActivityTest still pass for the new system toolbar." 2022-02-17 01:10:21 +00:00
Daniel
0ee64eda8d Rename ProximityCallback to ProximityUpdateCallback
Test: atest AttentionManagerServiceTest
Bug: 218494749
Change-Id: Ia9151d20c2616931c242a09cd941230728619552
2022-02-16 18:24:19 +00:00
Joanne Chung
5c1e5f7193 Merge "Update team OWNERS file." am: e96070ac89 am: 114d0c7773 am: 1bb2f28548
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1982066

Change-Id: Ic8c77290b4d8e2d6cf8353a793b75cf71990a7a1
2022-02-16 05:24:07 +00:00
Joanne Chung
114d0c7773 Merge "Update team OWNERS file." am: e96070ac89
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1982066

Change-Id: I50a93d3e190ba2a4988e0777be2c5e571f2a2760
2022-02-16 04:42:57 +00:00
Joanne Chung
e96070ac89 Merge "Update team OWNERS file." 2022-02-16 02:03:49 +00:00
Eric Zhang
d08beccfa1 Merge "Change ownership of resumeonreboot module." am: 5a700f759d am: 1288c03ad5 am: a14c588df0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985526

Change-Id: Iaadb9e2a88116ae21c6b98d6471116ee2334bf56
2022-02-15 07:43:29 +00:00
Eric Zhang
1288c03ad5 Merge "Change ownership of resumeonreboot module." am: 5a700f759d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985526

Change-Id: I97bb619d188e3dbc0bac5478cfd921c73b5c1d9d
2022-02-15 07:00:53 +00:00
Eric Zhang
3e56fc6c5e Change ownership of resumeonreboot module.
Bug: N/A
Test: N/A
Change-Id: I014452eebfd73767549bb233ccace0655adc57dd
2022-02-14 20:20:50 +00:00
Joanne Chung
b00f0d6c95 Update team OWNERS file.
Bug: 177641730
Test: n/a
Change-Id: If4ecc7326dc229d8807e1497c5e3e2ef0637680f
2022-02-14 14:51:12 +08:00
TreeHugger Robot
16a227c1a4 Merge "Add getPackageName to VoiceInteractor" 2022-02-12 02:29:50 +00:00
Lee Campbell
99589ebc0f Add getPackageName to VoiceInteractor
Adds a new API to VoiceInteractor to allow apps to query
the package name of the Voice Interactor associated with
this the current voice interaction

BUG: 192061561
CTS-Coverage-Bug: 218687104
Test: Manual validation from personal and work profiles

Change-Id: If381c38498535bf94d13c0b5ad5f6c4fa5495117
2022-02-11 16:42:38 +00:00
Vania Desmonda
c60397744c Merge "Fixing color hints adjustment on live wallpapers and lock screen when wallpaper is dimmed" 2022-02-11 11:13:46 +00:00
Ahaan Ugale
ad7dd8fecb Merge changes from topics "aohd-invalidate", "eventpayload-data"
* changes:
  API to destroy active detectors
  expose HAL keyphrase trigger extras to EventPayload
  expose HAL keyphrase trigger data to EventPayload
2022-02-11 10:05:03 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-11 07:25:43 +00:00
Darrell Shi
dba24dedf4 Merge changes from topic "revert-16781464-YCPFURVHZR"
* changes:
  (Resubmit) Read "showClockAndComplications" metadata.
  (Resubmit) Move dream metadata parsing to framework.
2022-02-10 23:25:13 +00:00
Nicholas Ambur
935e33f416 API to destroy active detectors
The active AlwaysOnHotwordDetector and SoftwareHotwordDetector is always
maintained  in memory regardless if the client is using it or not.
This added API allows an active VoiceInteractionService to indicate that
they will no longer use the detector, and it can be cleaned up.

Test: atest HotwordDetectionServiceBasicTest
Bug: 193232191
Change-Id: I47c6c64c5c85c01e75ddc6bc504664883a57730b
2022-02-10 13:37:41 -08:00
Nicholas Ambur
2f7b2d5f94 expose HAL keyphrase trigger extras to EventPayload
The SoundTrigger HAL can deliver additional context about the kephrase
that was triggered along with the trigger audio. This change moves to
expose the information which was previously suppressed by the Android
framework.

Data exposed:
- Keyphrase extras providing details on what phrase was interpreted by
the voice engine

Extra keyphrase information provided by the SoundTrigger HAL which was
previously suppressed is also exposed.

Test: atest AlwaysOnHotwordDetectorEventPayloadTest
CTS-Coverage-Bug: 215375531
Bug: 215066299
Change-Id: I3b20fd3692c3f9c86181f87d66622c77778b9ab2
2022-02-10 13:37:41 -08:00
Nicholas Ambur
6b6d178bd6 expose HAL keyphrase trigger data to EventPayload
The SoundTrigger HAL can deliver additional context about the kephrase
that was triggered along with the trigger audio. This change moves to
expose the information which was previously suppressed by the Android
framework.

Data exposed:
- Raw data field

Previously raw data was only exposed when the data was of a specific
audio format. This change allows the raw data to be retrieved regardless
of format.

Test: atest AlwaysOnHotwordDetectorEventPayloadTest
CTS-Coverage-Bug: 215375531
Bug: 215066299
Change-Id: Ie75773853d3b338e092dfbf3bd6ccef61a1420c9
2022-02-10 13:37:40 -08:00
Darrell Shi
6550a92810 (Resubmit) Read "showClockAndComplications" metadata.
Read "showClockAndComplications" from dream metadata when binding to
DreamOverlayService, and pass in the value in intent extra.

Test: atest DreamServiceTest
Test: manually on device
Bug: 211519550

Change-Id: Ie8780834eb438897191c3545acff49f82f1350a9
2022-02-10 18:09:15 +00:00
Darrell Shi
91f91d7ae3 (Resubmit) Move dream metadata parsing to framework.
Bug: 214117287
Test: atest com.android.server.dreams.DreamServiceTest
Test: manually on device by opening Screensaver settings because it
calls into the metadata parsing from DreamBackend

Change-Id: I252f634dd10297ba7dcd91fae6289a85a2904e3d
2022-02-10 18:09:00 +00:00
Vania Desmonda
df5e4b2e40 Fixing color hints adjustment on live wallpapers and lock screen when
wallpaper is dimmed

When dimming is applied on live wallpapers, remove
HINT_SUPPORTS_DARK_TEXT/_THEME hints from the color hints to disable
dark text by default.

Test: manual, atest WallpaperManagerServiceTest
Bug: 217367978
Change-Id: Ia614c0b36f84c707a7eb3dabdc7a1eb90992bf3c
2022-02-10 11:42:23 +00:00
Kathy Chen
4ff2a4e611 Merge "Add query API for apps to check the event status. The detection service sends back the response with a status. Add client API for apps to start the consent activity." 2022-02-09 19:05:21 +00:00
Abodunrinwa Toki
02416de354 Ensure that TextViewActivityTest still pass for the new system toolbar.
The tests pass for both the old (local) and system toolbars.

Bug: 190031097
Test: atest android.widget.TextViewActivityTes
Change-Id: I1542d966d363c4a8bd2ac9465c982b82019472d7
2022-02-09 17:40:56 +00:00
Yuri Lin
1a314e9ef3 Merge "Log assistant notification cancels accordingly." 2022-02-09 16:10:35 +00:00
Kathy Xiaoming Chen
f8f605c44e Add query API for apps to check the event status. The detection service sends back the response with a status. Add client API for apps to start the consent activity.
It implements Option 5 in this proposal doc: http://go/ambient-consent-api

Test: atest CtsAmbientContextDetectionServiceDeviceTest
Bug: 192476579
Change-Id: I923911fa8f73d973fd22587af74ed27c5045da34
2022-02-08 16:25:39 -08:00
Yuri Lin
ef3f660d72 Log assistant notification cancels accordingly.
This change adds the NOTIFICATION_CANCEL_ASSISTANT uievent and reports any cancellations due to assistants as REASON_ASSISTANT_CANCEL. Listeners below T (when this reason is added) are notified with the same reason that was previously used in all cases, REASON_LISTENER_CANCEL.

Bug: 201417230
Test: NotificationManagerServiceTest, manually by statsd_testdrive

Change-Id: Iae50053d325b62b479b3c31aea97d35d8847f381
2022-02-08 15:34:11 -05:00