TreeHugger Robot
8ae8b7a931
Merge "Index TTS-Settings and dedupe TTS-engine in search result."
2017-08-17 17:30:19 +00:00
Bill Yi
0c515c104b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 682ff5562c -s ours
...
am: 7189b42b4e
2017-08-17 15:43:43 +00:00
Bill Yi
7189b42b4e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 682ff5562c
2017-08-17 15:40:43 +00:00
TreeHugger Robot
682ff5562c
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-17 15:33:39 +00:00
Fan Zhang
5bfe4c4309
Merge "Suppress some search results" into oc-mr1-dev am: f51b4a580f
...
am: f8817000ac
2017-08-17 07:18:10 +00:00
Maurice Lam
3e8718af51
Merge "Add fingerprint illustration image" into oc-mr1-dev am: 89c2adf420
...
am: 1b6307a9cc
2017-08-17 07:16:24 +00:00
Antony Sargent
fcb1073326
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev am: 53a77a2452
...
am: 811b25ac2b
2017-08-17 07:15:24 +00:00
Ruchi Kandoi
bcd3cff7a2
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev am: 7a5e42f3db
...
am: 1030cf5ad4
2017-08-17 07:14:28 +00:00
Maurice Lam
a4b54e52ba
Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
...
am: f7a818345d
2017-08-17 07:13:41 +00:00
Fan Zhang
7e5055b30c
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev am: 9a03b951d2
...
am: 5c15a79fa4
2017-08-17 07:12:51 +00:00
Fan Zhang
f8817000ac
Merge "Suppress some search results" into oc-mr1-dev
...
am: f51b4a580f
2017-08-17 01:29:44 +00:00
Maurice Lam
1b6307a9cc
Merge "Add fingerprint illustration image" into oc-mr1-dev
...
am: 89c2adf420
2017-08-17 01:23:19 +00:00
Antony Sargent
811b25ac2b
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
...
am: 53a77a2452
2017-08-17 01:22:27 +00:00
Ruchi Kandoi
1030cf5ad4
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
...
am: 7a5e42f3db
2017-08-17 01:21:51 +00:00
Maurice Lam
f7a818345d
Merge "Fix bad string reference" into oc-mr1-dev
...
am: f4716e89c0
2017-08-17 01:21:10 +00:00
TreeHugger Robot
f51b4a580f
Merge "Suppress some search results" into oc-mr1-dev
2017-08-17 01:20:42 +00:00
Fan Zhang
5c15a79fa4
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
...
am: 9a03b951d2
2017-08-17 01:20:19 +00:00
Sundeep Ghuman
055079ba38
Scroll to top when user connects to a network.
...
We now track when the user initiates a connection request, and upon
connection will scroll to the connected network.
Bug: 34093572
Test: Open wifi picker. Connect to a new or different network. The picker
should scroll to the top of list
Change-Id: I7bed31b0dd4f40333f76f8389612f7fd55f2620e
2017-08-16 17:51:31 -07:00
TreeHugger Robot
89c2adf420
Merge "Add fingerprint illustration image" into oc-mr1-dev
2017-08-17 00:49:00 +00:00
TreeHugger Robot
53a77a2452
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
2017-08-17 00:38:40 +00:00
TreeHugger Robot
7a5e42f3db
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
2017-08-17 00:32:40 +00:00
Maurice Lam
f4716e89c0
Merge "Fix bad string reference" into oc-mr1-dev
2017-08-16 23:33:43 +00:00
TreeHugger Robot
9a03b951d2
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
2017-08-16 22:57:24 +00:00
Fan Zhang
18a168239e
Index TTS-Settings and dedupe TTS-engine in search result.
...
Fixes: 63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
2017-08-16 15:46:41 -07:00
Doris Ling
97da51876b
Fix null pointer exception when logging suggestions.
...
In monkey test, the suggestions list can become null. So, add check
for valid suggestions list before trying to iterate through the
suggestions.
Fixes: 64757618
Test: make RunSettingsRoboTests
Change-Id: Ib670808a4f222187b9cd53d7d939e71b5ce8dbae
2017-08-16 15:26:03 -07:00
Fan Zhang
83eaff5e4a
Suppress some search results
...
Fixes: 62137086
Test: reindex search
Test: robotests
Change-Id: I12e873edade80e4c0007d10352fb037b3230c643
2017-08-16 22:25:29 +00:00
Suprabh Shukla
43f17fb2b3
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 am: a5e4dd2b5e -s ours
...
am: e66117f59a
2017-08-16 22:21:36 +00:00
Suprabh Shukla
db403a78a9
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 am: 7b59fe50a7 -s ours
...
am: fdaa7b8c99
2017-08-16 22:20:45 +00:00
Antony Sargent
563c4a6557
Fix rotation bug in Bluetooth pairing PIN dialog
...
BluetoothPairingDialogFragment has code that makes the OK button on the
dialog disabled until the user has entered at least one character into
the PIN field. However it didn't properly handle the case where the user
had entered some text and then rotated the screen - because it always
marked the OK button as disabled during onShow even if it already had
some content. This CL fixes that by looking at the text content and only
disabling the OK button if the content is empty.
Bug: 36514895
Test: make RunSettingsRoboTests
Change-Id: I4e8e70089a862e67b20ff614bbaa64fc2b641fd4
2017-08-16 15:19:47 -07:00
Suprabh Shukla
6798ed13b6
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 am: 832dde9768 -s ours
...
am: 2f0f816959
2017-08-16 22:19:28 +00:00
Suprabh Shukla
95a2e523fd
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 am: 7d1286299e -s ours
...
am: 1200158d1c
2017-08-16 22:18:30 +00:00
Suprabh Shukla
8d0adef1e3
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 am: 1b3f6d0e47 -s ours
...
am: 115fa8b9ed
2017-08-16 22:17:21 +00:00
Suprabh Shukla
000f279ede
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 am: 3691da8b51 -s ours
...
am: ae9cc97c95
2017-08-16 22:16:41 +00:00
Suprabh Shukla
53aa59f653
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: d430178ba4 -s ours am: e237bdb4e2 -s ours
...
am: ba5593db99
2017-08-16 22:15:57 +00:00
Suprabh Shukla
4c7d7f02ae
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: c62f6f30bc -s ours am: c180be3468 -s ours
...
am: 3446f3c393
2017-08-16 22:15:07 +00:00
Suprabh Shukla
c82141aa94
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: 5575d285db -s ours am: 8024f41ec1 -s ours
...
am: 6337780f60
2017-08-16 22:13:52 +00:00
Suprabh Shukla
4e1f44a386
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 am: 910f4fb003 -s ours
...
am: 2b5568ceee
2017-08-16 22:12:55 +00:00
Fan Zhang
875b8eae39
Remove gibberish summary in search when query is "lock"
...
Fixes: 64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e
2017-08-16 22:12:44 +00:00
Suprabh Shukla
c03d9f2054
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 am: db8682996d -s ours
...
am: db19657051
2017-08-16 22:12:17 +00:00
Suprabh Shukla
7e48ccbcee
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 am: d0275e53eb -s ours
...
am: 39f553782c
2017-08-16 22:11:33 +00:00
Nick Desaulniers
0bdb567473
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours am: f25a418e24 am: e625c2f64e am: 4cdaebd0c4
...
am: 9729edbb8a
2017-08-16 22:10:50 +00:00
Maurice Lam
6c108ca693
Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
...
am: 4db65eab00
2017-08-16 22:10:01 +00:00
Suprabh Shukla
e66117f59a
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
...
am: a5e4dd2b5e
2017-08-16 21:44:04 +00:00
Suprabh Shukla
fdaa7b8c99
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
...
am: 7b59fe50a7
2017-08-16 21:43:05 +00:00
jackqdyulei
ae4b79ee6d
Update strings when shortString is true
...
After b/64124535, battery strings in settings page use shortString
version. This cl updates the charging string in this situation to
match the mock.
Note that no matter whether we use shorString, the chargingLabel
should remain the same.
Bug: 64752046
Test: RunSettingsRoboTests
Change-Id: I4395d4660e212688cd560ca0b124acbd9c099cc9
2017-08-16 14:42:35 -07:00
Suprabh Shukla
2f0f816959
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
...
am: 832dde9768
2017-08-16 21:42:10 +00:00
Suprabh Shukla
1200158d1c
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
...
am: 7d1286299e
2017-08-16 21:38:28 +00:00
Suprabh Shukla
115fa8b9ed
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
...
am: 1b3f6d0e47
2017-08-16 21:37:34 +00:00
Suprabh Shukla
ae9cc97c95
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
...
am: 3691da8b51
2017-08-16 21:36:57 +00:00
Suprabh Shukla
ba5593db99
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: d430178ba4 -s ours
...
am: e237bdb4e2
2017-08-16 21:36:04 +00:00
