OSDN Git Service
TreeHugger Robot [Thu, 17 Aug 2017 00:32:40 +0000 (00:32 +0000)]
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Fix bad string reference" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 22:57:24 +0000 (22:57 +0000)]
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
Fan Zhang [Wed, 16 Aug 2017 19:45:22 +0000 (12:45 -0700)]
Remove gibberish summary in search when query is "lock"
Fixes:
64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e
Suprabh Shukla [Wed, 16 Aug 2017 21:20:30 +0000 (21:20 +0000)]
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 -s ours am:
b4678ce1d2 -s ours
am:
9a416573d7 -s ours
Change-Id: I5bad4c775a8bd9cb30c428006369335f9da8dd9f
Suprabh Shukla [Wed, 16 Aug 2017 21:19:30 +0000 (21:19 +0000)]
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 -s ours
am:
8fe20711fa -s ours
Change-Id: I87f9269d525a63210c55b70e347a693fa8c65ed2
Suprabh Shukla [Wed, 16 Aug 2017 21:17:28 +0000 (21:17 +0000)]
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 -s ours
am:
bbe3047d1d -s ours
Change-Id: If2bd687791fccfd3b5aea601053f6038be1d6577
Ruchi Kandoi [Wed, 16 Aug 2017 20:24:14 +0000 (13:24 -0700)]
Nfc Payment Preference check if the dialog is non-null before dismissing
Test: monkey test
Bug:
64758793
Change-Id: I3905096889b2dc6ef468afc76e9767f63b4163ad
Suprabh Shukla [Wed, 16 Aug 2017 20:42:38 +0000 (20:42 +0000)]
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 -s ours
am:
b4678ce1d2 -s ours
Change-Id: I199cfbc0ec36904483c35aa9712ab471cf5b4ec2
Suprabh Shukla [Wed, 16 Aug 2017 20:41:48 +0000 (20:41 +0000)]
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 -s ours
Change-Id: If16f17e144156b08dc9fea587178cad18dc370e7
Suprabh Shukla [Wed, 16 Aug 2017 20:40:59 +0000 (20:40 +0000)]
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 -s ours
Change-Id: I7243a50b7d64e1ee63d85e4ce5467217c76d7bce
Maurice Lam [Wed, 16 Aug 2017 20:39:12 +0000 (13:39 -0700)]
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
Suprabh Shukla [Wed, 16 Aug 2017 20:25:12 +0000 (20:25 +0000)]
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 -s ours
Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8
Suprabh Shukla [Wed, 16 Aug 2017 20:24:28 +0000 (20:24 +0000)]
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
Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a
Suprabh Shukla [Wed, 16 Aug 2017 20:23:41 +0000 (20:23 +0000)]
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
Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083
Suprabh Shukla [Wed, 16 Aug 2017 20:22:36 +0000 (20:22 +0000)]
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
Change-Id: I28fb4049f4c3a51d163cc77b60358736d082604e
Suprabh Shukla [Wed, 16 Aug 2017 20:18:15 +0000 (20:18 +0000)]
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
Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6
Suprabh Shukla [Wed, 16 Aug 2017 20:17:34 +0000 (20:17 +0000)]
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
Change-Id: If3e96fdcd076bfe522b32726d05bef5f5a605d6a
Suprabh Shukla [Wed, 16 Aug 2017 20:17:28 +0000 (20:17 +0000)]
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
Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec
Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]
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
Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b
Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]
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
Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446
Suprabh Shukla [Wed, 16 Aug 2017 20:09:35 +0000 (20:09 +0000)]
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
Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8
Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +0000)]
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
Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf
Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]
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
Change-Id: I8afbb6a39eb1cffe0cafc94a4b3c98629afce27c
Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]
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
Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7
Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours
am:
817c35056c -s ours
Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f
Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]
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
Change-Id: If3daaffd53e0ee3743f6f4a1608c5114cfa498b7
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
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
Change-Id: I991cd251a7f54d16dff7df676aff5fed265a07d3
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
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
Change-Id: I050ec3b9ce32d4a91add1447bab7845163348485
Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours
am:
2e6cf5dcde -s ours
Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61
Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]
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
Change-Id: Ib0587f73a715928275159027c09286127d063684
Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:46:49 +0000 (19:46 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621
am:
72beaddfd4 -s ours
Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1
Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]
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
Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours
am:
78a9d598f1 -s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours
am:
889036189b -s ours
Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52
am:
616c84ccb0 -s ours
Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef
Suprabh Shukla [Wed, 16 Aug 2017 19:39:49 +0000 (19:39 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece
am:
ccad4a3621
Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f
Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7
am:
93a9e9f7f2 -s ours
Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f
am:
24547155ea -s ours
Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41
am:
1370eb3d52
Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
Suprabh Shukla [Wed, 16 Aug 2017 19:33:34 +0000 (19:33 +0000)]
Disabling the activate button when paused am:
af5d8b9b03
am:
26f4aceece
Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Disabling the activate button when paused am:
9ffee0d534
am:
d27e28eab7
Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]
Disabling the activate button when paused am:
de5df8b090
am:
779237e37f
Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d
am:
1e9af33c41
Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am:
9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am:
af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am:
8e08a9bb71
am:
08207f457d
Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am:
de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am:
8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
Maurice Lam [Wed, 16 Aug 2017 18:25:02 +0000 (18:25 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 07:51:27 +0000 (07:51 +0000)]
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 02:30:14 +0000 (19:30 -0700)]
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
Maurice Lam [Tue, 15 Aug 2017 23:26:05 +0000 (16:26 -0700)]
Don't launch Choose Lock again if recreating
When ChooseLockGeneric is recreated, don't automatically launch
ChooseLock[Password/Pattern] even if the corresponding intent extras
are specified, because one would have been launched in the previous
onCreate.
Test: Manual
Bug:
64605627
Change-Id: I227a14abb2f4dd6c4577186a3d8164df0bec7791
Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
TreeHugger Robot [Tue, 15 Aug 2017 01:18:27 +0000 (01:18 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
d8d29f2964 -s ours
Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad
Bill Yi [Mon, 14 Aug 2017 13:32:35 +0000 (13:32 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a2a4037f593b6bbbe5c178971f13ef869b7ffe8e.
Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am:
a2a4037f59 -s ours
Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9
Bill Yi [Sat, 12 Aug 2017 15:56:25 +0000 (08:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jesse Evans [Sat, 12 Aug 2017 00:51:33 +0000 (17:51 -0700)]
Change strings from Instant app account to setting
Test: existing tests
Bug:
63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup
Test: Manual, existing tests pass
Bug:
64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
TreeHugger Robot [Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Ajay Nadathur [Fri, 11 Aug 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 03:01:33 +0000 (03:01 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
Kevin Chyn [Fri, 4 Aug 2017 00:03:13 +0000 (17:03 -0700)]
Clean up AssistGesturePreferenceController
The preference controller shouldn't be shared between the
"Assist Gesture" parent setting, and the child setting within
Fixes:
64318213
Test: manual test of settings && make -j RunSettingsRoboTests
Change-Id: I2d2437e2036881a08977924dc1386aa1fab67070
Ajay Nadathur [Thu, 10 Aug 2017 19:36:00 +0000 (12:36 -0700)]
Update strings for skip fingerprint setup
bug:
64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
Doris Ling [Thu, 10 Aug 2017 22:28:20 +0000 (22:28 +0000)]
Initialize the volume seekbar preference max and progress.
am:
cbc231c545
Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
Initialize the volume seekbar preference max and progress.
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.
Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix:
34035654
Test: make RunSettingsRoboTests
(cherry picked from commit
b7490bea28cb28d301fe4ec0275cef7129621206)
Antony Sargent [Thu, 10 Aug 2017 07:25:53 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am:
49cd8f2327
Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:37 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
9476e824be
Change-Id: I584d95282cc7c5f681fd6bc5ac4c0f03ad22053c
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:29 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Antony Sargent [Wed, 9 Aug 2017 22:57:17 +0000 (15:57 -0700)]
Stay discoverable in Bluetooth settings and pairing pages
There are two problems with the Bluetooth settings and pairing pages
that are fixed by this CL:
(1) We advertise on the page that the local device is visible to other
devices, but that only lasts for the length of the default timeout (120
seconds) for the local adapter being in discoverable mode.
(2) Both the BluetoothSettings and BluetoothPairingDetail fragments
enter discoverable mode in their onStart handler and exit it in their
onStop handler. Unfortunately when doing a fragment navigation the
onStart and onStop events interleave in a non-intuitive manner. When you
go from BluetoothSettings to BluetoothPairingDetail, we see the onStop
event for BluetoothSettings *after* the onStart event for
BluetoothPairingDetail, and similarly when going back from
BluetoothSettings to BluetoothPairingDetail. What this means in practice
is that if you go to the BluetoothSettings page, the device will be
discoverable, but once you navigate to BluetoothPairingDetail or back
again you won't be discoverable again until you go somewhere else or end
the settings activity.
This CL adds a new object called AlwaysDiscoverable which can be used to
start and stop a mode of "always being discoverable". While started, it
will listen for changes to the discoverable state, and return to
discoverable mode. This fixes (1) by returning to discoverable mode
whenever the normal timeout expires, and (2) similary by returning to
discoverable mode when we accidentally exit it due to the onStop/onStart
mismatch.
A better fix for (2) would be to avoid the "glitch" of briefly exiting
discoverable mode only to re-enter it, but the implementation of that is
a little more complicated so that's being left as future work in order
to keep this CL as small as possible.
Bug:
64130265
Test: make RunSettingsRoboTests
Change-Id: I559dd8187263ea6a0008be1a8abdfffac97cb87a
TreeHugger Robot [Thu, 10 Aug 2017 03:41:07 +0000 (03:41 +0000)]
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
Kevin Chyn [Thu, 27 Jul 2017 00:35:23 +0000 (17:35 -0700)]
Reset fingerprint lockout upon successful unlock
FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered
Fixes:
63437524
Fixes:
63739006
Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode
Change-Id: Ia2e219824c33169a5610b36123c42aa3d6ff22c5
TreeHugger Robot [Thu, 10 Aug 2017 01:41:45 +0000 (01:41 +0000)]
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 00:38:43 +0000 (00:38 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
Justin Klaassen [Thu, 10 Aug 2017 00:36:20 +0000 (00:36 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa -s ours
Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177
Doris Ling [Tue, 8 Aug 2017 21:03:29 +0000 (14:03 -0700)]
Log preference change as Integer instead of Long.
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix:
64485529
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 10 Aug 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
Fan Zhang [Thu, 3 Aug 2017 00:32:43 +0000 (17:32 -0700)]
Delete DynamicindexableContentMonitor & all refs to it
Convert input device search into a search query loader
And remove old logic from DynamicIndexableContentMonitor
Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug:
64310452
Bug:
63831980
Test: robotests
Jayachandran C [Tue, 8 Aug 2017 20:06:51 +0000 (13:06 -0700)]
Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM
Bug:
64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
qqzhou [Wed, 9 Aug 2017 22:41:12 +0000 (22:41 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
Daniel Nishi [Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959 -s ours
Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
Matthew Fritze [Wed, 9 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78 -s ours
Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
The Android Open Source Project [Wed, 9 Aug 2017 22:37:57 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
Daniel Nishi [Wed, 9 Aug 2017 22:37:34 +0000 (22:37 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:28:38 +0000 (11:28 -0700)]
Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes:
64342027
Test: visual
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
Initialize the volume seekbar preference max and progress.
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.
Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix:
34035654
Test: make RunSettingsRoboTests
OSDN Git Service
