Fan Zhang
43ef9743a2
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:37 +00:00
Fan Zhang
2583cbe16b
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:30 +00:00
Fan Zhang
5fb56c5b37
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
2017-07-26 05:59:57 +00:00
Fan Zhang
0e641f55ae
Merge "Update misc strings" into oc-mr1-dev am: 34d30267e3
...
am: c2c42de513
2017-07-26 05:07:25 +00:00
Fan Zhang
c2c42de513
Merge "Update misc strings" into oc-mr1-dev
...
am: 34d30267e3
2017-07-26 05:02:56 +00:00
TreeHugger Robot
34d30267e3
Merge "Update misc strings" into oc-mr1-dev
2017-07-26 04:59:29 +00:00
Doris Ling
a69e4e6272
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev am: 0224a409a9
...
am: 99d3b353c6
2017-07-26 04:30:28 +00:00
Bill Yi
8a25fb603a
Import translations. DO NOT MERGE
...
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-25 21:25:48 -07:00
Doris Ling
99d3b353c6
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
...
am: 0224a409a9
2017-07-26 04:22:58 +00:00
Doris Ling
0224a409a9
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
2017-07-26 04:14:07 +00:00
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
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
