PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,154 Commits 1 Branch 0 Tags
65ea49a2fb8363dd57ac2d881a4c34af70e07c7c
Commit Graph

17154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d33f7d6a62 am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db':
  Import translations. DO NOT MERGE
 2014-10-16 00:42:05 +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
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
Jim Miller
9afd56e08d am 46c7f6d6: Add a checkbox option to \'require password to decrypt\' 
* commit '46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:04 +00: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
84ff990134 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:43:56 +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
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
0f45f64efd am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit 'f3a1fae4b69e45949b17205b5f8526e7bf117e07':
  Update screen pinning strings to say Overview
 2014-10-14 23:12:23 +00:00
Andres Morales
0d4a8ce26e am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 
* commit 'd3948a2eda0b4adc2541ae19fe87c067459a69d9':
  Set layout_width in WiFi+NFC resource
 2014-10-14 23:11:21 +00: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
8b1fe3b8e0 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:25 +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
Andres Morales
4a9b3cf506 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:11 +00:00
vandwalle
74e79a9680 am 74be17ed: am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 
* commit '74be17ed2e1a4f078fb186083c15617ca701271d':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
 2014-10-14 22:20:08 +00:00
vandwalle
74be17ed2e am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 
* commit '7d89e294b5ea6f3501a67e019549bae63cb1eee7':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
 2014-10-14 22:13:12 +00:00
Andres Morales
26bc6907b9 Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 2014-10-14 22:03:35 +00:00
Andres Morales
c5fdea08d2 Set layout_width in WiFi+NFC resource 
Bug:17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
 2014-10-14 13:49:31 -07:00
vandwalle
7d89e294b5 am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 
* commit '52e929a9613e52e199dcf12b95acab31be3c25bd':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
 2014-10-14 19:55:58 +00:00
Fabrice Di Meglio
3395d65062 am 7ae5528a: am c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '7ae5528a53b7a3157684e468a1e09d116401b2c3':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-14 18:15:58 +00:00
Fabrice Di Meglio
7ae5528a53 am c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'c2f0f751dd95bb10d2eeac064d43b016c754aa54':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-14 18:11:45 +00:00
Fabrice Di Meglio
c2f0f751dd Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-14 18:08:18 +00:00
Alexandra Gherghina
acd21060f3 Fix user spinner anchor following system ui changes 
Bug: 17637769
Change-Id: I31d7f2358803ee5a769e48d5c069969ce81a253c
 2014-10-14 18:04:24 +00:00