Doris Ling
a60d3ef00c
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
2017-07-26 02:08:45 +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
Matthew Fritze
fe48e4fe6b
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: ee18f9f8aa" into oc-mr1-dev-plus-aosp
...
am: 43c1e45ce3
2017-07-26 02:07:33 +00:00
Matthew Fritze
a438f67f1e
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: 8e6181c4fe
...
am: 5d45bed429
2017-07-26 02:07:07 +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
Android Build Merger (Role)
43c1e45ce3
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: ee18f9f8aa" into oc-mr1-dev-plus-aosp
2017-07-26 02:02:23 +00:00
Matthew Fritze
01acdbed0f
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec
...
am: ee18f9f8aa
2017-07-26 02:01:43 +00:00
Matthew Fritze
5d45bed429
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec
...
am: 8e6181c4fe
2017-07-26 02:01:27 +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
Matthew Fritze
8e6181c4fe
Merge "Add default value to inline payloads" into oc-dr1-dev
...
am: 5aca5f3aec
2017-07-26 01:57:13 +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
d52e10c69c
Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 am: 3db8c874f1 -s ours
...
am: fa13bc052f
2017-07-26 01:45:42 +00:00
Andrew Sapperstein
db8fd8444f
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf am: 1bb9b966ff
...
am: d6a32c1519
2017-07-26 01:44:57 +00:00
Andrew Sapperstein
fa13bc052f
Merge "Fix robotests." into oc-dr1-dev am: b5696a9162
...
am: 3db8c874f1
2017-07-26 00:55:36 +00:00
Andrew Sapperstein
d6a32c1519
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf
...
am: 1bb9b966ff
2017-07-26 00:54:50 +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
2cad739bf4
Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 -s ours am: c38502ba59 -s ours
...
am: 7a10210981
2017-07-26 00:00:33 +00:00
Andrew Sapperstein
26f2bd44f8
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf am: fba88cc7c0
...
am: 5d8467a068
2017-07-25 23:59:50 +00:00
Andrew Sapperstein
46b459f184
Merge "Fix robotests." into oc-mr1-dev am: 205857726a
...
am: 2bdae81aca
2017-07-25 23:59:25 +00:00
Fan Zhang
8758496922
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev am: 7da06bd11b
...
am: d8ed5645be
2017-07-25 23:59:05 +00:00
Andrew Sapperstein
7a10210981
Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 -s ours
...
am: c38502ba59
2017-07-25 23:55:07 +00:00
Andrew Sapperstein
3db8c874f1
Merge "Fix robotests." into oc-dr1-dev
...
am: b5696a9162
2017-07-25 23:51:03 +00:00
Andrew Sapperstein
c38502ba59
Merge "Fix robotests." into oc-dr1-dev
...
am: b5696a9162
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
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
411ad12cf5
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: f854a08c3e
...
am: 25cadcdb3f
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
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
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
Matthew Fritze
7fdb865c1b
Merge "Add default value to inline payloads" into oc-mr1-dev am: 151cc3166d
...
am: eb506cce5f
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
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
Roshan Pius
333b7f5600
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca am: 974920af47 -s ours
...
am: 7952871e18
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
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
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
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
