Commit Graph

39464 Commits

Author SHA1 Message Date
Fan Zhang
8758496922 Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev am: 7da06bd11b
am: d8ed5645be

Change-Id: I8795c0da21730609a08091f6b864f5f0ec99d6b3
2017-07-25 23:59:05 +00:00
Andrew Sapperstein
7a10210981 Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 -s ours
am: c38502ba59  -s ours

Change-Id: I645dc753076e4f5be876338484979ca890bd9a2d
2017-07-25 23:55:07 +00:00
Andrew Sapperstein
3db8c874f1 Merge "Fix robotests." into oc-dr1-dev
am: b5696a9162

Change-Id: I126be625a1b9114ca067dca0f2fe99c7aa395873
2017-07-25 23:51:03 +00:00
Andrew Sapperstein
c38502ba59 Merge "Fix robotests." into oc-dr1-dev
am: b5696a9162  -s ours

Change-Id: Ibce6e5a08dffeab7779718d99d2cc7ad60c5586b
2017-07-25 23:50:57 +00:00
Fan Zhang
ae70d2cd34 Extract method to build preference count logging's name.
Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
2017-07-25 16:49:43 -07:00
Andrew Sapperstein
5d8467a068 Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf
am: fba88cc7c0

Change-Id: Ife5fbbcea5622a28916cc226868ae7ffb7eef5a7
2017-07-25 23:47:22 +00:00
Andrew Sapperstein
2bdae81aca Merge "Fix robotests." into oc-mr1-dev
am: 205857726a

Change-Id: I4f04275f7a6d71d3a19b6b8bf2540af4debdd76e
2017-07-25 23:47:00 +00:00
Doris Ling
3230d95f9c Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests
2017-07-25 16:40:30 -07:00
Andrew Sapperstein
b5696a9162 Merge "Fix robotests." into oc-dr1-dev 2017-07-25 23:37:37 +00:00
Andrew Sapperstein
fba88cc7c0 Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
2017-07-25 23:34:03 +00:00
Andrew Sapperstein
1bb9b966ff Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7694793ff006a2c677511563b69e411b6ed284f2
2017-07-25 23:30:32 +00:00
Andrew Sapperstein
5b67e453bf Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev 2017-07-25 23:21:48 +00:00
TreeHugger Robot
205857726a Merge "Fix robotests." into oc-mr1-dev 2017-07-25 23:21:44 +00:00
Fan Zhang
d8ed5645be Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
am: 7da06bd11b

Change-Id: Ieb1fb873537f8faca68b185e0f219e7bd4031524
2017-07-25 23:11:13 +00:00
Fan Zhang
7da06bd11b Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev 2017-07-25 23:06:11 +00:00
Fan Zhang
411ad12cf5 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: f854a08c3e
am: 25cadcdb3f

Change-Id: I159faf137bfd0a6f3977657c51ffaaad06e1de18
2017-07-25 21:53:50 +00:00
Fan Zhang
00d306465c Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: 2f84a358d9
am: 3bc97152d1

Change-Id: Iea6491534c7d43a97456ab2e83eae5e32c747c80
2017-07-25 21:53:25 +00:00
Fan Zhang
25cadcdb3f Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
am: f854a08c3e

Change-Id: Ie113d470743947ffa22844de50243d0d7b42534a
2017-07-25 21:40:34 +00:00
Fan Zhang
3bc97152d1 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
am: 2f84a358d9

Change-Id: I727693edc69b0adfb862efce87834fc78657600e
2017-07-25 21:39:00 +00:00
Matthew Fritze
73056522b3 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests
2017-07-25 14:37:05 -07:00
Matthew Fritze
7fdb865c1b Merge "Add default value to inline payloads" into oc-mr1-dev am: 151cc3166d
am: eb506cce5f

Change-Id: I2ffd4684a4cba96ea624d521d98d6dc52d86c170
2017-07-25 21:36:52 +00:00
Fan Zhang
2f84a358d9 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
2017-07-25 21:30:57 +00:00
Fan Zhang
f854a08c3e Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
2017-07-25 21:30:26 +00:00
TreeHugger Robot
6ef56e43ee Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev 2017-07-25 21:23:19 +00:00
Matthew Fritze
eb506cce5f Merge "Add default value to inline payloads" into oc-mr1-dev
am: 151cc3166d

Change-Id: I026dc25e97d2628237e2f02c2a95e3ecbefa8d5e
2017-07-25 21:23:15 +00:00
Roshan Pius
333b7f5600 Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca am: 974920af47 -s ours
am: 7952871e18  -s ours

