Geoff Mendal
8e2fb4c9c4
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-22 23:22:02 +00:00
Geoff Mendal
d5032606cc
Import translations. DO NOT MERGE
...
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
2014-10-22 16:20:52 -07: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
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
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
b9d05d6c63
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
2014-10-21 22:20:07 +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
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
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
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
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
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
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
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
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
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
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
Fabrice Di Meglio
1bc996532c
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Account Sync feeds CheckBoxes to Switches
Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
2014-10-16 17:16:26 -07:00
Sami Tolvanen
63af7fc70e
Remove excess whitespace from the factory reset screen
...
The bullet pointed list in the factory reset screen consists
of two separate strings, which lead to excess whitespace
between the two segments of the list. Remove padding from the
text views to remove the whitespace.
Bug: 17997459
Change-Id: I60eb6f0f2924323d7eb806ff2b1180ebc7189adb
2014-10-16 15:19:17 -07:00
Fabrice Di Meglio
4a43a107d7
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
2014-10-16 22:08:17 +00:00
Fabrice Di Meglio
c94382e84e
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings
...
- add indexing for UsbSettings
- change constant name from RANK_MEMORY to RANK_STORAGE
- fix old issue with the PreferenceScreen title (as Location instead of USB computer connection)
Change-Id: I1395ec3d6a795edf73a8703545540456a477cc21
2014-10-16 14:42:10 -07:00
Fabrice Di Meglio
667695eb11
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-16 21:40:03 +00:00
Fabrice Di Meglio
daef2e2b06
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert more CheckBoxes to Switches
Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
2014-10-15 19:00:35 -07:00
Geoff Mendal
9f0d372154
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-16 00:55:46 +00:00
Geoff Mendal
3ef104e5e0
Import translations. DO NOT MERGE
...
Change-Id: Ifd58c7a54faef6216bf534dac6d5fe99340d0083
Auto-generated-cl: translation import
2014-10-15 17:47:51 -07:00
Geoff Mendal
628d83e736
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-16 00:47:22 +00:00
Geoff Mendal
c85ca8ad20
Import translations. DO NOT MERGE
...
Change-Id: I3c5e1e028e7fd42ae636df3aa8876ac178602187
Auto-generated-cl: translation import
2014-10-15 17:40:19 -07:00
Geoff Mendal
4909c412fa
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-16 00:38:03 +00:00
Geoff Mendal
c0a4136bbd
Import translations. DO NOT MERGE
...
Change-Id: I6ddb57a8bea2ad4ad1b6272e1f88f219e9cd8db0
Auto-generated-cl: translation import
2014-10-15 17:31:39 -07: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