Bonian Chen
f72035735c
Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp
2021-12-13 07:32:06 +00:00
TreeHugger Robot
9673300ea4
Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev am: 6dbc3835f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426486
Change-Id: Iadc95c4f5961003d562982148f9e916cf2cf97c6
2021-12-09 13:16:54 +00:00
Bonian Chen
e8711bd32c
[Settings] Fix failure test case
...
Fix test case in Robolectric.
Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950
)
2021-12-09 12:28:47 +00:00
ykhung
b3f3f3d4f2
Remove the replaced activity checking to impact launching performance
...
Bug: 209081502
Test: make SettingsRoboTests
Change-Id: Id8e2144a5965601be9c290bc4df6db0d0beb0917
Merged-In: Id8e2144a5965601be9c290bc4df6db0d0beb0917
2021-12-09 11:51:11 +00:00
Etienne Ruffieux
3a0084534f
Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf
am: 328169a11c
am: 76560b4e5b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631
Change-Id: I50c12636bb26250d58a6bd69dc1887e304fb876a
2021-12-06 16:18:10 +00: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
Treehugger Robot
96d33dbdbe
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
am: 7e7b1f720e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
2021-11-29 04:44:02 +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
afa860da18
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
am: ff1ebb31d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
2021-11-29 03:04:16 +00:00
Alice Kuo
6943c0356c
Add the pairing string for CSIP supported device am: f57f720c38
am: 5d1aee76c2
am: 2135db2eac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +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
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
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
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
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
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
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
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
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
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
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
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
YUKAI HUNG
a1d72c11c5
Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114
Change-Id: I2d78a4287aa740f1e583c8f570d52c2dc8d90bf7
2021-11-10 09:50:59 +00:00
ykhung
101dc6878a
Fix incorrect usage for the logging method to cause no data in WW
...
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only
Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I9f1d157c77df9bd74f441105318790a2505a9c01
2021-11-10 15:39:30 +08:00
TreeHugger Robot
0f6c95d4fd
Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939
Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
2021-11-10 02:18:39 +00:00
ykhung
64e49a9393
Fix "battery saver" not in the top seaching result for indexing
...
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
2021-11-10 00:11:09 +08:00
TreeHugger Robot
22b763486d
Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930
Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
2021-11-09 15:22:38 +00:00
ykhung
48c3533cd0
Fix incorrect usage for the logging method to cause no data in WW
...
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only
Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
2021-11-09 21:01:40 +08:00
Hugh Chen
4640a2a077
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999
Change-Id: Ieb2beb22a55230c7e7f283f6886b340b7821d67f
2021-11-09 07:27:19 +00:00
Hugh Chen
be094163b8
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956
Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
2021-11-09 07:24:27 +00:00
TreeHugger Robot
8072964193
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev
2021-11-09 06:58:39 +00:00
TreeHugger Robot
cd467e99d8
Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770
Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
2021-11-08 16:34:32 +00:00
Julia Reynolds
42896d7fe1
Check if pref is disabled by admin
...
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
TreeHugger Robot
ac476ff63b
Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316
Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29
Merge "Remove the text for untethered bt device" into sc-v2-dev
2021-11-04 04:08:45 +00:00
TreeHugger Robot
631c67dc8e
Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219
Change-Id: I248616eaed0c9c3d19612d702b97e851f1847e2a
2021-11-04 03:07:48 +00:00
TreeHugger Robot
12b7fd54ec
Merge "Add package name check for the calling app" into sc-v2-dev
2021-11-04 03:01:33 +00:00
Hugh Chen
ab3a70cf1e
Remove the text for untethered bt device
...
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
Jason Chiu
3b3203cd50
Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571
Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
2021-11-03 12:23:46 +00:00