Commit Graph

38187 Commits

Author SHA1 Message Date
Bonian Chen
59e07d18f3 Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9 am: d692413d83
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382

Change-Id: I55f18581b7980da472dbbd20f843fcc03a27ea72
2021-12-22 05:03:45 +00:00
Bonian Chen
48c945e9b5 [Settings] Expand the display area of PIN error message
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.

This is a change to expand the display area to max. capacity but remain
tightly wrap the text.

Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
2021-12-21 14:08:58 +08:00
Xin Li
971abb190b Merge SP1A.211205.008
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
Treehugger Robot
26bf610fd9 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67
2021-12-15 07:23:26 +00:00
Treehugger Robot
bb994f627f Merge "Settings: Extend the data role swap timeout value" 2021-12-15 06:49:44 +00:00
Bonian Chen
2bed540284 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
2021-12-14 02:46:04 +00:00
Bonian Chen
54e4845d54 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
2021-12-14 02:30:53 +00:00
SongFerng Wang
38a109d745 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
2021-12-14 02:22:54 +00:00
Bonian Chen
078f873ccc Merge "[Settings] Refactor Wifi Calling description text" 2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
2021-12-14 01:58:22 +00:00
SongFerngWang
ce7d4b730c To disable the preferred network mode UI during calling.
It is the modem limitation, so disable the preferred network mode UI
during calling.

Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
2021-12-14 04:16:44 +08:00
Alex Johnston
6b792ce56b Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: I02c96d91aa737bbe07fe6095be07eda384cc3a17
2021-12-09 12:21:39 +00:00
Alex Johnston
c745bc427e Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: Ib4a03feff7c118afaeae5553f94d9915881c2e4e
2021-12-09 12:05:20 +00:00
Alex Johnston
02e8f56e67 Add non system overlay flag to InstallCaCertificateWarning
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
2021-12-08 21:18:03 +00:00
Joe Bolinger
687bccdd6f Merge "Update biometrics OWNERS." am: fe99de597e am: 7c939b9e4f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117

Change-Id: I24532d402b923f5a4957900e4cf9a5649a9c6919
2021-12-08 18:45:59 +00:00
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
hoffc
d4f420350d Settings: Extend the data role swap timeout value
Switching USB data role from device to host, it takes more than 3s in some devices, so 3s timeout is not enough.

Extend 3s timeout to 4s to be compatible with some devices with slow swap.

Bug: 209541948

Change-Id: I172498d66c5b12166162f2c55d94f0d441c7459c
2021-12-07 17:23:41 +08:00
Etienne Ruffieux
76560b4e5b Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf am: 328169a11c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: I311cab0f288cdbb93f63f5492c6db17087092bdc
2021-12-06 16:03:50 +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
Bonian Chen
010306644b [Settings] Refactor Wifi Calling description text
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.

Bug: 204844012
Test: local
Change-Id: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
2021-11-30 13:57:56 +00:00
Treehugger Robot
7e7b1f720e Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
2021-11-29 04:27:25 +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
ff1ebb31d4 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

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

Change-Id: Ibb8140b8af96036750457a6866eb9ba410bc0b84
2021-11-29 02:48:46 +00:00
Alice Kuo
1da3264140 Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

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

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

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

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
2021-11-29 02:48:43 +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
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
d36b37ab1c Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I8ed9aa66573560824dac6c09295effecd7ee190d
2021-11-25 11:14:15 +00: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
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
3ccf7e29f8 Merge "NFC support in work profile" am: c2647199ce am: 79675e89f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: I6526b8a3f83c72870a93777d37242f1fb191568f
2021-11-22 11:12:20 +00: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