Eran Messeri
f37c8cb4f7
[DO NOT MERGE] Rollup Cert-related changes from R
...
This change includes the following commits from internal R branch
which are related to certificate management:
0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings
Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
Treehugger Robot
37c9c5b514
Merge "Revise strings as per string UX review" am: 110d7ff721
...
Change-Id: I523fe708d2ff6cacafec362c05e227ae5dda07c8
2020-05-06 03:23:40 +00:00
Treehugger Robot
110d7ff721
Merge "Revise strings as per string UX review"
2020-05-06 03:06:40 +00:00
Malcolm Chen
b6fa2277f6
Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
...
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b
Merge changes I6194592d,I5a02f847
...
* changes:
Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Treehugger Robot
d6859736a4
Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
...
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Grace Jia
7098379555
Disable 'Mobile data' selection after removing SIM
...
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Malcolm Chen
5e68080b1f
Define a helper link for 5G limitation in DSDS footer.
...
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-27 18:14:46 -07:00
Brad Ebinger
c973423a34
Revise strings as per string UX review
...
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07:00
Brad Ebinger
f82153c3ec
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046
...
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648
...
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
2020-04-20 21:04:14 +00:00
Brad Ebinger
a7bf6a3046
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback"
2020-04-20 20:40:50 +00:00
Brad Ebinger
6b87fa6705
Set the CHAR_LIMIT to 110 in order to support more translations.
...
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.
Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f
Change to Contact Discovery Dialog Language based on Privacy Feedback
...
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-04-20 19:08:07 +00:00
Lorenzo Colitti
2b54956856
Merge "Add Ethernet Tethering settings" am: 526741a2f2
...
Change-Id: I475283b47906ae6fa2fba6fd4ddb506a266c398c
2020-04-06 15:28:41 +00:00
Lorenzo Colitti
526741a2f2
Merge "Add Ethernet Tethering settings"
2020-04-06 15:11:31 +00:00
Brad Ebinger
da1335a9f4
Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
...
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
2020-03-31 20:10:05 +00:00
Yuuki Habu
8e177ae1c7
Add Ethernet Tethering settings
...
Add Ethernet Tethering settings
- Show prefernce if config_ethernet_iface_regex is set
- Activate if tethered ethernet interface is exist
Bug: 148824036
Test: manual test
- update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Merged-In: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
2020-03-27 17:45:27 +09:00
Brad Ebinger
f469cac10a
Add new DialogFragment and Controller for capability discovery opt-in
...
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.
Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-25 16:19:54 +00:00
Automerger Merge Worker
5bbfb75207
DO NOT MERGE am: 37295f86bf
...
Change-Id: I036454e184e0a1d4fe26240c3a1ec25d4fd55061
2020-03-12 10:49:26 +00:00
Kenny Guy
37295f86bf
DO NOT MERGE
...
Update battery manager toggle to support on / off summary.
Screenshots attached to the bug.
Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba )
2020-03-10 16:10:29 +00:00
Automerger Merge Worker
9e2de70584
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5
...
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
2020-02-28 06:16:40 +00:00
TreeHugger Robot
594a5c71f5
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev
2020-02-28 06:04:46 +00:00
Automerger Merge Worker
44f654fe43
Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa
...
Change-Id: I741968b993698cf459c670678957276fef68ebbc
2020-02-21 17:02:44 +00:00
Automerger Merge Worker
fd2e26d4aa
Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca
...
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
2020-02-21 16:44:30 +00:00
Joshua Duong
0110afcc46
[adb-wireless] Add Wireless Debugging Switch in Developer options.
...
Bug: 111434128
Bug: 119492574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebugging
Change-Id: I188badb43035172642cf235bb27e56d3a1dea169
Merged-In: I188badb43035172642cf235bb27e56d3a1dea169
2020-02-20 06:13:15 +00:00
Automerger Merge Worker
07f9393486
Add whitelist in ResetAppsHelper am: 74ded43527
...
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
2020-02-06 06:03:18 +00:00
Arc Wang
f3848729b4
[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
...
To improve security.
Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idb93d5ca1eb81bdcc2bc139679f72053161e3e35
Merged-In: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2020-02-03 11:21:30 +08:00
Sunny Shao
74ded43527
Add whitelist in ResetAppsHelper
...
- Add "com.android.systemui" and "com.android.vending" into the whitelist.
- Add "com.android.providers.downloads" and "android" into the whitelist.
- Do not data clear in the whitelist.
Fixes: 147124412
Test: manual test
Change-Id: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
Merged-In: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
(cherry picked from commit b54d2f90f2 )
2020-01-30 22:19:05 +08:00
Automerger Merge Worker
b9df8248fa
Merge "Add IKEv2/IPsec VPN options" am: b189ffb318 am: 9d5397ab42
...
Change-Id: Ia26abaa384163d241dbc59e69e6f705f95663752
2020-01-23 06:18:15 +00:00
Benedict Wong
9d5397ab42
Merge "Add IKEv2/IPsec VPN options"
...
am: b189ffb318
Change-Id: I865a04f4453fc0304ddc3daf9be47ebf2e8a1c3c
2020-01-22 22:09:59 -08:00
Benedict Wong
b189ffb318
Merge "Add IKEv2/IPsec VPN options"
2020-01-23 05:11:47 +00:00
Automerger Merge Worker
ad5fbe4177
Merge "Fix strings in PlatformCompatDashboard" am: a9f0446ce8 am: e89b34a366
...
Change-Id: I9ac23dd4d5bce7da2841e529ea7be65260ce987c
2020-01-20 13:35:08 +00:00
Andrei-Valentin Onea
e89b34a366
Merge "Fix strings in PlatformCompatDashboard"
...
am: a9f0446ce8
Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
2020-01-20 05:25:45 -08:00
Automerger Merge Worker
6471715f51
Update L2U string for face unlock in settings am: 13a5924c8d
...
Change-Id: I72bec002da39a9ac86a8bb242d59e1a98d9e1369
2020-01-18 01:04:42 +00:00
Curtis Belmonte
13a5924c8d
Update L2U string for face unlock in settings
...
Test: Checked in Settings for flame-userdebug build
Bug: 143905457
Change-Id: I2705b6bf9ae0a140f69ffaa5490a91500745f1e0
Merged-In: I1e98b95e81dea355c66e8c0f30664db21632d05c
2020-01-17 14:14:49 -08:00
Andrei Onea
e2f4619602
Fix strings in PlatformCompatDashboard
...
Be more specific, by referring to 'target SDK', instead of just 'SDK'.
Test: atest PlatformCompatDashboardTest
Bug: 138280620
Change-Id: Ied8dd5d682ed20962040bf81e9b3b3b45166ea46
2020-01-17 16:41:46 +00:00
Automerger Merge Worker
eff77d28b9
Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744c3
...
Change-Id: I1716dc3e0b13a430ed4d5ff525b95bb09eb0b90a
2020-01-14 00:49:32 +00:00
TreeHugger Robot
fb44d744c3
Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev
2020-01-14 00:38:29 +00:00
Tsung-Mao Fang
8a91fbec72
Add a RTT setting in A11y screen
...
- Add RTT setting in Accessibility screen.
- Create a controller for RTT setting preference.
- Create an array strings to define the subtext.
Test: Rebuild, and visual
Change-Id: I248654c822284473b8a8265de4a3938af89cdf7a
Merged-In: I248654c822284473b8a8265de4a3938af89cdf7a
Fix: 146540478
2020-01-10 07:16:25 +00:00
Automerger Merge Worker
7e1e2b7d7d
Dark theme settings text am: 176d4ea28e
...
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
2020-01-09 23:21:23 +00:00
Jay Aliomer
176d4ea28e
Dark theme settings text
...
Dark theme text should be appropriate for all types of screens and
not only OLED types
Test: manual
Bug: 147432824
Change-Id: I1e59329064405c72c6f57c92a82b652cd71853a7
(cherry picked from commit d63839afda )
2020-01-09 21:51:47 +00:00
Automerger Merge Worker
9494af9634
Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
...
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00
Daniel Huang
79977fadca
Merge "Modify 5G RAT into Bearer field."
2019-12-26 11:29:13 +00:00
danielwbhuang
957526abca
Modify 5G RAT into Bearer field.
...
Only keep NR in here, remove GSM, TD_SCDMA, IWLAN and LTE_CA.
Bug: 143995814
Test: 1. Build pass.
2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
3. check UI:
3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"
Change-Id: I9b8efbe26c2702696f720f0f221f3d65f785e644
2019-12-26 12:08:31 +08:00
Automerger Merge Worker
c547fc78c7
Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9
...
Change-Id: I8ddf92c23c00c7b2958dbefdf5483e2b609e92c3
2019-12-21 02:34:00 +00:00
Tsung-Mao Fang
0f7b65b512
Create some strings for RTT setting
...
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
Merged-In: I26f218caba46273796e52c244c9f022742f0bdeb
2019-12-20 16:03:27 +00:00
Automerger Merge Worker
36eb9829d5
Merge "Use floats for face enrollment dimensions" am: 59baff6ef9 am: fd493b221a
...
Change-Id: Ia4ac6e428666fb82f39e6b43620623e141f716c0
2019-12-20 03:18:56 +00:00
Ilya Matyukhin
ad1b76ce3b
Use floats for face enrollment dimensions
...
Test: compiles and runs correctly on a device
Change-Id: I64cb905b06aa2ca2b0703d83ed9a495c7a85cf94
2019-12-19 17:21:04 -08:00
Automerger Merge Worker
d21a3207ef
Merge "Add 5G RAT into Bearer field." am: 5f6a4b1dae am: 3350d4d05d
...
Change-Id: If6bb822fa55a0c477172348ea7dc10112c3b36df
2019-12-19 12:24:22 +00:00