PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,335 Commits 1 Branch 0 Tags
a7cdcb15b9955392d6e7cc3824c191ecf9841755
Commit Graph

13224 Commits

Author SHA1 Message Date
Bonian Chen
67b1ed67cf Merge "[Settings] Fix failure test case" 2021-12-09 12:26:17 +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
ykhung
0eb6c4fb34 Remove the replaced activity checking to impact launching performance 
Bug: 209081502
Test: make SettingsRoboTests
Change-Id: Id8e2144a5965601be9c290bc4df6db0d0beb0917
 2021-12-09 09:44:11 +00:00
Bonian Chen
c4e09e6950 [Settings] Fix failure test case 
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
 2021-12-08 12:34:57 +08:00
Lais Andrade
fe2ed12d26 Move vibrate for calls setting to "Vibration & haptics" screen 
Move setting to configure "Vibrate for calls" into "Vibraiton & haptics"
screen. Also make this page accessible via both Accessibility and
"Sound & vibration" settings pages.

Bug: 185351540
Test: SoundSettingsTest
      manually using the settings app and checking updates
Change-Id: I7e40af3f332fdff8afd1a31d54a676f7e13a6678
 2021-12-06 17:23:56 +00:00
Etienne Ruffieux
0a3cbd319e Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf am: 328169a11c am: 76560b4e5b am: 3a0084534f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: Ib4065e57d28f4b253c45bb212fb157095a66403e
 2021-12-06 16:34:05 +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
Andrew Zeng
c71fe8cab1 Remove unncessary constraintlayout-solver deps 
This will be cp'ed to master later

Bug: 192617148
Test: compiles
Change-Id: Id7a9cf6c26ff9dd464d8f0b0f012b8480ca70b92
 2021-11-29 23:32:10 +00:00
Adam Bookatz
cd429e74db Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled" 2021-11-29 21:00:48 +00:00
Treehugger Robot
689086b230 Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e am: 96d33dbdbe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
 2021-11-29 04:56:43 +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
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
Hugh Chen
3f280c15b1 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
(cherry picked from commit b1adf980a5)
Merged-In:Ia04ab759b737acf30b782f5c5831dd59f25fb257
 2021-11-24 23:23:54 +00:00
changbetty
76fc500d9b Add location check for Wifi Scanning notify message 
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
(cherry picked from commit aab7b55926)
Merged-In:I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
 2021-11-24 23:23:45 +00: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
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
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
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
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
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
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