Svetoslav
edbada7acd
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:08:40 +00:00
Svetoslav
ba202e9fb2
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
2014-10-17 22:59:43 +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
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
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
John Spurlock
27334dbe75
Settings: Fix hotspot switch state issue.
...
Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
2014-10-17 11:55:26 -04: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
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
Alexandra Gherghina
06cd50177a
Reset spinner selection
...
This makes sure that when you go back to the spinner screen, the
selection is the one corresponding to the current profile.
Bug: 17378446
Change-Id: I536cc2701f9481986a63df1b01a38151edf2fa83
2014-10-16 23:05:49 +01: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
Geoff Mendal
d109ed1181
am 9f0d3721
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '9f0d372154fc328315dad2f7df2290345bebcf39':
Import translations. DO NOT MERGE
2014-10-16 17:45:41 +00:00
Geoff Mendal
a3d19546b7
am 0172dfef
: (-s ours) am 4909c412
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '0172dfef41dbd728b603d470bc4650290a2276b4':
Import translations. DO NOT MERGE
2014-10-16 17:45:39 +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
0172dfef41
am 4909c412
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db':
Import translations. DO NOT MERGE
2014-10-16 00:45:42 +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
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
Fabrice Di Meglio
5e91648077
am 6b68b000
: am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '6b68b000da5db8df9228ae9f589dfb1f2b38759b':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 00:53:43 +00:00
Fabrice Di Meglio
6b68b000da
am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 00:44:23 +00:00
Fabrice Di Meglio
94dce76185
Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
2014-10-15 00:39:58 +00:00
Fabrice Di Meglio
40103896b0
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-14 23:54:09 +00:00
Fabrice Di Meglio
886387373e
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, use a Switch instead of a CheckBox for Developer Settings
Change-Id: I6a9b3fef879299a8ac5b57ff9c794b58022b79d9
2014-10-14 16:43:37 -07:00
Fabrice Di Meglio
3e825febca
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
...
- prevent IllegalStateException
Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee
2014-10-14 16:21:22 -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
Jason Monk
eaf84472ea
Merge "Update screen pinning strings to say Overview" into lmp-dev
2014-10-14 22:42:49 +00:00
Andres Morales
d3948a2eda
am 1686335a
: am 26bc6907
: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
...
* commit '1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3':
Set layout_width in WiFi+NFC resource
2014-10-14 22:26:15 +00:00
Andres Morales
1686335a77
am 26bc6907
: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
...
* commit '26bc6907b93a21adcdf8ffdc24d7d96482be8165':
Set layout_width in WiFi+NFC resource
2014-10-14 22:20:34 +00:00