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

17422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f4edd27a3a am e5e08d93: (-s ours) am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'e5e08d93b15d5dded447ff99cfc51a29fb2d6fd4':
  Import translations. DO NOT MERGE
 2014-10-16 18:13:05 +00:00
Geoff Mendal
81099c7353 am 5c9c259a: (-s ours) 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 '5c9c259a6c8f4daf007ba7570dc24dfde59816fb':
  Import translations. DO NOT MERGE
 2014-10-16 18:13:04 +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
247deb2ce3 am 20ef7a70: (-s ours) am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '20ef7a70c48967a1a1d6aef8ad81787e1620558b':
  Import translations. DO NOT MERGE
 2014-10-16 01:19:41 +00: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
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
fba3fa7cfe am 2d45e6c7: (-s ours) am 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2d45e6c7389f99dfbdbcbc49b2f3fc149ee4d377':
  Import translations. DO NOT MERGE
 2014-10-16 00:56:35 +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
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
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
709e32447a am 3c56d456: 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 '3c56d456ea4a6f0f5d642ba96f066740a268f485':
  Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
 2014-10-15 03:06:55 +00:00
Fabrice Di Meglio
c616a65ee6 am b84d366f: 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 'b84d366f6bffc6676b6223c3757faef1c6e9f8fe':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-15 03:06:53 +00:00
Jason Monk
0bc1f91d5e am d913ef17: am 0f45f64e: am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit 'd913ef17e0ddb3a51d577ea74a2e148b12ed34b9':
  Update screen pinning strings to say Overview
 2014-10-15 03:06:05 +00:00
Andres Morales
07f317199e am b6f81772: am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 
* commit 'b6f8177251fbbcec752f1de81ee760eae8f3fcef':
  Set layout_width in WiFi+NFC resource
 2014-10-15 03:06:03 +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
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