Doris Ling
882020d14b
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: f8bb8a9792
...
am: c0eac3803d
Change-Id: I72106b5c3e73dc194a5678e6e4c3ec6306d6b413
2017-07-26 02:16:15 +00:00
Doris Ling
c0eac3803d
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
...
am: f8bb8a9792
Change-Id: I91b902ed5db6662e7e9fc2187049311b00b50cc6
2017-07-26 02:12:14 +00:00
Doris Ling
f8bb8a9792
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
2017-07-26 02:08:44 +00:00
TreeHugger Robot
9c41094483
Merge "Disable Wallpaper setting when Wallpaper is disabled."
2017-07-26 02:04:20 +00:00
TreeHugger Robot
0e9711ab92
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
2017-07-26 02:02:32 +00:00
Matthew Fritze
ee18f9f8aa
Merge "Add default value to inline payloads" into oc-dr1-dev
...
am: 5aca5f3aec
Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
2017-07-26 01:57:29 +00:00
TreeHugger Robot
5aca5f3aec
Merge "Add default value to inline payloads" into oc-dr1-dev
2017-07-26 01:52:38 +00:00
Andrew Sapperstein
26f2bd44f8
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf am: fba88cc7c0
...
am: 5d8467a068
Change-Id: Ieb5836f758760c47a252e7ff07ef8fcbb627b4aa
2017-07-25 23:59:50 +00:00
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
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
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
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
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
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
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
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
Lei Yu
5963ffd4e3
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
2017-07-25 20:48:02 +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
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
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
Bartosz Fabianowski
9294472953
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353 am: cfc3ccdb82
...
am: e0a9eb0cad
Change-Id: Ib0f669e85f6cd44653dcb1227d4d0aec14296f74
2017-07-25 10:25:40 +00:00
Bartosz Fabianowski
e0a9eb0cad
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
...
am: cfc3ccdb82
Change-Id: I2c73cf6895da1188027d0f8704f795490f1e7be1
2017-07-25 10:22:09 +00:00
Bartosz Fabianowski
cfc3ccdb82
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
Change-Id: I24ffc75897c92124cf9416ea79ff4c704a733c0e
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
96a14ff07e
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
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
Kevin Chyn
936680ab3e
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
...
am: 5e707ccb3d
Change-Id: Ib988ae3439dbbaed2c84d906b6e88412ce27461f
2017-07-25 05:36:32 +00:00
Kevin Chyn
5e707ccb3d
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
2017-07-25 05:31:53 +00:00
Kevin Chyn
6e873a8fb6
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev am: af63fc249e
...
am: 06fa3638ec
Change-Id: I7805293b17139ff9e4c2071c3ff7df9999a9454d
2017-07-25 02:50:32 +00:00
Kevin Chyn
2a2dcb52cb
Fingerprint swipe settings and suggestions should not show if hardware unavailable
...
Fixes: 63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-25 02:33:30 +00:00
TreeHugger Robot
af63fc249e
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
2017-07-25 02:32:31 +00:00
Kevin Chyn
df872a5f0a
Default-off FP Swipe am: 8f5de15ba1 am: 0d378e04ca
...
am: a3874cf593
Change-Id: Ib2d312d36a5200ed4b677eb2a4d79f9e84b12d75
2017-07-25 01:13:04 +00:00
Kevin Chyn
e4fed2ee05
Default-off FP Swipe
...
am: 8f5de15ba1
Change-Id: Ie575c4a6335b83b00d8f2614bba532843a88534d
2017-07-25 01:07:31 +00:00
Kevin Chyn
0d378e04ca
Default-off FP Swipe
...
am: 8f5de15ba1
Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
2017-07-25 01:07:31 +00:00
Kevin Chyn
8f5de15ba1
Default-off FP Swipe
...
Fixes: 63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
2017-07-24 14:00:18 -07:00
Andrew Sapperstein
c8c42838ca
Make AirplaneModePrefController.isAvailable static.
...
Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.
Bug: 62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5
2017-07-24 13:42:19 -07:00
Kevin Chyn
82792cc5b3
Fingerprint swipe settings and suggestions should not show if hardware unavailable
...
Fixes: 63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-24 13:40:34 -07:00
Fan Zhang
a4a3833a08
Fix search indexing for encryption_and_credential page
...
- Rewrite search index provider to include all possible keys through
getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
device state
Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix: 37650170
Test: robotests
2017-07-24 12:34:34 -07:00
Michael Wachenschwanz
bd891f5813
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev am: a47a3f58bf
...
am: 4a36ff9338
Change-Id: I2dd6202d0e6650735d4d0f08fac36472ccc4dc08
2017-07-24 19:09:08 +00:00
Michael Wachenschwanz
a47a3f58bf
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
2017-07-24 19:02:12 +00:00
Lei Yu
a0b1fa6120
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 0f9fa63c3a
...
am: d98275c7dc
Change-Id: I2f619171a42aca61f1d8e913005f9f0d44095118
2017-07-24 18:23:05 +00:00
Lei Yu
d98275c7dc
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
...
am: 0f9fa63c3a
Change-Id: Ibb11b891799815a3ec2f8c8961b197ffadeaf9db
2017-07-24 18:14:13 +00:00