Commit Graph

80077 Commits

Author SHA1 Message Date
TreeHugger Robot
0a4b9635af Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb08177edbc36071cfb2128cd05f514224b90d48
2021-03-03 13:03:30 +00:00
TreeHugger Robot
4399c4af3c Merge "Refactor Usb settings" into sc-dev am: decaeda453
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifef575c33a1ae1d01142ba11f76904da3ac3d9d0
2021-03-03 13:02:45 +00:00
TreeHugger Robot
42ac293a53 Merge "Return RESULT_OK RequestManageCredentials" into sc-dev 2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453 Merge "Refactor Usb settings" into sc-dev 2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627 Return RESULT_OK RequestManageCredentials
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
2021-03-03 11:30:46 +00:00
TreeHugger Robot
2d50b0139c Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev am: d1718c3a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id574717ab35b9748db50b065aaca2d57ccce2f73
2021-03-03 10:55:03 +00:00
Thiebaud Weksteen
439c9ecaf3 Merge "Add summary for 2G toggle option" into sc-dev am: c1110efc19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a2e4e005432f45a383f3be33e4468b3514e19c2
2021-03-03 10:53:52 +00:00
Hugh Chen
0091ae6142 Refactor Usb settings
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.

Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
TreeHugger Robot
d1718c3a15 Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev 2021-03-03 10:10:41 +00:00
Thiebaud Weksteen
c1110efc19 Merge "Add summary for 2G toggle option" into sc-dev 2021-03-03 09:23:49 +00:00
Tim Peng
d6eb5237e2 [Fix]Test cast fail at BaseBluetoothDialogPreferenceTest
Bug: 181740451
Test: make -j50 RunSettingsRoboTests
Change-Id: I8b786272f50680e9e388ca64bb8d3410b85b327a
2021-03-03 17:02:07 +08:00
Zoey Chen
ea29704e40 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-03 16:23:52 +08:00
Paul Hu
8c38e9543e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Sally Yuen
dd48ce173c Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c02ac6ac922f5e61c49c3ac4c5814f60891e38a
2021-03-03 03:23:36 +00:00
Sally Yuen
aaff760df0 Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev 2021-03-03 03:03:35 +00:00
Paul Hu
ddf3efb070 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
2021-03-03 02:59:37 +00:00
Minche Li
ec6b737ddc Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8c364416c0fe5ba23043c9bd225edbe14a36311
2021-03-03 02:59:23 +00:00
Minche Li
ecf1c07e63 Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev 2021-03-03 02:24:09 +00:00
Paul Hu
2b1e3a971f Merge "Update Utils#getTetheringLabel usage on Settings" 2021-03-03 02:15:22 +00:00
Sudheer Shanka
a817daf16c Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05 am: 521bf40280
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib005b5a94a2731c90985cc9d4242174be58fb150
2021-03-03 00:59:05 +00:00
Sudheer Shanka
521bf40280 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2aac37f3686f6d46e3cace0dcbd0c4a4886e1cfb
2021-03-03 00:36:23 +00:00
Bonian Chen
a309158d59 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba59a757851e285cdb00c5bd4ed8a869f450f515
2021-03-03 00:24:15 +00:00
Sudheer Shanka
1e04fd7a05 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1959ff61fdc91f0006d9eda91ccde6917025e07c
2021-03-02 23:54:36 +00:00
Bonian Chen
3f211d4c64 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev 2021-03-02 23:19:24 +00:00
Sudheer Shanka
bf29c73cb7 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
2021-03-02 23:01:32 +00:00
Yu-Han Yang
f7513d9821 Add showSystem to RecentLocationAccess (Settings)
Bug: 180533061
Test: on device
Change-Id: Ie232bc84d7875897316e978ed3deac9656ebec5f
2021-03-02 14:05:35 -08:00
Sudheer Shanka
90f59be59a Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." 2021-03-02 21:55:30 +00:00
Janis Danisevskis
b5caf84154 Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.

Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
2021-03-02 13:52:46 -08:00
Treehugger Robot
e385fbb0c9 Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee am: 2a6d2e4a2d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib498737de924d759ac87d91b61560bb61a9588b0
2021-03-02 21:05:59 +00:00
Jordan Liu
b888db21bc Turn off translations for string am: 00f07cf138
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic957702730322293460b43f80dabaa575d562a10
2021-03-02 21:05:16 +00:00
Treehugger Robot
2a6d2e4a2d Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sally Yuen
dc47aabf43 Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic823a917fd58d3ade0bd9e4f8bcb910ca398bcf2
2021-03-02 18:39:34 +00:00
Sally Yuen
ad03e652ac Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96f557138c3aeda3b4cfd93d5de8297ae5d5bba3
2021-03-02 18:39:24 +00:00
Jordan Liu
00f07cf138 Turn off translations for string
Also move to config.xml and rename config_*.

