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
2017-07-25 23:47:22 +00:00
Andrew Sapperstein
2bdae81aca
Merge "Fix robotests." into oc-mr1-dev
...
am: 205857726a
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
2017-07-25 23:34:03 +00:00
Andrew Sapperstein
1bb9b966ff
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
...
am: 5b67e453bf
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
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
25cadcdb3f
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
...
am: f854a08c3e
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
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
Fan Zhang
2f84a358d9
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
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
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
2017-07-25 21:23:15 +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
2017-07-25 21:06:25 +00:00
Roshan Pius
974920af47
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
...
am: 2b689e63ca
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
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
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
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
2017-07-25 20:56:33 +00:00
Lei Yu
ce4ed05085
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
2017-07-25 20:55:21 +00:00
Lei Yu
2e70aea742
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
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
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
jackqdyulei
8dba5a03a1
Add anomaly detection method to AnomalyUtils
...
So we could reuse it in different loaders.
Bug: 63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
2017-07-25 10:20:10 -07:00
Roshan Pius
814967b90c
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
...
am: 7030ceb9e3
2017-07-25 17:19:12 +00:00
Roshan Pius
9265f48c4b
settings(manifest): Add NETWORK_SETTINGS permission
...
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug: 64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9
2017-07-25 17:10:14 +00:00
Roshan Pius
7030ceb9e3
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
2017-07-25 17:09:52 +00:00
Roshan Pius
37a46a1a70
settings(manifest): Add NETWORK_SETTINGS permission
...
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug: 64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
(cherry-picked from b0a09304e380645a84651c0de668a78a7beaac3b)
2017-07-25 07:39:26 -07:00
Android Build Merger (Role)
5c6b057e7f
Merge "Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353 am: 96a14ff07e" into oc-mr1-dev-plus-aosp
2017-07-25 10:22:31 +00:00
Bartosz Fabianowski
6dec3960b2
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
...
am: 96a14ff07e
2017-07-25 10:22:10 +00:00
Bartosz Fabianowski
e0a9eb0cad
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
...
am: cfc3ccdb82
2017-07-25 10:22:09 +00:00
Bartosz Fabianowski
cfc3ccdb82
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
96a14ff07e
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
262aacd353
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
2017-07-25 10:14:50 +00:00
Android Build Merger (Role)
7d998d4ed1
Merge "Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d am: 936680ab3e -s ours" into oc-mr1-dev-plus-aosp
2017-07-25 05:40:14 +00:00
Kevin Chyn
0999c93062
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
...
am: 936680ab3e
2017-07-25 05:39:57 +00:00
