PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,842 Commits 1 Branch 0 Tags
7c939b9e4f606d014e565ff849af8b7909ff1b51
Commit Graph

85842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
7c939b9e4f Merge "Update biometrics OWNERS." am: fe99de597e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117

Change-Id: I8cd2a34eed6b830896d1370b877dbfdac15221a8
 2021-12-08 18:37:58 +00:00
Joe Bolinger
fe99de597e Merge "Update biometrics OWNERS." 2021-12-08 18:30:44 +00:00
Etienne Ruffieux
328169a11c Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: I248efd0968d1a4c3207d78c9d015142ba9e02030
 2021-12-06 15:40:19 +00:00
Etienne Ruffieux
0e1a4d3bdf Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" 2021-12-06 15:16:44 +00:00
Treehugger Robot
ad041d78ee Merge "Minor clean-up for LE audio setting" am: e41d1b9761 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
 2021-11-29 03:58:28 +00:00
Treehugger Robot
e41d1b9761 Merge "Minor clean-up for LE audio setting" 2021-11-29 03:41:49 +00:00
Treehugger Robot
0a69b346c8 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I1e70974396efc1eaf4e389cc35a2789849e696af
 2021-11-29 02:29:32 +00:00
Alice Kuo
eb412a0614 Handle csip set member automatic pair in Setting am: 629611a43e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: If9172095a2688a0fbe588ccbae96076e9cf8b133
 2021-11-29 02:29:32 +00:00
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
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
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
Bonian Chen
16b298ef92 Revert "[Settings] Code refactor DataSaverSummary" 
This reverts commit 0ea486d1e5.

Reason for revert: build breakage

Change-Id: Id4c7689ae6f82ab05987365551a06debc1676aa5
 2021-10-12 06:14:17 +00:00
Treehugger Robot
ef03b3a361 Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594

Change-Id: I8e4f9e3429948ba709dfa40eb56f7c428813590c
 2021-10-12 06:09:37 +00:00
Treehugger Robot
e7b211b35e Merge "[Settings] Code refactor DataSaverSummary" 2021-10-12 05:56:21 +00:00