Commit Graph

85992 Commits

Author SHA1 Message Date
Alice Kuo
f6f0126b8e Do not update the previously connected devices for the sub device am: c78fb83aee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289
2021-11-29 02:29:31 +00:00
Alice Kuo
6aa53808f3 Accept the pairing request automatically for the set member pairing am: 61460a1ab1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I2cce585de893512005af7abf35f5729351512cea
2021-11-29 02:29:30 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00
Alice Kuo
0d964f7633 Minor clean-up for LE audio setting
Bug: 178981521
Test: build pass
Change-Id: Ica8bd68bea494ee72fa53fbb8f9101dc535470b6
2021-11-29 10:18:47 +08:00
Treehugger Robot
8f91ac3e83 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ...
* changes:
  Update the LE audio device into the media device category
  Handle csip set member automatic pair in Setting
  Do not update the previously connected devices for the sub device
  Accept the pairing request automatically for the set member pairing
  Show the multiple Mac address for the coordinated set
  Add the pairing string for CSIP supported device
2021-11-29 02:11:27 +00:00
Alice Kuo
3487843496 Update the LE audio device into the media device category
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater

Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
Merged-In: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
2021-11-26 14:02:07 +08:00
Alice Kuo
629611a43e Handle csip set member automatic pair in Setting
Move the set member handle to setting. SystemUI and Setting have the
individual settingLib instance. If we trigger pairing inside settingLib,
the action would be called twice. SystemUI does not contain the concept
to handle the pair interaction. Setting would take the action to
createBond for CSIP automatically.

Bug: 201758444
Bug: 150670922
Test: Pair the coordinated set devices, and check the set member pairing
would be done automatically without the pairing dialog

Change-Id: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
Merged-In: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
2021-11-26 13:53:46 +08:00
Alice Kuo
c78fb83aee Do not update the previously connected devices for the sub device
As bluetooth turn on, and device reboot, UI will show the sub device
entry for hearing aid device or csip device. Check if the device is a sub device, do not update the cachedDevice information.

Bug: 150670922
Bug: 178981521
Test: bonded with a coordinated set. Check the UI only have one entry as Bluetooth turn on and device reboot.
Change-Id: I03dfdc25b57e614194fb8de2c9265edd50760d30
Merged-In: I03dfdc25b57e614194fb8de2c9265edd50760d30
2021-11-26 13:34:12 +08:00
Alice Kuo
61460a1ab1 Accept the pairing request automatically for the set member pairing
Check the pairing request from which device that if it's the outgoing
set member pairing, accept the pairing request automatically to make the
CSIP pairing seamless.

Bug: 178981521
Bug: 150670922
Test: Pair one of the CSIP device, and confirm the other set member can
paired without the confirmation from user

Change-Id: I40afabb09b4cb12a0253035452c9f6974799ed05
Merged-In: I40afabb09b4cb12a0253035452c9f6974799ed05
2021-11-26 13:22:15 +08:00
Alice Kuo
9f11a4cddf Show the multiple Mac address for the coordinated set
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
Treehugger Robot
90a326dc3c Merge "Hide emergency APN in user settings" am: 6c553c0c5c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: Id5f63157fc108b45a23a9a07572b719053945b7c
2021-11-25 10:57:05 +00:00
Treehugger Robot
6c553c0c5c Merge "Hide emergency APN in user settings" 2021-11-25 09:58:12 +00:00
Android Build Coastguard Worker
04f4cc429a Merge cherrypicks of [16061618, 16099517, 16093937, 16144999] into sc-qpr1-release.
Change-Id: Ief49976e9d02a64fcc9987a2fa9c8cc9fe0d739c
2021-11-24 23:26:14 +00:00
Hugh Chen
3f280c15b1 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
(cherry picked from commit b1adf980a5)
Merged-In:Ia04ab759b737acf30b782f5c5831dd59f25fb257
2021-11-24 23:23:54 +00:00
changbetty
76fc500d9b Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
(cherry picked from commit aab7b55926)
Merged-In:I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-11-24 23:23:45 +00:00
Bill Yi
7f0320483c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
(cherry picked from commit 52146b1b0a)
Merged-In:Idf72f0b25491f38f592613b85cd7e20c5935681a
2021-11-24 23:23:38 +00:00
Bill Yi
eaf56ad8fe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
(cherry picked from commit 8a603688a7)
Merged-In:I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
2021-11-24 23:23:32 +00:00
Mattias Nilsson
6a56b4a8e6 Hide emergency APN in user settings
Emergency APN types is not something for the end user
and should not be possible to edit.

