Jack He
dfc2fb14c6
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:29 +00:00
TreeHugger Robot
0c6f001c09
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
2017-07-26 06:28:44 +00:00
Doris Ling
3ab3fc9ee4
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
...
am: 4906a2a38a
2017-07-26 06:23:08 +00:00
TreeHugger Robot
4906a2a38a
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
2017-07-26 06:11:07 +00:00
Christine Franks
be0ac89704
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
...
am: a7e10e0316
2017-07-26 02:56:36 +00:00
Christine Franks
a7e10e0316
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
2017-07-26 02:38:08 +00:00
Doris Ling
f8bb8a9792
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
2017-07-26 02:08:44 +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
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
Jack He
70f293ee50
Bluetooth: reset mConnectionState when adapter is OFF
...
* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
order to display the correct summary message on ConnectedDevice
preference
* Otherwise, "Connected to null" will be shown because no device is
connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state
Bug: 62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409
2017-07-26 00:31:55 +00:00
Andrew Sapperstein
3db8c874f1
Merge "Fix robotests." into oc-dr1-dev
...
am: b5696a9162
2017-07-25 23:51:03 +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
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
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
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
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
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
Lei Yu
0f9fa63c3a
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:13 +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
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
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
jackqdyulei
edfebbaa4f
Add log for anomaly.
...
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.
Bug: 63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
2017-07-21 12:39:50 -07:00
Christine Franks
c350386476
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
...
am: cb9a7075f8
2017-07-21 19:05:42 +00:00
Christine Franks
cb9a7075f8
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
2017-07-21 18:52:56 +00:00
Fan Zhang
9218e3b7df
Tweak bluetooth name preference
...
- remove accent color from device name
- remove useless ripple when tap
Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix: 62891178
Test: robotests
2017-07-21 11:38:09 -07:00
Fan Zhang
8df2cef10d
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
...
am: e09338a208
2017-07-21 18:23:56 +00:00
jackqdyulei
88b27fdeac
Make anomaly item refresh in battery
...
Bug: 63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
2017-07-21 10:37:14 -07:00
Fan Zhang
ee8d574c26
Add shadow to searchbar when user scrolls vertically
...
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6
2017-07-21 01:34:46 +00:00
Christine Franks
a09eb383d9
Move logic for FR in demo mode out of Settings
...
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
2017-07-20 17:44:18 -07:00
Doris Ling
6f44ea54ae
Add divider line below "see all apps" preference
...
- and increase the tile limit by 1 to accomodate the divider.
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix: 63906012
Test: make RunSettingsRoboTests
(cherry picked from commit 6cd558e595
2017-07-20 17:21:11 -07:00
Doris Ling
11cfc26d0a
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
...
am: 390bb3216d
2017-07-20 20:43:32 +00:00
Evan Laird
bc562b1888
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
...
am: a9e2d97004
2017-07-20 20:42:46 +00:00
TreeHugger Robot
390bb3216d
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
2017-07-20 20:34:55 +00:00
TreeHugger Robot
a9e2d97004
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
2017-07-20 20:23:53 +00:00
