Commit Graph

341 Commits

Author SHA1 Message Date
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
Vania Januar
259dec18b2 Toggle for disabling stylus buttons.
This change enables users to disable stylus button
pressed from the Stylus Connected Device details Settings page.

Bug: b/251199452
Test: StylusDevicesControllerTest
Change-Id: I807ef8d5a56c2177037dcb527630d8bfb8f86f7c
2022-11-30 16:08:20 +00:00
Vania Januar
2df165a58a Add a stylus controller to Bluetooth Device Details.
Feature is currently flagged behing SETTINGS_SHOW_STYLUS_PREFERENCES.

Bug: 251201006
Test: SettingsRoboTests StylusDevicesControllerTest
DD: go/stylus-connected-devices-doc
Change-Id: I438b7fe5ca1c94f9dfb506c8918d0e6cb005ca33
2022-11-30 16:06:14 +00:00
Betty Chang
ba3405bd37 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271 am: f200134fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: If5d07a5a3ae099d1cb765a2fbb3069ab0ac00285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:57:13 +00:00
Betty Chang
f200134fc4 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: I5195b9513c575bc28f0b6930a6c40c570048f6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:10:44 +00:00
changbetty
c706aa6108 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
2022-11-08 08:50:29 +00:00
Bill Yi
042554a0e4 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
2022-09-08 14:23:20 -07:00
Treehugger Robot
dba6ba52e3 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 am: d24f4a3f54 am: 41fc3efd4c am: 4b4795676e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I800ac3cd490776b7c24c50b8d782a0937671f31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 02:19:04 +00:00
Treehugger Robot
d24f4a3f54 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 00:41:43 +00:00
Shen Lin
0b9a6304aa Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page
This patch contains two fixes:

- Make sure mUwbManager is non-null by calling isUwbSupportedOnDevice to avoid a NPE.
- Modify AdvancedConnectedDeviceDashboardFragment, add lifecycle observer only if device supports UWB.

Bug: 244871579

Test: manual test and Robotest.
Change-Id: I78f97794a66f3fb487f067c4570899e21c254acf
2022-09-06 14:55:08 +08:00
SongFerngWang
76870250e8 Add owner for job handover
CP from the AOSP aosp/2200280.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
Merged-In: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-02 07:01:25 +00:00
SongFerng Wang
b46e4b0755 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8 am: 954b9bafd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I04b81ad2487b069d3ee9c9a009fbc824d87ce5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 14:21:35 +00:00
SongFerng Wang
545db0361f Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 12:37:38 +00:00
SongFerngWang
2d59130485 Add owner for job handover
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-01 16:09:35 +08:00
Kweku Adams
5949fccc7a Remove duplicate strings.
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
Jason Chiu
8cef068117 Make bluetooth not discoverable via large screen deep link flow
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
(cherry picked from commit 5df14831b8)
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-07-29 22:35:44 +00:00
Jason Chiu
5df14831b8 Make bluetooth not discoverable via large screen deep link flow
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:16:41 +00:00
Jason Chiu
6dcbb25fa5 Make bluetooth not discoverable via large screen deep link flow
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:15:22 +00:00
jasonwshsu
acd3f94fde Pop up pairing another ear dialog when detecting hearing aid is a set
* Pop up dialog in 'Connected deivce' page and 'Accessibility -> Hearing
  aids' page

Bug: 225117454
Bug: 226511985
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtils

Change-Id: I34a1e3ac680a7efe97dc501bfbe93f840ad16364
2022-05-14 22:16:22 +00:00