Commit Graph

84849 Commits

Author SHA1 Message Date
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
Joe Bolinger
fe99de597e Merge "Update biometrics OWNERS." 2021-12-08 18:30:44 +00:00
Etienne Ruffieux
0e1a4d3bdf Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" 2021-12-06 15:16:44 +00:00
Treehugger Robot
e41d1b9761 Merge "Minor clean-up for LE audio setting" 2021-11-29 03:41:49 +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
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
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
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
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
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
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
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +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
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
e7b211b35e Merge "[Settings] Code refactor DataSaverSummary" 2021-10-12 05:56:21 +00:00
Bonian Chen
0ea486d1e5 [Settings] Code refactor DataSaverSummary
Remove unused Callbacks.

Bug: 202792574
Test: local and presubmit
Change-Id: I185c083fd1621b0256e55339e9688d6b190dee32
2021-10-12 11:53:32 +08:00
David Magno
6031a6ef69 Keep compatibility for old WiFi shortcut
WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
2021-10-11 18:26:09 +02:00
Xin Li
433825250d Merge "Merge Android 12" 2021-10-07 23:50:04 +00:00
Xin Li
47a40615ea Merge Android 12
Bug: 202323961
Merged-In: Ib853137811901796f73e4d720accb3249a7db963
Change-Id: I2febbf79bb9858cd6c7a5e1c47bcecbac83398fd
2021-10-06 22:53:58 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
2021-09-28 19:39:58 +00:00
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
2021-09-28 07:55:18 +00:00
Treehugger Robot
15c0678ca8 Merge "[Settings] backport missing CL" am: a8ee80e95a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I09f384d8d7073270d4bf460e91a52021a69e3e19
2021-09-24 10:24:31 +00:00
Treehugger Robot
a8ee80e95a Merge "[Settings] backport missing CL" 2021-09-24 10:10:37 +00:00
Bonian Chen
dc3c1e8a4b [Settings] backport missing CL
aosp/1258356 got missing when merging several CLs of refactor code in
aosp/1281915.

Bug: 186543910
Test: local
Change-Id: I34287b22fec4da660c7b44b5953eb16591cfb2d7
2021-09-24 15:45:30 +08:00
vichang
e6bf1a83d8 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0
2021-09-21 10:52:53 +00:00
vichang
3166166bdd Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" 2021-09-21 10:42:27 +00:00
Victor Chang
fc4589448b Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest
The time zone transitions can be obtained via the public API
ZoneId.getRules() instead.

Bug: 119751170
Test: atest SettingsRoboTests
     com.android.settings.datetime.timezone.TimeZoneInfoPreferenceControllerTest passes
Change-Id: I2c7864580b2a36b725ee250253e97f6cc86d72a4
2021-09-20 15:57:42 +01:00
Android Build Coastguard Worker
889ed9ff44 Merge cherrypicks of [15831545, 15831526, 15831634, 15831684, 15831293, 15831546, 15831847, 15831808, 15831638, 15831639, 15831558, 15831793, 15831794, 15831795, 15831796, 15831797, 15831798, 15831799, 15831800, 15831801, 15831802, 15831803, 15831804, 15831640, 15831849, 15831810, 15831811, 15831850, 15831641, 15831805, 15831812, 15831642, 15831813, 15831851, 15831852, 15831887, 15831888, 15831559, 15831814, 15831815, 15831853, 15831854, 15831855, 15831315] into sc-release
Change-Id: Idba243ecf8aa84f91801a46b05aa68073f27f889
2021-09-15 00:11:47 +00:00
ykhung
4d67f4c847 Hide Camera background running time in the battery usage screen
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
(cherry picked from commit 4e3f692164)
2021-09-15 00:10:55 +00:00
Neil Fuller
d2eca211d4 Merge "Swap ownership to mingaleev@" am: f6fe44dc91
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I9be5d173953df0a90ee1309feceed35f9240c18c
2021-09-13 11:17:50 +00:00
Neil Fuller
f6fe44dc91 Merge "Swap ownership to mingaleev@" 2021-09-13 11:03:08 +00:00
Neil Fuller
b46adff0f4 Swap ownership to mingaleev@
BUG=189810551

Change-Id: I6304545540947d6695117753309c80b27cf2669a
2021-09-10 12:20:39 +00:00
Bonian Chen
6c1c8934a2 [automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92 -s ours
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e is already in history

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

Change-Id: Iab613dc14204401318bd69648dad6c7d2f49e723
2021-09-10 09:59:38 +00:00
Bonian Chen
4c3f454c92 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" 2021-09-10 09:46:32 +00:00
Ting Yu
638f12a6c8 Fix Text of VoLTE setting cannot be updated when SIM state is changed
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
   Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.

Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.

Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.

Test: manual
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
2021-09-10 01:17:26 +00:00