Sanket Padawe
eee65f0417
am 286e3c46
: am 266e4296
: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit '286e3c4651fa0af76e092ea52349d5ae2235825d':
Commit with dialog box but using subinfo records
2014-10-22 21:08:13 +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
5c1f41558f
am 2ae90864
: Settings: Remove obsolete string: heads_up_enabled_title.
...
* commit '2ae908649c5eb4708af1c29cefbf97cfab2cc341':
Settings: Remove obsolete string: heads_up_enabled_title.
2014-10-22 16:42:54 +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
Alan Viverette
6a4d22389a
am 2625d8ed
: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
...
* commit '2625d8ed8914ccdfd47983f63df800d991ca3f0c':
Adjust caption preset picker items dimens for Material
2014-10-22 02:08:12 +00:00
Alan Viverette
2625d8ed89
Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
2014-10-22 01:25:24 +00:00
Alan Viverette
285fb04711
Adjust caption preset picker items dimens for Material
...
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
2014-10-21 16:51:54 -07:00
Alexandra Gherghina
3748b940a3
am b9d05d6c
: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
...
* commit 'b9d05d6c63c7bdd866b2cfb3e5b549c352d1493f':
Fix user spinner anchor following system ui changes
2014-10-21 22:29:39 +00: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
Alexandra Gherghina
7574ee6a25
am aadc070a
: Move up spinner in apps screen
...
* commit 'aadc070a35ca47940e9fa964ba68c5ce817202ef':
Move up spinner in apps screen
2014-10-21 22:14:30 +00:00
Sanket Padawe
266e429657
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26
Commit with dialog box but using subinfo records
...
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
2014-10-21 14:16:12 -07:00
Alexandra Gherghina
aadc070a35
Move up spinner in apps screen
...
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
2014-10-21 18:39:07 +01:00
John Spurlock
e926cd5cc4
am 196aaceb
: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev
...
* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
Settings: Display 'Calls' category on non-voice devices.
2014-10-21 16:19:46 +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
Geoff Mendal
eda5136ba2
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-20 23:57:55 +00:00
Geoff Mendal
d335d4f395
Import translations. DO NOT MERGE
...
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
2014-10-20 16:52:16 -07: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
0019c6af93
Import translations. DO NOT MERGE
...
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
2014-10-20 16:40:41 -07: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
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
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
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
Fabrice Di Meglio
6e7216ab78
am 140b46e4
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '140b46e43ca70e2ef13d8a3840cde20b16adba45':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:36:55 +00:00
Fabrice Di Meglio
140b46e43c
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 21:32:34 +00:00
Amith Yamasani
8a9a55acae
am 8536d6cf
: am 06a314d6
: am e52c159c
: Fix some strings for the encryption stuff.
...
* commit '8536d6cfe9952415a2186011b6cebfb7d2c0ee91':
Fix some strings for the encryption stuff.
2014-10-17 21:13:23 +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
Fabrice Di Meglio
44db45ac11
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Trusted Credentials CheckBoxes to Switches
Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
2014-10-17 14:06:22 -07: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
Fabrice Di Meglio
b3c1c09528
am 5c467bc6
: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev
...
* commit '5c467bc615e1a7553d05c361cd7fd7ac8cc4c0cb':
Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
2014-10-17 21:00:51 +00:00
Fabrice Di Meglio
dd89d6d570
am 27c0b548
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '27c0b548ab701aefef7655e78401a52c33c6270c':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 20:53:16 +00:00
Fabrice Di Meglio
5c467bc615
Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev
2014-10-17 20:52:56 +00:00
Fabrice Di Meglio
27c0b548ab
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 20:46:32 +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
ae2ee1dd05
am 0303bb20
: am c7ccba68
: am 4f903c3e
: Add strings for upcoming change.
...
* commit '0303bb203059e75c729804405d481bd3333c4098':
Add strings for upcoming change.
2014-10-17 20:02:22 +00: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
dfa12ed484
am b363c26e
: am 431e2460
: am 3ea423ae
: User to confirm credentials if an accessibility service changes encryption.
...
* commit 'b363c26e2f3255ad891d0fd466c9bbd2794a734d':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 19:07:37 +00: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
Fabrice Di Meglio
440e245a67
Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
...
- update to correct class name (was changed in a former CL and introduced
this regression)
Change-Id: Ia945a5be2d8c7d19c1daf400a9d2d2a6589de137
2014-10-17 11:29:06 -07: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
Sami Tolvanen
c145d171c4
am 63af7fc7
: Remove excess whitespace from the factory reset screen
...
* commit '63af7fc70e1242398dbebce5443072f0bc33e864':
Remove excess whitespace from the factory reset screen
2014-10-17 00:48:17 +00:00