Selim Gurun
4920f0fcfd
Merge "Enable DRP only through command line."
2014-10-24 16:33:50 +00:00
Selim Gurun
65723ffe12
Enable DRP only through command line.
...
Enable DRP only through command line so remove it from dev settings.
This reverts commit 7818de107a
2014-10-24 14:48:30 +00:00
Sanket Padawe
480ce321ea
am f7fad6b6: am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit 'f7fad6b6db1476f1972fc7399bead8937057906a':
Commit with dialog box but using subinfo records
2014-10-22 22:40:47 +00:00
Sanket Padawe
286e3c4651
am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit '266e429657774dc7aa14029629a9e78c942c6104':
Commit with dialog box but using subinfo records
2014-10-22 20:45:40 +00:00
John Spurlock
047bbf31e9
am 968a2947: am 5c1f4155: am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
...
* commit '968a294720b07c75dde10f371f02808bb5162904':
Settings: Remove obsolete string: heads_up_enabled_title.
2014-10-22 18:20:33 +00:00
John Spurlock
2ae908649c
Settings: Remove obsolete string: heads_up_enabled_title.
...
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.
Bug: 14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
2014-10-22 11:36:58 -04:00
Alexandra Gherghina
a160b96005
am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev automerge: 3748b94
...
automerge: 3ac497d
2014-10-22 00:59:20 +00:00
Selim Gurun
146ab4684a
Merge "Revert "Remove WebView DRP Setting from Developer Settings""
2014-10-22 00:07:27 +00:00
Selim Gurun
7818de107a
Revert "Remove WebView DRP Setting from Developer Settings"
...
This reverts commit 90886b8284
2014-10-21 16:56:46 -07:00
Alexandra Gherghina
b9d05d6c63
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
2014-10-21 22:20:07 +00:00
Sanket Padawe
a501137f26
Commit with dialog box but using subinfo records
...
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
2014-10-21 14:16:12 -07:00
John Spurlock
e519a16545
am 12680faf: am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev
...
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
Settings: Display 'Calls' category on non-voice devices.
2014-10-21 16:37:48 +00:00
John Spurlock
196aacebf9
Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev
2014-10-21 16:11:12 +00: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
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
John Spurlock
9a940cbf04
Settings: Display 'Calls' category on non-voice devices.
...
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.
Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
2014-10-20 14:22:38 -04:00
Jim Miller
225fc3a83d
am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003
...
automerge: 8baf923
2014-10-18 03:32:10 +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
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
Amith Yamasani
4c9adf36f8
am d8bdc10c: am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
...
* commit 'd8bdc10c721fdd6a4568d285ea6b506c6ea3a6a0':
Fix some strings for the encryption stuff.
2014-10-17 21:28:52 +00:00
Jim Miller
84bef7fc46
am 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.
...
* commit '40fbd26a40a85a7f820ef58d4cc3c3d648e23ae6':
Add strings for upcoming change.
2014-10-17 21:28:42 +00:00
Svetoslav
e90cde72ca
am 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '8cfd94de1dcbe707f3747cc9515e4c3562f6b092':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 21:28:41 +00:00
Amith Yamasani
8536d6cfe9
am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
...
* commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb':
Fix some strings for the encryption stuff.
2014-10-17 21:08:11 +00:00
Amith Yamasani
06a314d65a
am e52c159c: Fix some strings for the encryption stuff.
...
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
Fix some strings for the encryption stuff.
2014-10-17 21:02:34 +00:00
Amith Yamasani
e52c159cd9
Fix some strings for the encryption stuff.
...
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
2014-10-17 13:42:14 -07:00
Jim Miller
0303bb2030
am c7ccba68: am 4f903c3e: Add strings for upcoming change.
...
* commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a':
Add strings for upcoming change.
2014-10-17 19:56:45 +00:00
Jim Miller
c7ccba6859
am 4f903c3e: Add strings for upcoming change.
...
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
Add strings for upcoming change.
2014-10-17 19:52:03 +00:00
Jim Miller
4f903c3e65
Add strings for upcoming change.
...
Fixes bug 17881324
Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
2014-10-17 12:18:42 -07:00
Svetoslav
b363c26e2f
am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 18:53:32 +00:00
Svetoslav
431e246032
am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 16:56:40 +00:00
Svetoslav
3ea423ae0f
User to confirm credentials if an accessibility service changes encryption.
...
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
2014-10-16 17:35:07 -07:00
Jim Miller
69cb6a9001
am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
...
* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:23:51 +00:00
Jim Miller
1d050220a0
am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
...
* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:02:09 +00:00
Jim Miller
3ef52587da
resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
...
Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
2014-10-15 13:54:37 -07:00
Jason Monk
0bc1f91d5e
am d913ef17: am 0f45f64e: am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
...
* commit 'd913ef17e0ddb3a51d577ea74a2e148b12ed34b9':
Update screen pinning strings to say Overview
2014-10-15 03:06:05 +00:00
Jim Miller
46c7f6d6f3
Add a checkbox option to 'require password to decrypt'
...
Fixes bug 17881324
Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
2014-10-14 18:40:30 -07:00
Jason Monk
f3a1fae4b6
am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
...
* commit '9e6c6b9fb550390f9488c923827bbf5599dec3c2':
Update screen pinning strings to say Overview
2014-10-14 22:51:50 +00:00
Jason Monk
9e6c6b9fb5
am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
...
* commit 'eaf84472ea10e0ec34b22faad0438700a86787b9':
Update screen pinning strings to say Overview
2014-10-14 22:47:23 +00:00
Alexandra Gherghina
acd21060f3
Fix user spinner anchor following system ui changes
...
Bug: 17637769
Change-Id: I31d7f2358803ee5a769e48d5c069969ce81a253c
2014-10-14 18:04:24 +00:00
Jason Monk
89be2d8ba4
Update screen pinning strings to say Overview
...
Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
2014-10-14 09:29:25 -04:00
Alan Viverette
e7d8b55f4c
am 81db2fe7: am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
...
* commit '81db2fe78a02c3f01afde9e05f5594c3f2ebb80b':
Add option for serif monospace captioning font
2014-10-11 05:02:46 +00:00
Alan Viverette
4ed4249ccd
am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
...
* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
Add option for serif monospace captioning font
2014-10-11 02:49:47 +00:00
Alan Viverette
87b151c650
am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
...
* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
Add option for serif monospace captioning font
2014-10-11 00:23:54 +00:00
Alan Viverette
48dd1bca69
Add option for serif monospace captioning font
...
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
2014-10-10 12:24:45 -07:00
Sanket Padawe
ea2e53ead5
am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
...
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
Removing display number format from SIM UI
2014-10-10 05:15:52 +00:00
Sanket Padawe
04b8b4c1a4
am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
2014-10-09 13:03:33 +00:00
Sanket Padawe
770bdd771e
Removing display number format from SIM UI
...
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
2014-10-08 16:05:36 -07:00
