OSDN Git Service
Doris Ling [Wed, 26 Jul 2017 06:31:27 +0000 (06:31 +0000)]
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a am:
3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
am:
40449ad439 -s ours
Change-Id: I4a56176a86d101069473a71ff8f2559782554f69
Doris Ling [Wed, 26 Jul 2017 06:31:03 +0000 (06:31 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a -s ours am:
dac62d24f4 -s ours
am:
566eea85dc -s ours
Change-Id: Idb5b70997a0b9808fc57b0f8b2ab6a3d8b19d278
Android Build Merger (Role) [Wed, 26 Jul 2017 06:27:25 +0000 (06:27 +0000)]
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a am:
3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Wed, 26 Jul 2017 06:27:07 +0000 (06:27 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a
am:
3ab3fc9ee4 -s ours
Change-Id: I4cd260bd057d9e638f4848eb41aa9cd2ae8f3c35
Doris Ling [Wed, 26 Jul 2017 06:27:06 +0000 (06:27 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a -s ours
am:
dac62d24f4 -s ours
Change-Id: I7c5148c30ff2aca518b63790c96566158cc42697
Fan Zhang [Wed, 26 Jul 2017 06:23:43 +0000 (06:23 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37 am:
2583cbe16b
am:
0c8c2ec24e
Change-Id: If29ca98d433b62da30bde6a6c874293958de6ba1
Doris Ling [Wed, 26 Jul 2017 06:23:08 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a
Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d
Doris Ling [Wed, 26 Jul 2017 06:23:03 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a -s ours
Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333
Fan Zhang [Wed, 26 Jul 2017 06:23:01 +0000 (06:23 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37 am:
43ef9743a2
am:
6a8f288d3f
Change-Id: I1284133bbc3a601747674a259095cb1541460693
Fan Zhang [Wed, 26 Jul 2017 06:14:39 +0000 (06:14 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37
am:
2583cbe16b
Change-Id: Icd3ceb208f807c9e8bd447ab2ba1cac99fc466e5
TreeHugger Robot [Wed, 26 Jul 2017 06:11:07 +0000 (06:11 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 06:11:00 +0000 (06:11 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37
am:
43ef9743a2
Change-Id: Id6c3e260947c12d884ae76b2a8eadc4ed2dc3d73
Fan Zhang [Wed, 26 Jul 2017 06:07:37 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
Fan Zhang [Wed, 26 Jul 2017 06:07:30 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
Fan Zhang [Wed, 26 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 05:07:25 +0000 (05:07 +0000)]
Merge "Update misc strings" into oc-mr1-dev am:
34d30267e3
am:
c2c42de513
Change-Id: I7581b873fdbee8174e65bf2f6064efa190b4e61e
Fan Zhang [Wed, 26 Jul 2017 05:02:56 +0000 (05:02 +0000)]
Merge "Update misc strings" into oc-mr1-dev
am:
34d30267e3
Change-Id: I2d6e173a84ca7c58c6be4785fcd787a052839199
TreeHugger Robot [Wed, 26 Jul 2017 04:59:29 +0000 (04:59 +0000)]
Merge "Update misc strings" into oc-mr1-dev
Doris Ling [Wed, 26 Jul 2017 04:30:28 +0000 (04:30 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev am:
0224a409a9
am:
99d3b353c6 -s ours
Change-Id: I2902f06ec76ce4cbb2da5a125ec65838d4137d2b
Doris Ling [Wed, 26 Jul 2017 04:22:58 +0000 (04:22 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
am:
0224a409a9
Change-Id: I5a4a38747df864ff7dbde6e0b9185c6196012908
Doris Ling [Wed, 26 Jul 2017 04:14:07 +0000 (04:14 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:21:55 +0000 (03:21 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316 am:
be0ac89704
am:
58dfff8468
Change-Id: I982fcdc98259291049b3f8b46039ea9d89dfd23d
Christine Franks [Wed, 26 Jul 2017 03:21:30 +0000 (03:21 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316 am:
a1f56b5faa
am:
02de4d0e23
Change-Id: I465d422b25e682cde7e486dc08b9871bff9383fe
Christine Franks [Wed, 26 Jul 2017 03:04:29 +0000 (03:04 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316
am:
be0ac89704
Change-Id: I7589fb8ca10497b81736de29a4c6461723f06a93
Christine Franks [Wed, 26 Jul 2017 02:59:16 +0000 (02:59 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316
am:
a1f56b5faa
Change-Id: Idc0678e98f9606b991eb82c45f3c53dc65663905
Christine Franks [Wed, 26 Jul 2017 02:56:36 +0000 (02:56 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am:
a7e10e0316
Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
Christine Franks [Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am:
a7e10e0316
Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
Christine Franks [Wed, 26 Jul 2017 02:38:08 +0000 (02:38 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 02:16:41 +0000 (02:16 +0000)]
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
Change-Id: I5bc226ae2fadbba3f7026280e35a3a69f8c141ae
Doris Ling [Wed, 26 Jul 2017 02:16:15 +0000 (02:16 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am:
0e9711ab92 am:
f8bb8a9792
am:
c0eac3803d
Change-Id: I72106b5c3e73dc194a5678e6e4c3ec6306d6b413
Android Build Merger (Role) [Wed, 26 Jul 2017 02:12:40 +0000 (02:12 +0000)]
Merge "Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am:
0e9711ab92 am:
a60d3ef00c" into oc-mr1-dev-plus-aosp
Doris Ling [Wed, 26 Jul 2017 02:12:14 +0000 (02:12 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am:
0e9711ab92
am:
f8bb8a9792
Change-Id: I91b902ed5db6662e7e9fc2187049311b00b50cc6
Doris Ling [Wed, 26 Jul 2017 02:12:14 +0000 (02:12 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am:
0e9711ab92
am:
a60d3ef00c
Change-Id: Ie34e317a4655731282cf3fdcf1d4ecdd8b040ff2
Doris Ling [Wed, 26 Jul 2017 02:08:45 +0000 (02:08 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am:
0e9711ab92
Change-Id: I7fc59ace61bb89b40ab3eabe774a89128895515f
Doris Ling [Wed, 26 Jul 2017 02:08:44 +0000 (02:08 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am:
0e9711ab92
Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
Matthew Fritze [Wed, 26 Jul 2017 02:07:33 +0000 (02:07 +0000)]
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am:
5aca5f3aec am:
ee18f9f8aa" into oc-mr1-dev-plus-aosp
am:
43c1e45ce3
Change-Id: I2a3a8434ea655871306a9266c583dd0318b59421
Matthew Fritze [Wed, 26 Jul 2017 02:07:07 +0000 (02:07 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev am:
5aca5f3aec am:
8e6181c4fe
am:
5d45bed429
Change-Id: If58d0301eab11d2fd37cba2374bd0b1ab6476b90
TreeHugger Robot [Wed, 26 Jul 2017 02:04:20 +0000 (02:04 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled."
TreeHugger Robot [Wed, 26 Jul 2017 02:02:32 +0000 (02:02 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 02:02:23 +0000 (02:02 +0000)]
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am:
5aca5f3aec am:
ee18f9f8aa" into oc-mr1-dev-plus-aosp
Matthew Fritze [Wed, 26 Jul 2017 02:01:43 +0000 (02:01 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev am:
5aca5f3aec
am:
ee18f9f8aa
Change-Id: I8e5f466787faac72a47496d14a2eb0821f9ed598
Matthew Fritze [Wed, 26 Jul 2017 02:01:27 +0000 (02:01 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev am:
5aca5f3aec
am:
8e6181c4fe
Change-Id: Ia94fc41ae127a37a653a7d94ce1cf0d5ff04c693
Matthew Fritze [Wed, 26 Jul 2017 01:57:29 +0000 (01:57 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
am:
5aca5f3aec
Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
Matthew Fritze [Wed, 26 Jul 2017 01:57:13 +0000 (01:57 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
am:
5aca5f3aec
Change-Id: I5e15e7d80ac30f07390be702662939acbbc30675
TreeHugger Robot [Wed, 26 Jul 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
Andrew Sapperstein [Wed, 26 Jul 2017 01:45:42 +0000 (01:45 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
b5696a9162 am:
3db8c874f1 -s ours
am:
fa13bc052f -s ours
Change-Id: I00afe04b87a756ba1ba85aa0e3abd28370826dd2
Andrew Sapperstein [Wed, 26 Jul 2017 01:44:57 +0000 (01:44 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am:
5b67e453bf am:
1bb9b966ff
am:
d6a32c1519
Change-Id: I9c2fd3efa0a07fbf0a9d0d017f97ef2edf73dc5a
Andrew Sapperstein [Wed, 26 Jul 2017 00:55:36 +0000 (00:55 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
b5696a9162
am:
3db8c874f1 -s ours
Change-Id: I46726b691005d8aeb57afc67303931cb111eec3c
Andrew Sapperstein [Wed, 26 Jul 2017 00:54:50 +0000 (00:54 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am:
5b67e453bf
am:
1bb9b966ff
Change-Id: I3a01ecbbf5f2d33689f8019e5ae15d76f563132a
Andrew Sapperstein [Wed, 26 Jul 2017 00:00:33 +0000 (00:00 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
b5696a9162 -s ours am:
c38502ba59 -s ours
am:
7a10210981
Change-Id: I1924c1f0af88e58a0399525fcab4de2b5ed8507b
Andrew Sapperstein [Tue, 25 Jul 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am:
5b67e453bf am:
fba88cc7c0
am:
5d8467a068
Change-Id: Ieb5836f758760c47a252e7ff07ef8fcbb627b4aa
Andrew Sapperstein [Tue, 25 Jul 2017 23:59:25 +0000 (23:59 +0000)]
Merge "Fix robotests." into oc-mr1-dev am:
205857726a
am:
2bdae81aca
Change-Id: I8a258143ffe8894e1bc7d291b14bc0ddd3653058
Fan Zhang [Tue, 25 Jul 2017 23:59:05 +0000 (23:59 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev am:
7da06bd11b
am:
d8ed5645be
Change-Id: I8795c0da21730609a08091f6b864f5f0ec99d6b3
Andrew Sapperstein [Tue, 25 Jul 2017 23:55:07 +0000 (23:55 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
b5696a9162 -s ours
am:
c38502ba59 -s ours
Change-Id: I645dc753076e4f5be876338484979ca890bd9a2d
Andrew Sapperstein [Tue, 25 Jul 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
b5696a9162
Change-Id: I126be625a1b9114ca067dca0f2fe99c7aa395873
Andrew Sapperstein [Tue, 25 Jul 2017 23:50:57 +0000 (23:50 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
b5696a9162 -s ours
Change-Id: Ibce6e5a08dffeab7779718d99d2cc7ad60c5586b
Fan Zhang [Mon, 24 Jul 2017 23:03:49 +0000 (16:03 -0700)]
Extract method to build preference count logging's name.
Bug:
35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
Andrew Sapperstein [Tue, 25 Jul 2017 23:47:22 +0000 (23:47 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am:
5b67e453bf
am:
fba88cc7c0
Change-Id: Ife5fbbcea5622a28916cc226868ae7ffb7eef5a7
Andrew Sapperstein [Tue, 25 Jul 2017 23:47:00 +0000 (23:47 +0000)]
Merge "Fix robotests." into oc-mr1-dev
am:
205857726a
Change-Id: I4f04275f7a6d71d3a19b6b8bf2540af4debdd76e
Doris Ling [Mon, 24 Jul 2017 20:13:00 +0000 (13:13 -0700)]
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
Andrew Sapperstein [Tue, 25 Jul 2017 23:37:37 +0000 (23:37 +0000)]
Merge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:34:03 +0000 (23:34 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am:
5b67e453bf
Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
Andrew Sapperstein [Tue, 25 Jul 2017 23:30:32 +0000 (23:30 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am:
5b67e453bf
Change-Id: I7694793ff006a2c677511563b69e411b6ed284f2
Andrew Sapperstein [Tue, 25 Jul 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix robotests." into oc-mr1-dev
Fan Zhang [Tue, 25 Jul 2017 23:11:13 +0000 (23:11 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
am:
7da06bd11b
Change-Id: Ieb1fb873537f8faca68b185e0f219e7bd4031524
Fan Zhang [Tue, 25 Jul 2017 23:06:11 +0000 (23:06 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
Fan Zhang [Tue, 25 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee am:
f854a08c3e
am:
25cadcdb3f
Change-Id: I159faf137bfd0a6f3977657c51ffaaad06e1de18
Fan Zhang [Tue, 25 Jul 2017 21:53:25 +0000 (21:53 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee am:
2f84a358d9
am:
3bc97152d1
Change-Id: Iea6491534c7d43a97456ab2e83eae5e32c747c80
Fan Zhang [Tue, 25 Jul 2017 21:40:34 +0000 (21:40 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee
am:
f854a08c3e
Change-Id: Ie113d470743947ffa22844de50243d0d7b42534a
Fan Zhang [Tue, 25 Jul 2017 21:39:00 +0000 (21:39 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee
am:
2f84a358d9
Change-Id: I727693edc69b0adfb862efce87834fc78657600e
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
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
Matthew Fritze [Tue, 25 Jul 2017 21:36:52 +0000 (21:36 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev am:
151cc3166d
am:
eb506cce5f
Change-Id: I2ffd4684a4cba96ea624d521d98d6dc52d86c170
Fan Zhang [Tue, 25 Jul 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
Fan Zhang [Tue, 25 Jul 2017 21:30:26 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
TreeHugger Robot [Tue, 25 Jul 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
Matthew Fritze [Tue, 25 Jul 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev
am:
151cc3166d
Change-Id: I026dc25e97d2628237e2f02c2a95e3ecbefa8d5e
Roshan Pius [Tue, 25 Jul 2017 21:16:08 +0000 (21:16 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca am:
974920af47 -s ours
am:
7952871e18 -s ours
Change-Id: Id3f5bb81d2cc75594508d90442d4bf8b15f92b39
Roshan Pius [Tue, 25 Jul 2017 21:12:39 +0000 (21:12 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca -s ours am:
096e14d92f -s ours
am:
e71f1bc007 -s ours
Change-Id: I45bae5f86d3b8803e1093e62c3210bf752565e00
Lei Yu [Tue, 25 Jul 2017 21:11:52 +0000 (21:11 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3 am:
2e70aea742
am:
716d4b2162
Change-Id: Ida0226721d71e07a478f7b727f766821cf28e7fa
Lei Yu [Tue, 25 Jul 2017 21:11:16 +0000 (21:11 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3 am:
ce4ed05085
am:
7d2007dacf
Change-Id: Ia07cc9756c420c9193d6072a0971dacfcf854017
Matthew Fritze [Tue, 25 Jul 2017 21:10:55 +0000 (21:10 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev
Roshan Pius [Tue, 25 Jul 2017 21:06:25 +0000 (21:06 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca
am:
974920af47 -s ours
Change-Id: Ib44b99d0d8804de60948929c4c6fc5e7d9c55cd5
Roshan Pius [Tue, 25 Jul 2017 21:01:43 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca
Change-Id: I39ee1e7e6712e6acec56aaa088ef19ea2669784c
Roshan Pius [Tue, 25 Jul 2017 21:01:25 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca -s ours
am:
096e14d92f -s ours
Change-Id: I1bec0f5ef17946fa49cdd2aa36ebc51f3d3c1d23
Lei Yu [Tue, 25 Jul 2017 21:00:41 +0000 (21:00 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3
am:
2e70aea742
Change-Id: I09713571128aac7050a0be706497a241edead8dd
Lei Yu [Tue, 25 Jul 2017 20:58:12 +0000 (20:58 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3
am:
ce4ed05085
Change-Id: Ibca49417ed69cbce3edf5d841d4c4f591c8f1e21
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Roshan Pius [Tue, 25 Jul 2017 20:56:33 +0000 (20:56 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca -s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
Lei Yu [Tue, 25 Jul 2017 20:55:21 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb
Lei Yu [Tue, 25 Jul 2017 20:55:16 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
Roshan Pius [Tue, 25 Jul 2017 20:52:29 +0000 (20:52 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Fan Zhang [Tue, 25 Jul 2017 20:25:39 +0000 (13:25 -0700)]
Update misc strings
Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix:
62069132
Fix:
62265094
Test: visual
Christine Franks [Wed, 12 Jul 2017 00:32:57 +0000 (17:32 -0700)]
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
Fan Zhang [Tue, 25 Jul 2017 17:30:24 +0000 (10:30 -0700)]
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
Doris Ling [Tue, 25 Jul 2017 18:33:40 +0000 (11:33 -0700)]
Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.
Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug:
63939450
Test: make RunSettingsRoboTests
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
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
Doris Ling [Tue, 25 Jul 2017 17:38:22 +0000 (10:38 -0700)]
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
OSDN Git Service