Bug: 178490564
Test: no behavior change, follow up with testers to make sure manual
test is fixed

Change-Id: Idc1828c936121928e13ecf11f5437c3488f87565
2021-03-02 18:09:47 +00:00
sallyyuen
6a22201c7c [Reduce Bright Colors] Add labels to intensity slider
Test: Manual
Bug: b/128465252
Change-Id: I278aed9a7da552d787c7b5426504f6f429d4d6ab
2021-03-02 09:46:45 -08:00
Sally Yuen
4d5a03da7e Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev 2021-03-02 17:38:30 +00:00
Sally Yuen
18923596c4 Merge "[Reduce Bright Colors] reorder preferences" into sc-dev 2021-03-02 17:31:15 +00:00
Thiébaud Weksteen
fc593b92c2 Add summary for 2G toggle option
Bug: 181667681
Test: build & manually verify toggle text
Change-Id: Ie086b2e3e277b4bfd612bf2a4437e48fa931c1c0
2021-03-02 17:59:17 +01:00
Bonian Chen
a9a411e3df [Settings] Only display backup calling when more than 1 SIM
Backup calling only available when more than 1 SIM available.

Bug: 179802059
Test: on device
Change-Id: I24e5eb9e1a7064c3ea65389fbb00c0ff2a5852ed
2021-03-02 21:14:53 +08:00
Sudheer Shanka
0a476f5f53 Update DataSaverBackend to use NetworkPolicyManager.Listener.
This will avoid having to update this every time we
add a new callback.

Test: treehugger
Change-Id: Ic34e3eac87d207eb2ffff7430fdf3b77871ae812
2021-03-02 13:05:43 +00:00
TreeHugger Robot
cb554d2d67 Merge "Avoid double-badging application icon in the dialog" into sc-dev am: c752d2e25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17470e9a33ff8a35bc7cf6b8dce6a938a437c1ff
2021-03-02 09:02:43 +00:00
TreeHugger Robot
c752d2e25b Merge "Avoid double-badging application icon in the dialog" into sc-dev 2021-03-02 07:57:25 +00:00
TreeHugger Robot
18ec16897b Merge "Make sucUsePartnerResource configurable" into sc-dev am: 22c45731f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25724e6f6edf6d54b52f077fa768603bd5cf06be
2021-03-02 07:20:59 +00:00
TreeHugger Robot
bff4bf3fae Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev am: 637eeefb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb8c6b614d465ab2b18086cd10172eea2c46a3cb
2021-03-02 07:20:40 +00:00
mincheli
3d41fe560b Hides the settings entry in Magnification Settings if device is not supported
If the device doesn't support magnification area, we should hide the
settings entry in mangification settings

Bug: 177371954
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I41fc3177f86c6a19e3ef0d2fbe5e052d77c1cb47
2021-03-02 06:56:59 +00:00
TreeHugger Robot
22c45731f5 Merge "Make sucUsePartnerResource configurable" into sc-dev 2021-03-02 06:45:46 +00:00
TreeHugger Robot
637eeefb53 Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev 2021-03-02 06:17:55 +00:00
Treehugger Robot
b6dc427c50 Merge "Wellbeing Package needs to be enabled by default" 2021-03-02 06:09:37 +00:00