Suprabh Shukla
8fe20711fa
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 am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
...
am: 28f6dd01bc
2017-08-16 20:41:48 +00:00
Suprabh Shukla
bbe3047d1d
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
...
am: 0e22588ed0
2017-08-16 20:40:59 +00:00
Maurice Lam
209410dd2a
Fix bad string reference
...
The source string was removed but there are still references to it.
Updating the references as well in this CL.
Test: mma with ANDROID_AAPT_IGNORE on locale files
Bug: 64763091
Change-Id: I43ef63207e884cbaa92ff3853b0f1fd690cf05f8
2017-08-16 13:39:12 -07:00
Suprabh Shukla
b4678ce1d2
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours
...
am: 5d4a2bb844
2017-08-16 20:25:12 +00:00
Suprabh Shukla
28f6dd01bc
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 am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
...
am: a6b4e032c8
2017-08-16 20:24:28 +00:00
Suprabh Shukla
0e22588ed0
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
...
am: 142433924f
2017-08-16 20:23:41 +00:00
Suprabh Shukla
5d4a2bb844
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours
...
am: 23e185adf8
2017-08-16 20:22:36 +00:00
Suprabh Shukla
a6b4e032c8
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 am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
...
am: df39274478
2017-08-16 20:18:15 +00:00
Suprabh Shukla
23e185adf8
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours
...
am: 82afc6c5fd
2017-08-16 20:17:34 +00:00
Suprabh Shukla
142433924f
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
...
am: 3dd026d5dc
2017-08-16 20:17:28 +00:00
Suprabh Shukla
82afc6c5fd
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours
...
am: 81ba0cc873
2017-08-16 20:14:42 +00:00
Suprabh Shukla
81ba0cc873
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours
...
am: 202970aa92
2017-08-16 20:10:37 +00:00
Suprabh Shukla
df39274478
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 am: de8e1f4be5 -s ours am: b2f5566de5 -s ours
...
am: 05fec2162a
2017-08-16 20:09:35 +00:00
Suprabh Shukla
3dd026d5dc
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
...
am: 6d7bb4c4d0
2017-08-16 20:08:56 +00:00
Suprabh Shukla
202970aa92
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours
...
am: 3ce6d3ee87
2017-08-16 20:06:04 +00:00
Suprabh Shukla
05fec2162a
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 am: de8e1f4be5 -s ours
...
am: b2f5566de5
2017-08-16 20:04:24 +00:00
Suprabh Shukla
6d7bb4c4d0
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
...
am: 817c35056c
2017-08-16 20:03:34 +00:00
Suprabh Shukla
3ce6d3ee87
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 am: 694ab09ff3 -s ours am: a92a7e400f -s ours
...
am: cf0caf8f22
2017-08-16 20:02:33 +00:00
Suprabh Shukla
b2f5566de5
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
...
am: de8e1f4be5
2017-08-16 19:59:04 +00:00
Suprabh Shukla
cf0caf8f22
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 am: 694ab09ff3 -s ours
...
am: a92a7e400f
2017-08-16 19:59:04 +00:00
Suprabh Shukla
817c35056c
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
...
am: 2e6cf5dcde
2017-08-16 19:55:14 +00:00
Suprabh Shukla
a92a7e400f
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
...
am: 694ab09ff3
2017-08-16 19:55:02 +00:00
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
2017-08-16 19:55:01 +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
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
2017-08-16 19:51:02 +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
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
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
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
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
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
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
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
2017-08-16 19:40:30 +00:00
Suprabh Shukla
72beaddfd4
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
...
am: ccad4a3621
2017-08-16 19:39:49 +00:00
Suprabh Shukla
78a9d598f1
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
...
am: 93a9e9f7f2
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b
Disabling the activate button when paused am: de5df8b090 am: 779237e37f
...
am: 24547155ea
2017-08-16 19:37:01 +00:00
Suprabh Shukla
616c84ccb0
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
...
am: 1370eb3d52
2017-08-16 19:34:24 +00:00
Suprabh Shukla
ccad4a3621
Disabling the activate button when paused am: af5d8b9b03
...
am: 26f4aceece
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2
Disabling the activate button when paused am: 9ffee0d534
...
am: d27e28eab7
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea
Disabling the activate button when paused am: de5df8b090
...
am: 779237e37f
2017-08-16 19:32:31 +00:00
Suprabh Shukla
1370eb3d52
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
...
am: 1e9af33c41
2017-08-16 19:30:03 +00:00
Suprabh Shukla
d27e28eab7
Disabling the activate button when paused
...
am: 9ffee0d534
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece
Disabling the activate button when paused
...
am: af5d8b9b03
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41
Disabling the activate button when paused am: 8e08a9bb71
...
am: 08207f457d
2017-08-16 19:25:59 +00:00
Suprabh Shukla
779237e37f
Disabling the activate button when paused
...
am: de5df8b090
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d
Disabling the activate button when paused
...
am: 8e08a9bb71
2017-08-16 19:22:01 +00:00
Maurice Lam
2bc609a1bd
Add fingerprint illustration image
...
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07: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
0ece5f2a06
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
2017-08-16 07:51:27 +00:00
