Commit Graph

359 Commits

Author SHA1 Message Date
Vania Januar
728bf8b8b7 Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427

Change-Id: Ic6326aaf9622027f8347d643b99565165e2b3efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 08:44:37 +00:00
Vania Januar
d8ee6665f7 Listen to USB_STATE events in the StylusUsbFirmwareController.
Test: UsbStylusBroadcastReceiverTest
Bug: 288850921
Change-Id: I415e5ca04d371a235eff31327b086d568bcc00f0
2023-08-16 15:18:40 +00:00
Vania Januar
ec9b0a08ae Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035

Change-Id: I458987476dd269d8802b97e730bc9f999c6c864f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:14:26 +00:00
Vania Januar
85de68a968 Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev 2023-08-14 16:47:40 +00:00
Vania Januar
2afb275e09 Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943

Change-Id: I1969dedbd9327fc6ab4dfa0715192b3f882a4e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 14:32:18 +00:00
Vania Januar
558d9f8750 Add the USB device parameter to usb stylus feature preference provider.
Test: StylusUsbFirmwareControllerTest
Bug: 291922092
Change-Id: Ie43bceb807e18ff56d01f6e99316db6e2820383b
2023-08-09 11:06:23 +00:00
Vania Januar
24a2863751 Use two-target preference for stylus handwriting toggle.
Bug: 294279890
Test: StylusDevicesControllerTest
Change-Id: I8e83fb3a8bb76469c4bf1b99df5524930ebad086
2023-08-08 13:50:19 +01:00
Vania Januar
3a67c3e17f Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc4991
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022

Change-Id: Ied0222e7235e2643553e7401ac9b4c0ece442cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:22:47 +00:00
Vania Januar
bbf2dc4991 Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev 2023-07-20 13:42:55 +00:00
Vania Januar
53988c6fe7 Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev am: 82c36c5cb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23876589

Change-Id: I10586591c2e6f0ec8efe1ea57e3050463fc0e4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 15:31:18 +00:00
Vania Januar
986fe4ebc1 USB firmware update for stylus in Stylus USI Device Details
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
Merged-In: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-18 14:09:05 +00:00
Vania Januar
ebc0b9c323 Do not show a summary in Tail button preferences if no app found
Bug: 289054758
Test: StylusDevicesControllerTest
Change-Id: I985194b2e64d36844a9b88f19394db2728ea70e4
2023-07-03 14:44:59 +01:00
Chaohui Wang
8429e8cc79 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 am: c1f06b5e28
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ie6831edecd10cceb2cdf3e3d9ac242cdbd462dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 12:05:27 +00:00
Chaohui Wang
6bceb29408 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 10:45:36 +00:00
Chaohui Wang
85c1dea20a Update the OWNERS for bluetooth & connecteddevice
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
2023-06-19 07:35:20 +00:00
Vania Januar
3042747ddb Minor fixes and tests for multiple full users for stylus notes app
Test: StylusDevicesControllerTest
Bug: 278555728
Change-Id: I0279cb8d9aba4781958e1e5937447501876919ec
2023-05-18 15:16:48 +00:00
Vania Januar
2e8e1339a2 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev 2023-05-17 16:03:20 +00:00
Vania Januar
64d64fdd36 Disambiguate default notes app user from stylus settings
Users can now select between work or personal notes app to be the app
that opens when the stylus tail button is pressed via a dialog.

Bug: 278555728
Test: StylusDevicesControllerTest
Change-Id: I9c63de6f11deb357b0497c7b972d4ac19b876e1f
2023-05-16 15:57:09 +01:00
Vania Januar
072d8b90d0 Merge "Replace placeholder icons with stylus icons" into udc-dev 2023-05-05 09:50:11 +00:00
Vania Januar
fb7c1766a8 Replace placeholder icons with stylus icons
Bug: 250909304
Test: manual
Change-Id: I738a262ea0e3f03408c892adb758b99dd6d47386
2023-05-04 11:24:39 +00:00
Vania Januar
a1af049378 Guard against null input device in StylusDeviceUpdater
Bug: 279170207
Test: StylusDeviceUpdaterTest
Change-Id: Ib4a3f12eaceb87370c800a9dc7eda819c706cd3b
2023-05-02 09:36:43 +00:00
Treehugger Robot
a7152b9573 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Ic9c46e521d8ae7b85dc63fa593e5f05951f596a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:51:42 +00:00
Shen Lin
57b03b309d Align Settings and SystemUI packageName references
This CL migrated both Settings and SystemUI packageName into Utils.java
to align references.

