Christine Franks
5ffcae25c5
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316 am: a1f56b5faa
...
am: 02de4d0e23
2017-07-26 03:21:30 +00:00
Christine Franks
a1f56b5faa
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
...
am: a7e10e0316
2017-07-26 02:52:52 +00:00
Christine Franks
a7e10e0316
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
2017-07-26 02:38:08 +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
TreeHugger Robot
5aca5f3aec
Merge "Add default value to inline payloads" into oc-dr1-dev
2017-07-26 01:52:38 +00:00
Andrew Sapperstein
b5696a9162
Merge "Fix robotests." into oc-dr1-dev
2017-07-25 23:37:37 +00:00
TreeHugger Robot
205857726a
Merge "Fix robotests." into oc-mr1-dev
2017-07-25 23:21:44 +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
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
TreeHugger Robot
6ef56e43ee
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
2017-07-25 21:23:19 +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
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
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
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
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
96a14ff07e
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
2017-07-25 10:18:41 +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
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
2017-07-25 05:36: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
TreeHugger Robot
c239561da5
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
2017-07-24 21:29:22 +00: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
a47a3f58bf
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
2017-07-24 19:02:12 +00:00
Fan Zhang
358d30f093
Update string for bluetooth device visibility
...
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix: 62891178
Test: visual
Test: robotests
2017-07-24 18:40:59 +00:00
Lei Yu
0f9fa63c3a
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:13 +00:00
Lei Yu
5e48ea193b
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:12 +00:00
Lei Yu
6666bf5605
Merge "Add log for anomaly." into oc-dr1-dev
2017-07-24 17:56:35 +00:00
Andrew Sapperstein
cfb2b87d03
Add ResultPayload for always-on ambient display.
...
am: eb1a45b95b
2017-07-24 17:34:10 +00:00
Andrew Sapperstein
36af00bb21
Add ResultPayload for always-on ambient display.
...
Bug: 62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-23 06:11:22 +00:00
Andrew Sapperstein
eb1a45b95b
Add ResultPayload for always-on ambient display.
...
Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-22 20:57:07 -07:00
Fan Zhang
2c7b00d101
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
...
am: 6fcc38975c
2017-07-22 17:59:38 +00:00
TreeHugger Robot
6fcc38975c
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
2017-07-22 17:54:31 +00:00
Michael Wachenschwanz
987711712c
Add Foreground Service time to battery usage
...
Add foreground service time to foreground usage time of apps. This will
account for app usage that user is aware of but is not being displayed
on screen, such as playing music while screen is locked.
Change-Id: Ica9fe0819e46b50299eb2eab7f0483ea01441fb0
Fixes: 38313557
Test: RunSettingsRoboTests
2017-07-21 17:37:00 -07:00
Fan Zhang
3ecdee573b
Merge "Tweak bluetooth name preference" into oc-dr1-dev
...
am: 03c595ce24
2017-07-22 00:32:42 +00:00
Lei Yu
ab7a4db9df
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
...
am: 0ec3e4e626
2017-07-22 00:32:21 +00:00
Antony Sargent
0531bd48e3
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
...
am: a6ac4890ed
2017-07-22 00:32:00 +00:00
Christine Franks
fd8b8eb0b1
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
2017-07-21 23:59:23 +00:00
Fan Zhang
ef0e290e65
Merge "Tweak bluetooth name preference" into oc-dr1-dev
...
am: 03c595ce24
2017-07-21 21:47:13 +00:00
Fan Zhang
03c595ce24
Merge "Tweak bluetooth name preference" into oc-dr1-dev
2017-07-21 21:41:29 +00:00
Lei Yu
454131cdb0
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
...
am: 0ec3e4e626
2017-07-21 20:30:18 +00:00
Lei Yu
0ec3e4e626
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
2017-07-21 20:28:01 +00:00
Antony Sargent
62b7527da5
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
...
am: a6ac4890ed
2017-07-21 20:11:53 +00:00
Fan Zhang
b4c40e5dea
Reindex db when package w/ searchIndexProvider changes
...
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.
Change-Id: I85d4c4a994c7ff808662371c857cac1929a8b1cd
Merged-In: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug: 63903835
Test: robotests
2017-07-21 13:06:03 -07:00
TreeHugger Robot
a6ac4890ed
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
2017-07-21 20:03:41 +00:00
