PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,708 Commits 1 Branch 0 Tags
828f5df065320b3f798f64a8b032e5b7c0534a4c
Commit Graph

15708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9f0d372154 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-16 00:55:46 +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
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
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
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
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
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
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
John Spurlock
3ee136eb13 am ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev 
* commit 'ec3e4cd5f3b8282eff347179a5af7de64371b188':
  Settings: Restart existing volumizers in volume prefs.
 2014-10-14 16:45:50 +00:00
John Spurlock
ec3e4cd5f3 Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev 2014-10-14 16:40:44 +00:00
vandwalle
52e929a961 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 '2fb9c773761b1375c86963ebb8f3bb3bec18e479':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
 2014-10-14 15:38:09 +00:00
Jason Monk
89be2d8ba4 Update screen pinning strings to say Overview 
Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
 2014-10-14 09:29:25 -04:00
vandwalle
2fb9c77376 Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 2014-10-14 06:41:27 +00:00
vandwalle
426005a299 dont show a config in saved network if it is self added and we never connected to it 
Bug:17939405

Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
 2014-10-13 18:44:21 -07:00
Fabrice Di Meglio
d8ae35ea50 Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch 
Per UX request, use a Switch for:

Accessibility
- Large text
- High contrast text
- Power button ends call
- Auto-rotate screen
- Speak passwords

Change-Id: I668586f3eb0e458db631e60f272e62f1315d3758
 2014-10-13 17:09:08 -07:00
Fabrice Di Meglio
f3a306cd94 am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '22a57a8cbeea81290f01ac6610729fcdf0b30a1a':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-13 23:33:06 +00:00
Fabrice Di Meglio
22a57a8cbe Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-13 23:29:01 +00:00
Fabrice Di Meglio
b98c40649e Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch 
Per UX request, use a Switch for:

- Automatic date & time
- Automatic time zone
- Use 24-hour format

Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a
 2014-10-13 16:02:25 -07:00