Roozbeh Pournader
a7f6bb54c8
Use fallback linespacing in ChartSweepView and ChartGridView
...
Bug: 28963299
Test: none
Change-Id: I249a3795fcbfbef14eac11b72220bb92f9690de6
2017-08-22 17:19:16 -07:00
Charles He
897f396b16
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev am: 1d6cec8ca2
...
am: 59bc90954b
2017-08-21 16:17:52 +00:00
Charles He
59bc90954b
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
...
am: 1d6cec8ca2
2017-08-21 16:12:50 +00:00
Charles He
1d6cec8ca2
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
2017-08-21 16:04:38 +00:00
TreeHugger Robot
535a545c0d
Merge "Temporarily turn off Settings CodeInspection test"
2017-08-18 22:46:31 +00:00
Antony Sargent
e9ef169eee
Temporarily turn off Settings CodeInspection test
...
Something is causing our ClassScanner to find 0 classes in the
com.android.settings class, which causes the CodeInspection test to
fail. This CL temporarily disables these tests to get the tree green
while we further investigate the root cause of the problem.
Bug: 64840107
Test: make RunSettingsRoboTests should succeed
Change-Id: I65485b41b161c2d54227ab179675bf9e3a23bab9
2017-08-18 13:58:41 -07:00
Phil Weaver
2749133882
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev am: 6c9a1262be
...
am: 9e75a52c45
2017-08-18 20:56:18 +00:00
Phil Weaver
9e75a52c45
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
...
am: 6c9a1262be
2017-08-18 20:41:57 +00:00
Phil Weaver
6c9a1262be
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
2017-08-18 20:20:47 +00:00
Charles He
caf9510923
Clear "Wrong pattern" prompt automatically.
...
When the user enters a wrong pattern/pin/password, a "Wrong
pattern/pin/password" text shows up on ConfirmLockPattern or
ConfirmLockPassword screen. In ConfirmLockPassword, it disappears
automatically after 3 seconds, whereas it doesn't in ConfirmLockPattern.
In this change, we make the prompt in ConfirmLockPattern disappear
automatically as well.
Bug: 64781905
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53a25576413671ced4197064d51fbcc397733265
2017-08-18 17:35:27 +01:00
Beverly
f1e4e4fdd3
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
...
am: 7ba9e9f849
2017-08-18 14:19:20 +00:00
Beverly
7ba9e9f849
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
...
am: 268c6c6ca6
2017-08-18 14:13:20 +00:00
TreeHugger Robot
268c6c6ca6
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
2017-08-18 14:08:24 +00:00
Bill Yi
e576f0393e
Import translations. DO NOT MERGE am: 4ced4787ce -s ours am: 5b9b88cc5b -s ours am: 95a797f5fc -s ours
...
am: 2d9251f32f
2017-08-18 02:41:25 +00:00
Bill Yi
2d9251f32f
Import translations. DO NOT MERGE am: 4ced4787ce -s ours am: 5b9b88cc5b -s ours
...
am: 95a797f5fc
2017-08-18 01:55:29 +00:00
Bill Yi
95a797f5fc
Import translations. DO NOT MERGE am: 4ced4787ce -s ours
...
am: 5b9b88cc5b
2017-08-18 01:50:29 +00:00
Bill Yi
5b9b88cc5b
Import translations. DO NOT MERGE
...
am: 4ced4787ce
2017-08-18 01:45:26 +00:00
Bill Yi
4ced4787ce
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
2017-08-17 16:57:35 -07:00
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
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
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