Bug: 277651621
Test: m Settings -j128
Change-Id: I3d6808de76120a2ddbbed4980b8a65cec81502c9
2023-04-11 10:27:04 +00:00
Vania Januar
fccd16131b Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev 2023-04-04 13:24:36 +00:00
Taran Singh
a6c79eb283 Merge "[Settings] Make scribe setting default_on and secure" into udc-dev 2023-03-29 07:28:33 +00:00
Vania Januar
6e7d77a4bf Use the correct SettingsEnum for the USI device details page.
Bug: 261988317
Test: just an enum
Change-Id: I2d7820446f723c2a9d084f6913a7d675d83c31eb
2023-03-24 11:28:32 +00:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings."
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Taran Singh
1ec8dff6d6 [Settings] Make scribe setting default_on and secure
1. Migrate scribe pref to Settings.Secure
2. Consider enabled when not set.

Bug: 272376168
Test: atest StylusDevicesControllerTest StylusHandwritingPreferenceControllerTest.java


Change-Id: I4973a93c2cfe8c44f461b68fbda1a853e49340a2
2023-03-10 18:31:03 +00:00
Vania Januar
4837c05b3f Remove battery event time detection from StylusUpdater.
StylusManager battery listener now triggers whenever the
stylus battery becomes stale, so we no longer need to track
event time from the updater.

Bug: 270422546
Test: StylusDeviceUpdaterTest
Change-Id: I36f5dc132a95f7d4649cec2bda1d457edc1f64bd
2023-03-08 18:33:56 +00:00
Jason Hsu
57258a3765 Merge changes I13495cad,I3a44c4c4,I15bff230,I8a492866,Ia7ffe34a
* changes:
  [Pair hearing devices] Add pair hearing device functionality
  [Pair hearing devices] Extract common behavior in BluetoothPairingDetail into Base class
  [Pair hearing devices] Add "Hearing devices" to show connected hearing devices
  [Pair hearing devices] Add "Saved devices" to show bonded but not connected hearing devices
  [Audio routing] Setup basic structure for audio routing page
2023-02-09 04:04:03 +00:00
jasonwshsu
c1fb0ae240 [Pair hearing devices] Add "Saved devices" to show bonded but not connected hearing devices
* BaseHearingDevicePreferenceController will also be used in "Hearing devices", so extract to parent class first.

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(SavedHearingDeviceUpdaterTest|BaseBluetoothDevicePreferenceControllerTest|BluetoothDeviceUpdaterTest|AvailableMediaBluetoothDeviceUpdaterTest|ConnectedBluetoothDeviceUpdaterTest|SavedBluetoothDeviceUpdaterTest)"
Change-Id: I8a492866f48e3a664b9ff78bce5a4f082c0dc465
2023-02-09 10:17:25 +08:00
Vania Januar
c27efd7b31 Merge "Invert STYLUS_BUTTONS_DISABLED to avoid double negatives." 2023-02-07 08:28:48 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Avichal Rakesh
e6731b05e1 Add UVC support
This CL adds support for UVC GadgetFunction. UVC can be enabled/disabled
by setting the `ro.usb.uvc.enabled` property, and this CL makes sure
that the Settings app honors the property when showing USB functions to
the user.

Bug: 242344221
Test: Manually tested that the 'USB Webcam' option is present when the
      property is set, and removed when property is unset.