Test: Add an emergency APN and check in Settings
Bug: 207626003
Change-Id: I866eb98dce410218bc76ade3201a2a2abfc959e7
2021-11-24 16:43:42 +01:00
Joe Bolinger
78e700fd31 Update biometrics OWNERS.
Test: N/A
Change-Id: Ia9e71da5fd13b46c3a897b8aabaca0865b3fb87c
2021-11-23 15:36:53 -08:00
Jack Yu
79675e89f2 Merge "NFC support in work profile" am: c2647199ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Iac30f77fd5d732bb3b50fc531600fed02d477919
2021-11-22 11:00:16 +00:00
Jack Yu
c2647199ce Merge "NFC support in work profile" 2021-11-22 10:45:44 +00:00
Jack Yu
2a2e0275cc NFC support in work profile
Configure NFC payment settings based on userId.

Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
2021-11-15 19:03:34 +08:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
2021-11-11 16:54:23 +00:00
Etienne Ruffieux
e004eaa51b Make BluetoothCodecConfig and BluetoothCodecStatus public
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
2021-11-10 10:12:51 +00:00
Treehugger Robot
f7836dd7bc Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I2db800ef165041f79b7465768bcc57ff00873c2d
2021-11-09 07:35:39 +00:00
Treehugger Robot
d3d24b65ac Merge "Add entry point for adaptive brightness settings" 2021-11-09 07:13:50 +00:00
Jun Ono
89c2c5e9c0 Add entry point for adaptive brightness settings
Test: adb shell am start -a android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS
Bug: 187332145
Change-Id: Ifd81bfb3b0abc3ea10a062cb49fab20f6ef3fdfc
2021-11-05 17:27:41 +00:00
Bill Yi
eda6485a4b [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
2021-11-02 21:07:55 -07:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
2021-11-02 14:11:57 -07:00
tim peng
a4197a7aa1 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I62be3678022753eaba32209c33f95edf220294f1
2021-11-01 06:22:15 +00:00
tim peng
41cfaa9f29 Merge "Phone fails to switch channel mode from stereo to mono" 2021-11-01 06:02:26 +00:00
Tim Peng
07b3675717 Phone fails to switch channel mode from stereo to mono
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
2021-10-29 03:28:14 +00:00
Weng Su
400e5b0fba Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +00:00
Android Build Coastguard Worker
f06e9dd5df Merge cherrypicks of [16066342, 16067131, 16067132, 16067098, 16067099, 16067100, 16067101, 16067102] into sc-qpr1-release
Change-Id: I2ea689bdb16fa799424ea430883556d5bf31b27a
2021-10-15 21:33:32 +00:00
SongFerngWang
b172582c14 The Network name is not same as statusbar at SIM Edit page
Using subscriptionInfo to get the network name.

Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)

Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
(cherry picked from commit 050b6d5224)
2021-10-15 21:33:27 +00:00
changbetty
435c3385f6 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
(cherry picked from commit bfd3020038)
2021-10-15 21:33:24 +00:00
Bonian Chen
d7ced5df54 [Settings] Crash when resetting downloaded eSIM
Context need to be maintained when performing async operation in
background thread.

Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
(cherry picked from commit 8aa98d63fd)
(cherry picked from commit 21f7095b3a)
2021-10-15 21:33:22 +00:00
Weng Su
ba67825a54 Add WIFI_SCANNING_SETTINGS action to Settings
- Export the interface for System UI to launch Wi-Fi Scanning Settings.

Bug: 202323013
Test: manual test by adb to launch Wi-Fi scanning settings below
adb shell am start -a android.settings.WIFI_SCANNING_SETTINGS

Change-Id: I893d3cea40d1f3ed4a962009416f54c99a91e11f
(cherry picked from commit 9e6966d1c2)
2021-10-15 21:33:19 +00:00
changbetty
565d44c4f8 Add String for information about Wi-Fi scanning when Wi-Fi is off.
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
(cherry picked from commit b7509a3079)
2021-10-15 21:33:14 +00:00
Roopa Sattiraju
f2295126b6 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master 2021-10-14 18:17:20 +00:00
Steven Moreland
90181319da Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I1ecba7ee53fead58d83d159f2849e3798e7198fd
2021-10-14 17:48:04 +00:00
Steven Moreland
5d30c2de37 Merge "getBlobAshmemSize -> getOpenAshmemSize" 2021-10-14 17:43:16 +00:00
Steven Moreland
519546ce3e getBlobAshmemSize -> getOpenAshmemSize
This API returns the total size of all ashmem memory that is in FDs that
is owned by a Parcel object. It was renamed a while ago, but the name
was never updated in Java.

Bug: 202029388
Test: N/A
Change-Id: Icc428063083110952cf3951721d69cbb919429b1
2021-10-13 11:01:10 -07:00
Bonian Chen
dcd13abd65 Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597

Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7
2021-10-12 06:50:56 +00:00
Bonian Chen
b0a2857ec5 Merge "Revert "[Settings] Code refactor DataSaverSummary"" 2021-10-12 06:36:35 +00:00