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
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
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
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
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
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
Geoff Mendal
e5e08d93b1
am df7699e1
: (-s ours) am d109ed11
: (-s ours) am 9f0d3721
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'df7699e1867c0205a6eaa3f7486a2b3d2e84fcd1':
Import translations. DO NOT MERGE
2014-10-16 18:05:22 +00:00
Geoff Mendal
5c9c259a6c
am 1b2ef02c
: (-s ours) am a3d19546
: (-s ours) am 0172dfef
: (-s ours) am 4909c412
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1b2ef02ce0a00c31cbb8bfa97f24c252e834da16':
Import translations. DO NOT MERGE
2014-10-16 18:05:21 +00:00
Geoff Mendal
df7699e186
am d109ed11
: (-s ours) am 9f0d3721
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'd109ed1181edc60f98ad5a46eb535d5e529aa177':
Import translations. DO NOT MERGE
2014-10-16 17:56:40 +00:00
Geoff Mendal
1b2ef02ce0
am a3d19546
: (-s ours) am 0172dfef
: (-s ours) am 4909c412
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'a3d19546b7792539a7cc8f104c0873d1a9c83717':
Import translations. DO NOT MERGE
2014-10-16 17:56:39 +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
20ef7a70c4
am 78c00239
: (-s ours) am 628d83e7
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '78c00239df6d858c19a8243ad41ba96967e2fddc':
Import translations. DO NOT MERGE
2014-10-16 00:57:10 +00:00
Geoff Mendal
9f0d372154
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-16 00:55:46 +00:00
Geoff Mendal
2d45e6c738
am 24f29313
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '24f293138de5e38cb05389db3c6671e02812e9e0':
Import translations. DO NOT MERGE
2014-10-16 00:53:20 +00:00
Geoff Mendal
78c00239df
am 628d83e7
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '628d83e736f2f9e606327f3debe2930bb24a83e9':
Import translations. DO NOT MERGE
2014-10-16 00:52:31 +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
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
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
f38b63c913
am f3e5611c
: am 1d050220
: am 3ef52587
: resolved conflicts for merge of 46c7f6d6
to lmp-sprout-dev
...
* commit 'f3e5611c54a686438a94365924b8a9ff76cbb793':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:17:23 +00:00
Jim Miller
f3e5611c54
am 1d050220
: am 3ef52587
: resolved conflicts for merge of 46c7f6d6
to lmp-sprout-dev
...
* commit '1d050220a0564b02bc1f4c33c5984a684a47bfa5':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:13:41 +00: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
Fabrice Di Meglio
3c56d456ea
am 14d4f3de
: am 5e916480
: am 6b68b000
: am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '14d4f3defc0a361931decc7743fe9fe2b445b4e7':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 02:31:34 +00:00
Fabrice Di Meglio
b84d366f6b
am 156d30db
: am 40103896
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '156d30db7cc8b5c925117c097f9f0ba6c897d753':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-15 02:30:27 +00:00
Jason Monk
d913ef17e0
am 0f45f64e
: am f3a1fae4
: am 9e6c6b9f
: am eaf84472
: Merge "Update screen pinning strings to say Overview" into lmp-dev
...
* commit '0f45f64efd21a08df8a8797e11187acec1aca591':
Update screen pinning strings to say Overview
2014-10-15 02:08:46 +00:00
Andres Morales
b6f8177251
am 0d4a8ce2
: am d3948a2e
: am 1686335a
: am 26bc6907
: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
...
* commit '0d4a8ce26e40de04f90614c0a44124d9ef156026':
Set layout_width in WiFi+NFC resource
2014-10-15 02:08:45 +00: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
14d4f3defc
am 5e916480
: am 6b68b000
: am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '5e91648077f8f0765aa8628d0e99accfe2f87383':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 01:18:37 +00: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
156d30db7c
am 40103896
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '40103896b08fbd4b8d191fc2805ec8f482d22d17':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-15 00:01:37 +00:00