Change-Id: I5d1ff0a43d3c0c722bc9e03132a581da5c61bd76
2023-02-03 17:38:19 -08:00
Vania Januar
7584bbc015 Invert STYLUS_BUTTONS_DISABLED to avoid double negatives.
Test: StylusDevicesControllerTest
Bug: 267595764
Change-Id: I9f74aaf064eb08d4abb6800d59ee3c224f9793b8
2023-02-02 12:13:39 +00:00
Vania Januar
2756e39874 Replace circle icon on stylus settings to ic_edit.
Test: just icon change
Bug: 262375818
Change-Id: I037b7b3e421b837051176a699726be9a8c1ba22f
2023-01-31 14:56:22 +00:00
Vania Januar
e0da6513dc Merge "Show Scribe toggle in Stylus settings only if supported by current IME." 2023-01-23 13:30:42 +00:00
Edgar Wang
47fbf1d333 Merge "Set key for the SwitchPreferences of Connected devices > USB" 2023-01-11 04:07:05 +00:00
Vania Januar
5b52104be1 Show Scribe toggle in Stylus settings only if supported by current IME.
This also sends the user to the Scribe settings activity if
a settings activity exists for the current IME.

Bug: 255732419
Test: StylusDevicesControllerTest
Change-Id: I955a0f5a017b247e7623d66613e09dc0f7256ff2
2023-01-10 17:44:14 +00:00
Vania Januar
ce93c656aa Show None default app in stylus preference if no Notes holder.
This also fixes the role holder not updating when the
default role holder has changed.

Test: StylusDevicesControllerTest
Bug: 254834764
Change-Id: Iec7ed7698f18279da9a04918dcdf3e20e73609d1
2023-01-06 11:25:35 +00:00
Edgar Wang
f7a6d073f0 Set key for the SwitchPreferences of Connected devices > USB
Change-Id: Ib2fce60bf6843c8db2d45ebdd6bd576657aedeb8
Test: manual
2023-01-06 11:25:20 +00:00
Vania Januar
e5651cd86e Replace placeholder ROLE_ASSISTANT with ROLE_NOTES.
Bug: 254834764
Test: StylusDevicesController
Change-Id: I2303034180f9609db8f1a6d663c389a55dd04600
2023-01-04 16:22:38 +00:00
Vania Januar
57822a67a8 Pass CachedBluetoothDevice into StylusDevicesController.
Styluses can now be identified using the newly added DEVICE_TYPE_STYLUS
metadata.

Bug: 251200056
Test: StylusDevicesControllerTest
Change-Id: Ie89f6419cd16ed97299944b35497c6b2ee764dab
2022-12-29 12:31:31 +00:00
Vania Januar
dc2980d220 Stylus updater in ConnectedDevicesGroupController.
This updater is responsible for listening to USI stylus
battery usage, and bluetooth stylus connection, to determine
whether to show the USI stylus preference on the Connected devices
page.

Adds an entrypoint to the StylusUsiDetailsFragment that shows
details for USI styluses.

Bug: 250909304
Test: StylusDeviceUpdaterTest
Change-Id: I6ae6b6ef880b3b3cd7430d4d35d471b14283369f
2022-12-21 09:20:07 +00:00
Vania Januar
5a5dc81fd3 Merge "USI Stylus settings Fragment." 2022-12-16 13:32:48 +00:00
Vania Januar
44cb400f95 USI Stylus settings Fragment.
The USI stylus settings fragment shows specific preferences
for USI stylus devices only.

There is currently no way to access this fragment from the UI.

Bug: 251201006
DD: go/stylus-connected-devices-doc
Test: StylusUsiHeaderControllerTest
Change-Id: I18223abc8113dce977f57f930ba701da0a34cc18
2022-12-16 10:11:42 +00:00
Treehugger Robot
2f96743835 Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee am: 24835ea2f9 am: 8a26d010d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: I6b4edd0be16e090b56b628af51a0558c87822ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 13:41:13 +00:00
Treehugger Robot
8a26d010d0 Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee am: 24835ea2f9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 12:59:37 +00:00
changbetty
9d2b2ca5d8 Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk

Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
(cherry picked from commit c706aa6108)
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
2022-12-14 02:25:36 +00:00
Shen Lin
f677ee600a Align SETTINGS_PACKAGE_NAME reference to a single place
This CL migrated some fragmented declarations of Settings packageName.
When we want to referece package name of Settings, we prefer using
Utils#SETTINGS_PACKAGE_NAME.

Bug: 262123382
Test: make Settings -j64
Change-Id: Ice6afd993d5991bb3c50f676c637b9a5487261f7
2022-12-12 04:56:28 +00:00