Commit Graph

79217 Commits

Author SHA1 Message Date
Hugh Chen
724278a1fa [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic42e806534d2476d4ce959d6f75bcdf507860500
2021-01-07 03:23:01 +00:00
Hugh Chen
bfd2571c3b [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9c9277378921ced9ed919cd9e03811acce59c55
2021-01-07 03:23:00 +00:00
TreeHugger Robot
7ff97d7703 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic95f4362c186a2aa00edfe54391b44cd37574fbf
2021-01-07 03:22:46 +00:00
Hugh Chen
fc0292dc19 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dafec35dab7457e6301017b49cd9b3b92491869
2021-01-07 02:40:55 +00:00
Hugh Chen
d62def70c7 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e04a58a35ea2c11731a8ec2e8661080e28ccd77
2021-01-07 02:40:54 +00:00
TreeHugger Robot
6bae86bec6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1180cd764b23ee4687e353777c68be177c2b71aa
2021-01-07 02:40:47 +00:00
Hugh Chen
84f9417fa2 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I237872bf9d2d67b2da1087ebedd0c753b00bcfd2
2021-01-07 02:16:44 +00:00
Hugh Chen
535f5ba053 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I872358cea725ef692d6193a6d09eca966ecc3e8d
2021-01-07 02:16:43 +00:00
TreeHugger Robot
5bd40911f5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb64d2ddbcf8659ff32029b93a266e89ed04cde5
2021-01-07 02:16:37 +00:00
Hugh Chen
77d2c798e5 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d018bfd516557b7a643842a1538e59053f1706e
2021-01-07 01:56:51 +00:00
Hugh Chen
5036eee733 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec4bc73ee0fd32c31d67f8bb5fef7b1c1e31e32c
2021-01-07 01:56:50 +00:00
TreeHugger Robot
c5f7e582b4 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4601e6a2be1265e01baea5e73f34d7989d6fcad
2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e109407102ce058e806f3a239882dc8abaa36a7
2021-01-07 01:55:49 +00:00
Ben Chung
cfedc19ab9 Merge "Accessibility settings display category restructure, add text and display fragment for related accessibility services." 2021-01-07 01:28:17 +00:00
TreeHugger Robot
1a6a1b12ef Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev 2021-01-07 01:27:50 +00:00
Steven Liu
7f05bd4dfc Merge "Introduce a WifiTrackerLibProvider." 2021-01-07 00:58:49 +00:00
Hugh Chen
52fc02b96c [automerger skipped] RESTRICT AUTOMERGE Update String am: 085f70d48d am: c148c76b20 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9629244c8fdfa5e69932a78acb252ae9add4bb
2021-01-07 00:19:09 +00:00
Hugh Chen
7632d248f8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece am: bac6aab059 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb46ed89a1dc98e18cd735880d45654959a879c3
2021-01-07 00:18:59 +00:00
Hugh Chen
c148c76b20 RESTRICT AUTOMERGE Update String am: 085f70d48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c78e392639cd06925ba054dfb7e2980b36d06ef
2021-01-06 23:33:23 +00:00
Hugh Chen
bac6aab059 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b2b58f32f48b20313df6a02efc6b6b6fda8e86
2021-01-06 23:33:07 +00:00
Hugh Chen
4b22b601f7 RESTRICT AUTOMERGE Update String am: 085f70d48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e8afa7b93740d3653a8a6cfb476ac69023ae41b
2021-01-06 23:32:41 +00:00
Hugh Chen
c17ec818af RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96867a323781675c52bf875c2221c348baca6b83
2021-01-06 23:32:22 +00:00
Stephane Lee
b9b67ee815 Add adaptive charging to the top level settings menu
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
Merged-In: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
(cherry picked from commit b60870cb7d)
2021-01-06 21:59:42 +00:00
Peter Kalauskas
f22eb5971d Merge "Update icons and text for guest user" 2021-01-06 17:41:26 +00:00
Steven Liu
c1477650c9 Introduce a WifiTrackerLibProvider.
This make the WifiTrackerLib can be customized.

Bug: 149540986
Test: manual test wifi picker, and atest com.android.settings
Change-Id: I1418ae39c895ce2ff87f18005a226a4835f9e083
2021-01-06 08:44:34 -08:00
Edgar Wang
e49ae19b1e Merge "Replace some customized RadioButtonPreferences" 2021-01-06 16:31:02 +00:00
PETER LIANG
bed8dee669 Merge "Add test cases for RingVibrationIntensityPreferenceController." 2021-01-06 15:57:11 +00:00
Julia Reynolds
c68b4be047 Merge "Migrate NLS access to preferencecontrollers" 2021-01-06 15:42:49 +00:00
Benjamin Franz
92480fc15d Update constructor usage for CompatibilityChangeInfo
As we're introducing an overridable flag on CompatibilityChangeInfo, the
constructor takes an additional argument that needs to be reflected in
these tests.

Bug: 174043039
Test: atest SettingsRoboTests
Change-Id: Ib5528ded408cb7807e2e3a90e1f99ee1775d566d
2021-01-06 15:12:50 +00:00
TreeHugger Robot
b7076d5d5e Merge "[Provider Model] Implement the carrner network selection settings" 2021-01-06 14:25:46 +00:00
Julia Reynolds
d41f2db9ec Migrate NLS access to preferencecontrollers
In preparation for some new settings

Test: RoboTests
Bug: 173052211
Change-Id: I57c692d7ff0a1a8e36fb9e3f6c159263997fdc71
2021-01-06 14:23:59 +00:00
Tsung-Mao Fang
c6a63916d1 Merge "Rearrange settings in Display page" 2021-01-06 13:57:44 +00:00
Rubin Xu
4fe99f19c1 Merge "Call KeyChain credential management app APIs Settings" 2021-01-06 11:30:30 +00:00
Ben Chung
3e2e4407cf Accessibility settings display category restructure, add text and display fragment for related accessibility services.
Bug: 174829936
Test: atest TextAndDisplayFragmentTest, atest AccessibilitySettingsTest
Change-Id: Ie2cf147de53385ae0c626c8472306f1b85317686
2021-01-06 18:26:43 +08:00
TreeHugger Robot
a533dc0464 Merge "Add getScreenOnEnergy to FakeUid" 2021-01-06 09:07:05 +00:00
Tsung-Mao Fang
aee0cb58e6 Rearrange settings in Display page
Based on the Android S design,

- Group similar settings in a category.
- Set name for each category.
- Remove the "advanced" button design.
- Put settings into "Others" category" if settings are advanced/not
useful.

Test: Rebuilt rom and see the screen
Bug: 174964139
Change-Id: I80194aa8deb7a554188290935a8c790b410c6e1d
2021-01-06 16:58:59 +08:00
Peter_Liang
2bdeb66ae1 Add test cases for RingVibrationIntensityPreferenceController.
Bug: 168567356
Test: atest RingVibrationIntensityPreferenceControllerTest
Change-Id: I8a719c0bec3b77230c4a6747e78e641a5151e975
2021-01-06 16:48:04 +08:00
TreeHugger Robot
e0f2957e49 Merge "[Provider Model] Internet Panel UI update" 2021-01-06 06:55:24 +00:00
Bonian Chen
5ccae0635d Merge "Revert "Remove org.apache.http.legacy from Settings"" 2021-01-06 06:06:47 +00:00
Bonian Chen
e69d1a650f Revert "Remove org.apache.http.legacy from Settings"
This reverts commit 02013aeeb6.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master-without-vendor&target=aosp_arm64-eng&lkgb=7064184&lkbb=7064600&fkbb=7064600, bug 176865269

Change-Id: I49701fb6055b636598998463936b4251e118834a
BUG: 176865269
2021-01-06 05:42:19 +00:00
Edgar Wang
c0e7328a88 Replace some customized RadioButtonPreferences
- Deleted ZenCustomRadioButtonPreference
- Deleted RadioButtonPreferenceWithExtraWidget
- Replaced with RadioButtonPreference

Bug: 173472216
Test: robotest
Change-Id: I645b59d65ae14af1f384f16ee7b76b3c98e23e1f
2021-01-06 05:37:29 +00:00
Treehugger Robot
6c018a509f Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1 am: 8677c6a4b7 am: e632315dc8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35c38f7dea0fa7112dd96401f13ad14a00698324
2021-01-06 05:36:22 +00:00
Treehugger Robot
e632315dc8 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1 am: 8677c6a4b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d08a63a109ef4e4a14c266773266b216b17f5b
2021-01-06 05:19:19 +00:00
Treehugger Robot
8677c6a4b7 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
2021-01-06 04:57:58 +00:00
Treehugger Robot
d3d0962cd1 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" 2021-01-06 04:24:25 +00:00
TreeHugger Robot
7ad74ff413 Merge "Remove org.apache.http.legacy from Settings" 2021-01-06 03:51:42 +00:00
TreeHugger Robot
087613f50b Merge "Night display setting should be toggleable" 2021-01-06 02:30:03 +00:00
Weng Su
e9f4928ef1 [Provider Model] Internet Panel UI update
- Add gear icon to connected non-carrier network

- Update "View airplane mode networks" wording

- Update "Turn off airplane mode" wording

- Check WiFi disable to show airplane mode message

- Screenshot
  https://screenshot.googleplex.com/BRjcKyMaMS4ujYN

Bug: 173413889
Test:
- Manual Test
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Icf7b77e514cffa68cf103dbc9e7df93d58f9f762
2021-01-06 02:11:46 +00:00
Jason Jeremy Iman
620158be52 [adb-wireless] Allow ADB-over-WiFi when WiFi is not default
When other network types with higher priority than wifi is
connected alongside wifi, turning on ADB over wifi is not
possible.

This is happening due to `isWifiConnected()` only checks
if wifi is the default network and not if wifi is connected.

Often times multiple networks such as ethernet is used in
conjuction with wifi, making ADB over wifi not working with
the setup.

Fix by returning if any available network is a WiFi network.

Bug: 173466085
Test: Tested on eve Chrome OS ARCVM, ADB WiFi can be toggled when
      WiFi is not the default network.

Change-Id: I8474a4e8b37a4af0031e1462645509f1e634e9a8
2021-01-06 11:00:03 +09:00