Przemyslaw Szczepaniak
9f153fedd9
Fix typo in TTS Language option description.
...
Bug: 18098410
Change-Id: Icf3736cc2f28c240d40d06b33d4f81012314cbb1
2014-10-30 11:53:26 +00:00
Geoff Mendal
a89b2721ef
Merge "Import translations. DO NOT MERGE"
2014-10-21 00:12:05 +00:00
Geoff Mendal
beb94136c9
Import translations. DO NOT MERGE
...
Change-Id: I79fe11cf58d0f4e4d7a4de65db5ef8de75742faa
Auto-generated-cl: translation import
2014-10-20 17:09:23 -07:00
Geoff Mendal
944d050766
am d2898e92
: (-s ours) am 46de83aa
: (-s ours) am cd617f6c
: (-s ours) am 6acdd044
: (-s ours) am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd2898e925b7bea1f98502fa25fd5dcd11d16822d':
Import translations. DO NOT MERGE
2014-10-21 00:04:18 +00:00
Geoff Mendal
274392c787
am ea4dbcda
: (-s ours) am 6e08ea26
: (-s ours) am 50d4d2d3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ea4dbcda93f086ad3a904b3f2cf3f1994241a5b5':
Import translations. DO NOT MERGE
2014-10-20 23:59:25 +00:00
Geoff Mendal
d2898e925b
am 46de83aa
: (-s ours) am cd617f6c
: (-s ours) am 6acdd044
: (-s ours) am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit '46de83aa1c9f34e76706ba4250c69f2933a5d3c0':
Import translations. DO NOT MERGE
2014-10-20 23:57:34 +00:00
Geoff Mendal
5d475bfdda
am 69b9ca29
: (-s ours) am c25c92cc
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '69b9ca2914925d288609b2aaed3311923711a32b':
Import translations. DO NOT MERGE
2014-10-20 23:55:00 +00:00
Geoff Mendal
ea4dbcda93
am 6e08ea26
: (-s ours) am 50d4d2d3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '6e08ea265b497a3c3d29a1e37ae5fc826879c901':
Import translations. DO NOT MERGE
2014-10-20 23:53:41 +00:00
Geoff Mendal
46de83aa1c
am cd617f6c
: (-s ours) am 6acdd044
: (-s ours) am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cd617f6cbef7e3449648b26bf37d44422b719937':
Import translations. DO NOT MERGE
2014-10-20 23:51:32 +00:00
Geoff Mendal
69b9ca2914
am c25c92cc
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'c25c92cccda2f8b1bb02c99f2cf596a703e6c2ce':
Import translations. DO NOT MERGE
2014-10-20 23:49:08 +00:00
Geoff Mendal
cd617f6cbe
am 6acdd044
: (-s ours) am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
Import translations. DO NOT MERGE
2014-10-20 23:47:51 +00:00
Geoff Mendal
6e08ea265b
am 50d4d2d3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '50d4d2d39a041fcb2ee0c56d9425650e2f8557bd':
Import translations. DO NOT MERGE
2014-10-20 23:47:40 +00:00
Geoff Mendal
c25c92cccd
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-20 23:45:44 +00:00
Geoff Mendal
ac9623c69a
Import translations. DO NOT MERGE
...
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
2014-10-20 16:44:24 -07:00
Geoff Mendal
50d4d2d39a
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-20 23:42:30 +00:00
Geoff Mendal
6acdd044d7
am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit '795c83780752d0301985d53e2e230c2088af825b':
Import translations. DO NOT MERGE
2014-10-20 23:41:26 +00:00
Geoff Mendal
0019c6af93
Import translations. DO NOT MERGE
...
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
2014-10-20 16:40:41 -07:00
Geoff Mendal
795c837807
Import translations. DO NOT MERGE
...
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
2014-10-20 16:33:09 -07:00
Sanket Padawe
5e5e55c9f0
am 8299d519
: am 4bcd973d
: am fbde7619
: am bdedbb85
: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
...
* commit '8299d519de97ca081ea8ab0cdd3256aae48c8f43':
Changing settings UI changes related to strings to be displayed
2014-10-20 21:09:07 +00:00
Sanket Padawe
8299d519de
am 4bcd973d
: am fbde7619
: am bdedbb85
: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
...
* commit '4bcd973db125d775b88d28e5a3c77ba739cf3d9d':
Changing settings UI changes related to strings to be displayed
2014-10-20 21:01:53 +00:00
Sanket Padawe
4bcd973db1
am fbde7619
: am bdedbb85
: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
...
* commit 'fbde761930f23efd4102c983b430c35a615b71d9':
Changing settings UI changes related to strings to be displayed
2014-10-20 20:56:27 +00:00
Sanket Padawe
fbde761930
am bdedbb85
: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
...
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
Changing settings UI changes related to strings to be displayed
2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516
Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597
Changing settings UI changes related to strings to be displayed
...
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
2014-10-20 12:33:50 -07:00
Baligh Uddin
36ae926a84
am 08c5e8e2
: (-s ours) am 5e9e0f0b
: (-s ours) am 1768f1aa
: (-s ours) am 96a0370a
: (-s ours) am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '08c5e8e29f3d03bf2e57ef0f63a33eaf2f06996b':
Import translations. DO NOT MERGE
2014-10-19 20:21:21 +00:00
Baligh Uddin
08c5e8e29f
am 5e9e0f0b
: (-s ours) am 1768f1aa
: (-s ours) am 96a0370a
: (-s ours) am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e9e0f0b74298d0992be36a371090f6879e0da92':
Import translations. DO NOT MERGE
2014-10-19 20:16:23 +00:00
Baligh Uddin
5e9e0f0b74
am 1768f1aa
: (-s ours) am 96a0370a
: (-s ours) am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1768f1aa6398ef2261f85df3b5581568844f39bc':
Import translations. DO NOT MERGE
2014-10-19 20:09:04 +00:00
Baligh Uddin
1768f1aa63
am 96a0370a
: (-s ours) am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942':
Import translations. DO NOT MERGE
2014-10-19 20:02:59 +00:00
Baligh Uddin
96a0370a2b
am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '25149b389501afc817f1248d704def0b4c5b5c04':
Import translations. DO NOT MERGE
2014-10-19 19:57:23 +00:00
Baligh Uddin
25149b3895
Import translations. DO NOT MERGE
...
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
2014-10-19 10:10:53 -07:00
Jim Miller
225fc3a83d
am 3d3c8703
: am 456b866c
: am aa037675
: Fix bad string in EncryptionInterstitial automerge: c8b2003
...
automerge: 8baf923
* commit '8baf92359b0661b067de85e73d275f0421fc768a':
Fix bad string in EncryptionInterstitial
2014-10-18 03:32:10 +00:00
Jim Miller
880e49da16
am 138d7b62
: am bc0e5e26
: am 47adff0a
: Show warning dialog when Accessibility is enabled automerge: 06810c4
...
automerge: 34927f8
* commit '34927f8a1e58e3b77ef7d6f7af52f62ab8aadc5d':
Show warning dialog when Accessibility is enabled
2014-10-18 03:32:04 +00:00
Jim Miller
8baf92359b
am 3d3c8703
: am 456b866c
: am aa037675
: Fix bad string in EncryptionInterstitial
...
automerge: c8b2003
* commit 'c8b20033de1af626d68ca049077e327e839fbb5b':
Fix bad string in EncryptionInterstitial
2014-10-18 03:06:26 +00:00
Jim Miller
34927f8a1e
am 138d7b62
: am bc0e5e26
: am 47adff0a
: Show warning dialog when Accessibility is enabled
...
automerge: 06810c4
* commit '06810c482834a27975da050db32f3d2c27fbe793':
Show warning dialog when Accessibility is enabled
2014-10-18 03:06:19 +00:00
Jim Miller
c8b20033de
am 3d3c8703
: am 456b866c
: am aa037675
: Fix bad string in EncryptionInterstitial
...
* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
Fix bad string in EncryptionInterstitial
2014-10-18 02:35:43 +00:00
Jim Miller
3d3c870374
am 456b866c
: am aa037675
: Fix bad string in EncryptionInterstitial
...
* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
Fix bad string in EncryptionInterstitial
2014-10-18 02:20:59 +00:00
Jim Miller
456b866c09
am aa037675
: Fix bad string in EncryptionInterstitial
...
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
Fix bad string in EncryptionInterstitial
2014-10-18 02:09:26 +00:00
Jim Miller
06810c4828
am 138d7b62
: am bc0e5e26
: am 47adff0a
: Show warning dialog when Accessibility is enabled
...
* commit '138d7b6273bdf2f9eb6eb2a55eeae3d6d5c93cf6':
Show warning dialog when Accessibility is enabled
2014-10-18 01:45:40 +00:00
Jim Miller
138d7b6273
am bc0e5e26
: am 47adff0a
: Show warning dialog when Accessibility is enabled
...
* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
Show warning dialog when Accessibility is enabled
2014-10-18 01:31:03 +00:00
Jim Miller
aa03767598
Fix bad string in EncryptionInterstitial
...
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.
Fixes bug 17881324
Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
2014-10-17 18:28:52 -07:00
Jim Miller
bc0e5e2684
am 47adff0a
: Show warning dialog when Accessibility is enabled
...
* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
Show warning dialog when Accessibility is enabled
2014-10-18 01:20:53 +00:00
Jim Miller
47adff0a8b
Show warning dialog when Accessibility is enabled
...
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".
Fixes bug 17881324
Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
2014-10-17 17:43:18 -07:00
Jim Miller
209e020850
am 4d14cb67
: am 05656a36
: am 3221a342
: am ba1b3340
: am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '4d14cb67ad17a16c7ce9845feb361e51d1096015':
Several fixes to new EncryptionInterstitial dialog.
2014-10-18 00:12:14 +00:00
Jim Miller
4d14cb67ad
am 05656a36
: am 3221a342
: am ba1b3340
: am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '05656a369d2fc22bd5abff16a49556a57a5abc3f':
Several fixes to new EncryptionInterstitial dialog.
2014-10-18 00:07:36 +00:00
Jim Miller
05656a369d
am 3221a342
: am ba1b3340
: am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '3221a342117bc3fd366e3f6520db0cb0672bb1f1':
Several fixes to new EncryptionInterstitial dialog.
2014-10-18 00:03:07 +00:00
Jim Miller
3221a34211
am ba1b3340
: am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:57:34 +00:00
Jim Miller
ba1b33407d
am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:52:42 +00:00
Jim Miller
602d559d9c
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
2014-10-17 23:48:35 +00:00
Svetoslav
d9cac4f76f
am 6dc6567f
: am 1a45ee8d
: am 1f39d6a6
: am edbada7a
: am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit '6dc6567fef3a9c1108e105638caf36b224bd903c':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:29:36 +00:00
Svetoslav
6dc6567fef
am 1a45ee8d
: am 1f39d6a6
: am edbada7a
: am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit '1a45ee8d78e53d1ddb0ca6e4723699b811961736':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:24:09 +00:00