Suprabh Shukla
de8e1f4be5
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7
am: 93a9e9f7f2
-s ours am: 78a9d598f1
-s ours am: 0dba51f9f0
-s ours am: 7bd8e120cb
-s ours
...
am: d22de194f5
-s ours
Change-Id: I953f903e7298541160ed8c17f274a832618c152e
2017-08-16 19:55:01 +00:00
Android Build Merger (Role)
910f4fb003
Merge "Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours am: f52c8ccbfc
-s ours" into oc-dr1-dev-plus-aosp
2017-08-16 19:51:50 +00:00
Suprabh Shukla
d0275e53eb
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours
...
am: f52c8ccbfc
-s ours
Change-Id: I432c3951bc7bd3a1aafca201dd9206dcfb33ceee
2017-08-16 19:51:03 +00:00
Suprabh Shukla
db8682996d
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours
...
am: baf4375f01
-s ours
Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b
2017-08-16 19:51:03 +00:00
Suprabh Shukla
9f458c77fd
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours
...
am: f52c8ccbfc
-s ours
Change-Id: I22a9fd9d0713277fa591b5a0ef7f6958931588b9
2017-08-16 19:51:03 +00:00
Suprabh Shukla
d22de194f5
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7
am: 93a9e9f7f2
-s ours am: 78a9d598f1
-s ours am: 0dba51f9f0
-s ours
...
am: 7bd8e120cb
-s ours
Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f
2017-08-16 19:51:02 +00:00
Suprabh Shukla
baf4375f01
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours
...
am: aedf7cdfdb
-s ours
Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080
2017-08-16 19:49:08 +00:00
Suprabh Shukla
f52c8ccbfc
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours
...
am: aedf7cdfdb
-s ours
Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a
2017-08-16 19:48:33 +00:00
Suprabh Shukla
694ab09ff3
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours
...
am: 29c1777ca5
-s ours
Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197
2017-08-16 19:48:32 +00:00
Beverly
949d813715
Null-pointer check when updating name of ZenRule.
...
Test: manual, current tests pass
Fixes: 64758679
Change-Id: Ia94b1749afdc6db4780bd09a5794f4110d4d032d
2017-08-16 15:47:27 -04:00
Suprabh Shukla
7bd8e120cb
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7
am: 93a9e9f7f2
-s ours am: 78a9d598f1
-s ours
...
am: 0dba51f9f0
-s ours
Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389
2017-08-16 19:47:06 +00:00
Suprabh Shukla
2e6cf5dcde
Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece
am: ccad4a3621
...
am: 72beaddfd4
-s ours
Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1
2017-08-16 19:46:49 +00:00
Suprabh Shukla
29c1777ca5
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours
...
am: 9acf640efd
-s ours
Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0
2017-08-16 19:44:31 +00:00
Suprabh Shukla
0dba51f9f0
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7
am: 93a9e9f7f2
-s ours
...
am: 78a9d598f1
-s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
2017-08-16 19:43:31 +00:00
Suprabh Shukla
9acf640efd
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours
...
am: 889036189b
-s ours
Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
2017-08-16 19:40:32 +00:00
Suprabh Shukla
aedf7cdfdb
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
...
am: 616c84ccb0
-s ours
Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef
2017-08-16 19:40:30 +00:00
Suprabh Shukla
72beaddfd4
Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece
...
am: ccad4a3621
Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f
2017-08-16 19:39:49 +00:00
Suprabh Shukla
78a9d598f1
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7
...
am: 93a9e9f7f2
-s ours
Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
...
am: 24547155ea
-s ours
Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
2017-08-16 19:37:01 +00:00
TreeHugger Robot
c99ef27f8d
Merge "Remove "saved networks" from search indexing"
2017-08-16 19:36:34 +00:00
Suprabh Shukla
616c84ccb0
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
...
am: 1370eb3d52
Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
2017-08-16 19:34:24 +00:00
Suprabh Shukla
ccad4a3621
Disabling the activate button when paused am: af5d8b9b03
...
am: 26f4aceece
Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2
Disabling the activate button when paused am: 9ffee0d534
...
am: d27e28eab7
Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea
Disabling the activate button when paused am: de5df8b090
...
am: 779237e37f
Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
2017-08-16 19:32:31 +00:00
Suprabh Shukla
1370eb3d52
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
...
am: 1e9af33c41
Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
2017-08-16 19:30:03 +00:00
Suprabh Shukla
d27e28eab7
Disabling the activate button when paused
...
am: 9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece
Disabling the activate button when paused
...
am: af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41
Disabling the activate button when paused am: 8e08a9bb71
...
am: 08207f457d
Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
2017-08-16 19:25:59 +00:00
Suprabh Shukla
779237e37f
Disabling the activate button when paused
...
am: de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d
Disabling the activate button when paused
...
am: 8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +00:00
Eric Schwarzenbach
241cb0db02
Update detail icon only if its signal level changed.
...
Changes behavior to only render the wifi pie icon if the new rssi has
resulted in a new signal level.
Bug: 64712237
Test: make -j40 ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
RunSettingsRoboTests
Change-Id: I01be2f87d61489242d646ff2003db13c9268ea14
2017-08-16 11:52:17 -07:00
Nick Desaulniers
9729edbb8a
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2
-s ours am: f25a418e24
am: e625c2f64e
...
am: 4cdaebd0c4
Change-Id: Id52b16b39b337b52065c5a3828286170ee4f1c66
2017-08-16 18:51:56 +00:00
Nick Desaulniers
4cdaebd0c4
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2
-s ours am: f25a418e24
...
am: e625c2f64e
Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b
2017-08-16 18:44:56 +00:00
Maurice Lam
2bc609a1bd
Add fingerprint illustration image
...
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07:00
Nick Desaulniers
e625c2f64e
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2
-s ours
...
am: f25a418e24
Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804
2017-08-16 18:37:21 +00:00
Nick Desaulniers
f25a418e24
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
...
am: 33046b4ec2
-s ours
Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9
2017-08-16 18:34:27 +00:00
Maurice Lam
4db65eab00
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
...
am: 595627c630
Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
2017-08-16 18:30:22 +00:00
Maurice Lam
595627c630
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
2017-08-16 18:25:02 +00:00
Treehugger Robot
33046b4ec2
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
2017-08-16 18:00:44 +00:00
Maurice Lam
2c43d273b8
Merge "Update strings for screen lock setup"
2017-08-16 17:40:52 +00:00
Fan Zhang
ec96dc1542
Remove "saved networks" from search indexing
...
Change-Id: Ic8c1f8cee2c2a325ba3518d52d0c35b230a6abfd
Fixes: 64755091
Test: robotests
2017-08-16 10:31:16 -07:00
Nick Desaulniers
4021eb5229
DeviceInfoSettingsTest: test parsing llvm kernel
...
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.
Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
2017-08-16 09:51:41 -07:00
Maurice Lam
0c39aa781e
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev am: 0ece5f2a06
...
am: 2dad90da4b
Change-Id: Iadffbc4f2e84c9c36ed7d0470831aac6bb0656f4
2017-08-16 08:09:50 +00:00
Maurice Lam
2dad90da4b
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
...
am: 0ece5f2a06
Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc
2017-08-16 08:04:41 +00:00
TreeHugger Robot
0ece5f2a06
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
2017-08-16 07:51:27 +00:00
Bill Yi
cf96c9b13f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: If0ff6ff971291e101e464f028e79fc18afa5b6a7
2017-08-15 21:53:30 -07:00
Maurice Lam
e9a6e8f1e5
Use default primary color for choose lock screens
...
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.
Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Fan Zhang
75cd1d2010
Stub out feature flag UI
...
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
TreeHugger Robot
0dfd1f7dc1
Merge "Remove references to NetworkBadging."
2017-08-16 00:11:56 +00:00
Fan Zhang
0764a663fc
Merge "Compute aspect ratio properly"
2017-08-15 23:37:59 +00:00