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
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
Sergey Nikolaienkov
13d7e086e6
Merge "Fix usage of the updated CDM APIs"
2021-11-26 06:38:03 +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
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
Adam Bookatz
8ca17560e5
Use UM.canAddMoreUsers and UM.isUserTypeEnabled
...
Settings shouldn't allow creating users if the type is diabled, and it
shouldn't allow creating more of a particular user type if no more can
be created (even if more can be created of other user types).
Previously, Settings didn't take into account the user type when
querying whether more users could be created.
Bug: 192577100
Test: com.android.settings.users.UserSettingsTest
Change-Id: I065478fd14779f528be4edce8ae215391a752ef4
2021-11-23 14:55:28 -08:00
Lais Andrade
24b2d9e5a1
Move APPLY_RAMPING_RINGER from Global to System
...
This configuration should be user-scoped.
Bug: 184165158
Test: AccessibilitySettingsTest
RingVibrationPreferenceFragmentTest
VibrateForCallsPreferenceControllerTest
VibrateForCallsPreferenceFragmentTest
Change-Id: I7b8684fb1cf03d41872a700fd8732c76422e37c3
2021-11-23 14:51:55 +00:00
Sergey Nikolaienkov
7fea5bd54f
Fix usage of the updated CDM APIs
...
Bug: 194301022
Test: make
Change-Id: I70633f43d37fdeec8329e0c58f7cffa402dba689
2021-11-23 13:36:34 +00:00
TreeHugger Robot
74a797efd8
Merge "Fix NPE on UsbManager in w/o usb devices"
2021-11-23 12:38:46 +00:00
Hugh Chen
f5a236e0e8
Fix NPE on UsbManager in w/o usb devices
...
Bug: 206987614
Test: make -j64 RunSettingsRoboTests
Change-Id: I9ed4c2e803f3e7018518380667658ca0015f31a7
2021-11-23 09:11:22 +00:00
SongFerngWang
73f1633973
[MEP] eSIM deprecated API Refactoring
...
The telephony APIs were changed, the Settings needs the refactoring.
Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)
Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2021-11-22 12:03:46 +08:00
Kevin Han
6dc2c76da0
Merge "Unhibernate an app when a user exempts it" into sc-v2-dev am: 83a8b76ec2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16286576
Change-Id: Icacd93b1f5b0cfe950dd4e4ccc0f8081ad1d58c3
2021-11-18 21:58:23 +00:00
Kevin Han
83a8b76ec2
Merge "Unhibernate an app when a user exempts it" into sc-v2-dev
2021-11-18 21:37:46 +00:00
Zoey Chen
54c11f53cc
Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d
am: ca02377238
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278
Change-Id: Id27a7fed84ef5e33edddc4e951b77d7705d8e9be
2021-11-18 20:27:46 +00:00
Zoey Chen
ca02377238
Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278
Change-Id: I40d08bd3d76425c504c2f17cf73a36e36d261615
2021-11-18 19:48:11 +00:00
Matt Pietal
eecacebf5d
Merge "Allow a settings override for double-line clock"
2021-11-18 15:14:33 +00:00
Zoey Chen
c8ee867f2d
Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev
...
* changes:
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
2021-11-18 13:26:31 +00:00
Betty Chang
8ed7411e88
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
am: 4375590837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: Ie89df57dc909dd6e7272c799bfd390a476b2a4cd
2021-11-18 06:47:22 +00:00
Betty Chang
4375590837
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
2021-11-18 06:30:27 +00:00
Betty Chang
21967a6ff8
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev
2021-11-18 06:18:08 +00:00
TreeHugger Robot
e4dca4c6db
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
am: 2fc75eba80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Ib2df8aa1538faf51d375dc92cc978039f0da9768
2021-11-18 03:52:25 +00:00
TreeHugger Robot
2fc75eba80
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev
2021-11-18 03:25:05 +00:00
Kevin Han
39f038137e
Unhibernate an app when a user exempts it
...
When an app is exempted from hibernation, we unhibernate as well. This
prevents confusing situations where a user may return to the "Unused
Apps" page and sees that the app is still there even after exemption.
Bug: 205641871
Test: atest HibernationSwitchPreferenceControllerTest
Change-Id: I4f98a2212eefdb6c456a0de36d428021b262cca3
2021-11-17 22:38:45 +00:00
Matt Pietal
a5415907ea
Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 19:29:19 +00:00
Matt Pietal
d8ca5298ec
[DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
TreeHugger Robot
b13b2fd8ee
Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev
2021-11-17 17:12:37 +00:00
changbetty
39ebb7c9a8
Remove feature flag for provider model in wifi settings
...
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
2021-11-17 15:57:14 +00:00
Matt Pietal
cb4836b486
[DO NOT MERGE] Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
Zoey Chen
e714654c94
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
...
Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
2021-11-17 13:09:48 +00:00
Zoey Chen
439bc7f9dd
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
...
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
2021-11-17 10:37:41 +00:00
Zoey Chen
5515e9bde5
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
...
Test: atest NetworkProviderCallsSmsFragmentTest, SubscriptionsPreferenceControllerTest
Bug: 197066557
Change-Id: I55e0fa2ca7317cd8c9d1bce7c229b8344f43cc92
2021-11-17 10:37:20 +00:00
SongFerng Wang
9a7f3aaf0e
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev
2021-11-17 06:42:29 +00:00
SongFerng Wang
f5e2d52f43
Merge "Revert "Device do network scan after user rotates NetworkSelection page""
2021-11-17 06:24:53 +00:00
Gary Jian
13a0a175f2
Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
am: 782506f61c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269
Change-Id: I20b4111b21ea17e7502745974b5bc93710d79c43
2021-11-17 02:02:33 +00:00
Gary Jian
782506f61c
Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269
Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
2021-11-17 01:46:25 +00:00
Kevin Chyn
156db33a56
Disable combined controller only if all modalities require consent
...
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.
Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
Sandeep Jawalkar
8bd3afc334
Merge "eSIM deprecated API test Refactoring"
2021-11-16 16:46:04 +00:00
SongFerng Wang
fd81a18b8e
Merge "Lost the registered cellinfo item after the aggregation"
2021-11-16 10:20:32 +00:00
Gary Jian
68b861930a
Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
...
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
f0575366c4
Lost the registered cellinfo item after the aggregation
...
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:39:44 +08:00
SongFerngWang
4d00bce2b2
Lost the registered cellinfo item after the aggregation
...
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
Ronish Kalia
0b30679a2c
Merge changes from topic "qr-code-and"
...
* changes:
Add tests for QRCodeScannerPreferenceController
Add a new setting for QR Code Scanner button on lockscreen
2021-11-15 16:35:45 +00:00
sandeepjs
40ffe69a3e
eSIM deprecated API test Refactoring
...
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
2021-11-15 05:44:54 +00:00
SongFerng Wang
3c9580d573
Revert "Device do network scan after user rotates NetworkSelection page"
...
This reverts commit f54ead1f94
.
Reason for revert: using another way. ag/16259258
Change-Id: I4ae695237cb3417cb3d08fcbb3354dc649681aab
2021-11-15 04:50:25 +00:00
Kevin Han
4b59b75c59
Merge "Unhibernate an app when a user exempts it"
2021-11-12 21:09:07 +00: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
SongFerng Wang
990b4c4662
Merge "Device do network scan after user rotates NetworkSelection page"
2021-11-11 11:51:24 +00:00