Change-Id: Id3f5bb81d2cc75594508d90442d4bf8b15f92b39
2017-07-25 21:16:08 +00:00
Roshan Pius
06cc4e0395 Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca -s ours am: 096e14d92f -s ours
am: e71f1bc007  -s ours

Change-Id: I45bae5f86d3b8803e1093e62c3210bf752565e00
2017-07-25 21:12:39 +00:00
Lei Yu
67a0275d5a Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3 am: 2e70aea742
am: 716d4b2162

Change-Id: Ida0226721d71e07a478f7b727f766821cf28e7fa
2017-07-25 21:11:52 +00:00
Lei Yu
434758b01d Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3 am: ce4ed05085
am: 7d2007dacf

Change-Id: Ia07cc9756c420c9193d6072a0971dacfcf854017
2017-07-25 21:11:16 +00:00
Matthew Fritze
151cc3166d Merge "Add default value to inline payloads" into oc-mr1-dev 2017-07-25 21:10:55 +00:00
Roshan Pius
7952871e18 Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca
am: 974920af47  -s ours

Change-Id: Ib44b99d0d8804de60948929c4c6fc5e7d9c55cd5
2017-07-25 21:06:25 +00:00
Roshan Pius
974920af47 Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am: 2b689e63ca

Change-Id: I39ee1e7e6712e6acec56aaa088ef19ea2669784c
2017-07-25 21:01:43 +00:00
Roshan Pius
e71f1bc007 Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca -s ours
am: 096e14d92f  -s ours

Change-Id: I1bec0f5ef17946fa49cdd2aa36ebc51f3d3c1d23
2017-07-25 21:01:25 +00:00
Lei Yu
716d4b2162 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3
am: 2e70aea742

Change-Id: I09713571128aac7050a0be706497a241edead8dd
2017-07-25 21:00:41 +00:00
Lei Yu
7d2007dacf Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3
am: ce4ed05085

Change-Id: Ibca49417ed69cbce3edf5d841d4c4f591c8f1e21
2017-07-25 20:58:12 +00:00
Andrew Sapperstein
261f3230e0 Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.

Change-Id: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes: 64024743
Test: robotests
2017-07-25 20:57:51 +00:00
Roshan Pius
096e14d92f Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am: 2b689e63ca  -s ours

Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
2017-07-25 20:56:33 +00:00
Lei Yu
ce4ed05085 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am: 5963ffd4e3

Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb
2017-07-25 20:55:21 +00:00
Lei Yu
2e70aea742 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am: 5963ffd4e3

Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
2017-07-25 20:55:16 +00:00
Roshan Pius
2b689e63ca Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev 2017-07-25 20:52:29 +00:00
Andrew Sapperstein
d2cf55bccd Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.

Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes: 64024743
Test: robotests
2017-07-25 13:51:20 -07:00
Lei Yu
5963ffd4e3 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev 2017-07-25 20:48:02 +00:00
Fan Zhang
325d28ae6c Update misc strings
Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix: 62069132
Fix: 62265094
Test: visual
2017-07-25 13:40:37 -07:00
Christine Franks
a0dd987d20 Restrict changing wi-fi networks
Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
2017-07-25 13:31:12 -07:00
Antony Sargent
5d137f0f2c Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-25 20:25:59 +00:00
Fan Zhang
84dd783c36 Fix a monkey crash in Developer settings.
- DevSetting shouldn't add switchbar listener if it's a Monkey test run
- DevSetting shouldn't remove switchbar listener if it's not registered
- Refactor some switchbar logic in order to create test

Change-Id: Ie65ff9b04778075789010169039393bd0551acfb
Fix: 64021498
Test: robotests
2017-07-25 13:06:32 -07:00
Julia Reynolds
e7f99fb9e3 Revert string change
Test: manual
Change-Id: I3f38ac68ae6b9fc225c92bdfcc0f79859ff8dfa1
Fixes: 63906381
2017-07-25 14:46:10 -04:00
Doris Ling
5df37ec7b9 Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug: 63939450
Test: make RunSettingsRoboTests
2017-07-25 11:33:40 -07:00
Matthew Fritze
458bb887e1 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Manual merge for: ag/2588219/

Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
2017-07-25 10:44:15 -07:00
Doris Ling
4427cd7e22 Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Bug: 63939450
Test: make RunSettingsRoboTests
Change-Id: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
2017-07-25 10:38:22 -07:00