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
Edgar Wang
fc02ce1c20
Refactor AppPreference and AppSwitchPreference
...
- Move AppSwitchPreference
- Remove FeatureflagPreference summary
Bug: 176815722
Test: robotest
Change-Id: Id337097f237ac9ca6dfa01665df61b1258dc24f2
2021-01-05 18:27:08 +00:00
Michael Wachenschwanz
d127eb017c
Add getScreenOnEnergy to FakeUid
...
Bug: 172361024
Test: builds
Change-Id: I968bae76d2cc8bfc718057466320095cb4eeac2f
2021-01-05 10:06:49 -08:00
Alex Johnston
c850920cc6
Call KeyChain credential management app APIs Settings
...
Background
* This is part of the work to support
a credential management app on
unmanaged devices.
Changes
* Add calls to KeyChain credential management
app API methods.
* Add logic to add, update and remove credential
management app from KeyChain.
Manual Testing
* Install TestDPC
* Request to manage credentials (fire intent).
Add policy mapping: 'com.android.chrome' ->
'client.badssl.com:443' -> 'testAlias'
* Install badssl user certificate as credential
management app (TestDPC). Set alias to 'testAlias'
* Check certificate is installed in Settings
* Go to chrome > client.badssl.com
* Verify no certificate selection prompt is
displayed. User is automatically authenticated.
* Remove credential management app from Settings
Security > Encryption and credentials >
Certificate management app
* Verify credential management app is removed and
'testAlias' is uninstalled.
Bug: 165641221
Test: Manual Testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.RequestManageCredentialsTest
Change-Id: I52254ccbdb0b46941b35130d487e0cf346212968
2021-01-05 16:57:50 +00:00
Weng Su
5e76c02d82
[Provider Model] Implement the carrner network selection settings
...
- Add WifiPickerTrackerHelper to reuse the library
- User taps on carrier network preference
- Calls MergedCarrierEntry#connect()
- User toggles mobile data On/Off
- Calls MergedCarrierEntry#setEnabled(true/false)
Bug: 175761096
Test:
- Manual Test
- atest NetworkMobileProviderControllerTest \
SubscriptionsPreferenceControllerTest \
WifiPickerTrackerHelperTest
Change-Id: Ia311b10ca7a44a536556c1889ee65743af379822
2021-01-05 15:05:24 +00:00
TreeHugger Robot
26474eb02f
Merge "Add adaptive charging to the top level settings menu"
2021-01-05 10:45:33 +00:00
Tsung-Mao Fang
010ab29eb1
Night display setting should be toggleable
...
Based on Android S design, we want to let user can toggle
night light in display settings page directly.
1. Use primary switch preference in xml file.
2. Add a switch toggle controler for its preference.
3. Move logic of night display preference to controler.
4. Remove the night display preference since we migrate the logic to
controller.
Test: Night display works as intented behavior.
Bug: 174964139
Change-Id: Id920033cb22b1a9dd42c77c6fc2563ddae96bfcd
2021-01-05 17:55:37 +08:00
SongFerng Wang
fdc148ea98
Merge "Change provider model slice's wording"
2021-01-05 06:04:37 +00:00
SongFerngWang
114b6c496e
Change provider model slice's wording
...
Bug: 176457592
Test: Build pass and manual test(review UI wording)
Change-Id: I66361cc6830aea96c55cdef737a9c5c3b8bd1b47
2021-01-05 12:25:45 +08:00
Stephane Lee
b60870cb7d
Add adaptive charging to the top level settings menu
...
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
2021-01-04 15:37:21 -08:00
TreeHugger Robot
88d1033150
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85
-s ours am: 8e18b5b69d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifa4c9f4eb78b442cbee8ae7f4e7a54b049757970
2021-01-03 05:42:21 +00:00
Bill Yi
02d99e5346
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6
-s ours am: 7c77e36579
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281571
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I848b35574563ea747884ced888fd81a6974410b6
2021-01-03 05:42:04 +00:00
TreeHugger Robot
8e18b5b69d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
2021-01-03 05:24:18 +00:00
Bill Yi
7c77e36579
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281571
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife1751f97a9e4a80f9af2981ae626382bcb2aca3
2021-01-03 05:24:11 +00:00
TreeHugger Robot
d2a2867d85
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
2021-01-02 21:59:25 +00:00
TreeHugger Robot
1a72e7b875
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a
-s ours am: 156857c2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13282324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5be2b182b387e37b99dcffc23cd1ce67835d9965
2021-01-02 18:40:03 +00:00
TreeHugger Robot
156857c2e0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13282324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74a9fab4956fed3f808d28e110c300de403bdb2c
2021-01-02 18:21:51 +00:00
TreeHugger Robot
c045ccdc5a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-01-02 18:05:17 +00:00
Bill Yi
73a4ed09db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5
-s ours am: 6c25b86023
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281529
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I56a6fae096f5036e967f055845ca74842dc4717e
2021-01-02 04:47:53 +00:00
Treehugger Robot
c76b627c88
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce
-s ours am: aae7ce1b1c
-s ours am: b441429a8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie704be56ec602a6163f5a44054ffe589389878f5
2021-01-02 04:47:47 +00:00
Treehugger Robot
62d81e1712
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours am: ed32f93dbd
-s ours am: a6ed699018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I588de92c0f984f0848bb5b48a4f2fa06980d1378
2021-01-02 04:47:27 +00:00
Bill Yi
6c25b86023
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281529
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff609972087838e5cbdd1f01b64598456edc2e4f
2021-01-02 04:29:13 +00:00
Treehugger Robot
b441429a8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce
-s ours am: aae7ce1b1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c5788675875037a68a77308b1bb61eea802e32d
2021-01-02 04:21:27 +00:00
Treehugger Robot
a6ed699018
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours am: ed32f93dbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie98a3ecc9281eca2f3631fe6a779bf8fd8a313a0
2021-01-02 04:21:22 +00:00
Treehugger Robot
aae7ce1b1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64108906b14421f342bb5418d800a4b639a43708
2021-01-02 03:33:25 +00:00
Treehugger Robot
ed32f93dbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a22c4edab65206bd4441d791c19fda687276057
2021-01-02 03:33:06 +00:00
Treehugger Robot
30364048ce
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:14:44 +00:00