Svetoslav
fec94660fb
am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:04:14 +00:00
Svetoslav
ba202e9fb2
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
2014-10-17 22:59:43 +00:00
Fabrice Di Meglio
01f144f70a
am 065c5906
: am 6e7216ab
: am 140b46e4
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '065c5906bdbe19e775d2aca1df8dc82567390db3':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:46:49 +00:00
Fabrice Di Meglio
065c5906bd
am 6e7216ab
: am 140b46e4
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '6e7216ab78c1210747b49f68bd31a130d2565078':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:42:00 +00:00
Svetoslav
40ca78f6f3
Accessibility no longer overrides strong encryption (Settings).
...
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:17881324
Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
2014-10-17 14:41:58 -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
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
Fabrice Di Meglio
213a790bf7
am 693046d5
: am b3c1c095
: am 5c467bc6
: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev
...
* commit '693046d578b8719287a459c03aecf7950d5ef6dd':
Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
2014-10-17 21:28:51 +00:00
Fabrice Di Meglio
71b2c07877
am dd6c3cc2
: 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 'dd6c3cc2b453ae6b642d08340daf68a02c55ee87':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:28:50 +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
d8bdc10c72
am 8a9a55ac
: am 8536d6cf
: am 06a314d6
: am e52c159c
: Fix some strings for the encryption stuff.
...
* commit '8a9a55acae4d74b593bb48777203270d60740932':
Fix some strings for the encryption stuff.
2014-10-17 21:17:20 +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
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
Alan Viverette
26e40d29d0
am 03b976ac
: am 2106c79b
: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev automerge: 026c1ac
...
* commit '03b976ac7bfc1eafb6c5fc11ebd19fabb90d8368':
Prevent NPE when no accessibility services are enabled
2014-10-17 18:16:54 +00:00
Alan Viverette
03b976ac7b
am 2106c79b
: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
...
automerge: 026c1ac
* commit '026c1ac3e7a9f8d465a546c161eac464512cbc62':
Prevent NPE when no accessibility services are enabled
2014-10-17 18:12:11 +00:00
Alan Viverette
026c1ac3e7
am 2106c79b
: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
...
* commit '2106c79bc28324aa2bb3658b19c58551ddc1cc14':
Prevent NPE when no accessibility services are enabled
2014-10-17 18:07:21 +00:00
Alan Viverette
2106c79bc2
Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
2014-10-17 18:03:35 +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
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
John Spurlock
d00c39c5c0
am 27b64086
: am 8d6d8f02
: am 27334dbe
: Settings: Fix hotspot switch state issue.
...
* commit '27b64086fdf6a219c3f66f6c57ad3e4bb3dcc575':
Settings: Fix hotspot switch state issue.
2014-10-17 16:46:33 +00:00
John Spurlock
27b64086fd
am 8d6d8f02
: am 27334dbe
: Settings: Fix hotspot switch state issue.
...
* commit '8d6d8f02fa94ec32d43d7532df2a5d000c0e3edc':
Settings: Fix hotspot switch state issue.
2014-10-17 16:41:17 +00:00
John Spurlock
8d6d8f02fa
am 27334dbe
: Settings: Fix hotspot switch state issue.
...
* commit '27334dbe75c131103606e455eb75c55804fe93de':
Settings: Fix hotspot switch state issue.
2014-10-17 16:36:18 +00:00
John Spurlock
27334dbe75
Settings: Fix hotspot switch state issue.
...
Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
2014-10-17 11:55:26 -04: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
Alan Viverette
ea2810ad0f
Prevent NPE when no accessibility services are enabled
...
BUG: 18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
2014-10-16 18:27:18 -07: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