Christine Franks
8e204dba0b
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316 am: be0ac89704
...
am: 58dfff8468
2017-07-26 03:21:55 +00:00
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
58dfff8468
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
...
am: be0ac89704
2017-07-26 03:04:29 +00:00
Christine Franks
02de4d0e23
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
...
am: a1f56b5faa
2017-07-26 02:59:16 +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
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
Doris Ling
5dab5d3c75
Merge "Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: a60d3ef00c" into oc-mr1-dev-plus-aosp
...
am: 08703184cb
2017-07-26 02:16:41 +00:00
Doris Ling
882020d14b
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: f8bb8a9792
...
am: c0eac3803d
2017-07-26 02:16:15 +00:00
Android Build Merger (Role)
08703184cb
Merge "Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: a60d3ef00c" into oc-mr1-dev-plus-aosp
2017-07-26 02:12:40 +00:00
Doris Ling
c0eac3803d
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
...
am: f8bb8a9792
2017-07-26 02:12:14 +00:00
Doris Ling
233e31700b
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
...
am: a60d3ef00c
2017-07-26 02:12:14 +00:00
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
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
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
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
