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
Fabrice Di Meglio
693046d578
am b3c1c095: am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev
...
* commit 'b3c1c0952800abdc9d37ebaa0c9bca18d345fc77':
Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
2014-10-17 21:06:04 +00:00
Amith Yamasani
2ae9f8aba6
am e52c159c: Fix some strings for the encryption stuff.
...
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
Fix some strings for the encryption stuff.
2014-10-17 21:02:51 +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
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
dd6c3cc2b4
am dd89d6d5: am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit 'dd89d6d570272612e21719321ea4042f09bc5427':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 20:58:14 +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
40fbd26a40
am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.
...
* commit 'ae2ee1dd0537cb92d3df4568bc0cd82ef4663ad0':
Add strings for upcoming change.
2014-10-17 20:28:56 +00:00
Svetoslav
8cfd94de1d
am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit 'dfa12ed48476968b919e20770493cfb89985be54':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 20:28:30 +00: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
9a7f7a34ae
am 4f903c3e: Add strings for upcoming change.
...
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
Add strings for upcoming change.
2014-10-17 19:32:09 +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
Svetoslav
c8a1bb5a4d
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:55:46 +00:00
Sami Tolvanen
b80fcc8289
am 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17
...
automerge: 0be4088
* commit '0be4088ed9253da04f56999e1560ab522d5d9400':
Remove excess whitespace from the factory reset screen
2014-10-17 01:38:05 +00:00
Sami Tolvanen
0be4088ed9
am 63af7fc7: Remove excess whitespace from the factory reset screen
...
automerge: c145d17
* commit 'c145d171c497222d3cda37ff0e8fdf38aef69608':
Remove excess whitespace from the factory reset screen
2014-10-17 01:19:35 +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
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
Fabrice Di Meglio
bfda99df5a
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10 automerge: e6a4a6b
...
automerge: 570bd52
* commit '570bd52f30cd455c9042361c6124ab0e00d91f6e':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings
2014-10-16 22:49:42 +00:00
Fabrice Di Meglio
570bd52f30
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10
...
automerge: e6a4a6b
* commit 'e6a4a6b6948725f74d1e3dc52be26d7c2cbbbb91':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings
2014-10-16 22:43:19 +00:00
Fabrice Di Meglio
e6a4a6b694
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
...
automerge: 4a43a10
* commit '4a43a107d7b70444d21aaf98fac7381e3adac7b5':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings
2014-10-16 22:33:25 +00:00
Sami Tolvanen
81df517bb8
Merge "Refactor the duplicate Switch IME button to an include"
2014-10-16 22:24:25 +00: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
e4e24ee798
am 8b5b47bf: am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '8b5b47bf4521164381476c0ca5a8dc40bbd8cf5a':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-16 21:54:38 +00:00
Fabrice Di Meglio
8b5b47bf45
am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit 'b5a582eba964c617057aac8daa0f46901c39b21c':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-16 21:49:51 +00:00
Fabrice Di Meglio
b5a582eba9
am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '667695eb117c8d1865b12145c5a348e8da5f70e1':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-16 21:45:10 +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
b3afaba549
Merge "Import translations. DO NOT MERGE"
2014-10-16 01:05:00 +00:00
Geoff Mendal
bfe382468c
Import translations. DO NOT MERGE
...
Change-Id: I1688e8e51ff69ce47c65145e12550f712fc9b58d
Auto-generated-cl: translation import
2014-10-15 18:03:52 -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
24f293138d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-16 00:47:49 +00:00
Geoff Mendal
628d83e736
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-16 00:47:22 +00:00
Geoff Mendal
6dafad81fa
Import translations. DO NOT MERGE
...
Change-Id: I33f829c2f72b274e24d7a41632d20eb65a5fa2c1
Auto-generated-cl: translation import
2014-10-15 17:43:59 -07: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
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