Android/packages_apps_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

5580 Commits

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
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
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
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
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
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
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
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
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
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
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
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
Fabrice Di Meglio
04393389a9 am 3395d650: 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 '3395d65062fe2a085cfd7909cdded8eb15cc3c7c':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-14 19:05:19 +00:00
Fabrice Di Meglio
fec1425c0b am a6c1e815: am f3a306cd: am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'a6c1e815bf4be14d875f34dd2e6eba6f9a97e3bd':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-14 19:04:50 +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
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
Fabrice Di Meglio
a6c1e815bf am f3a306cd: am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'f3a306cd94d3cd9e87941dbf3d3b0ecd056d10d5':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-14 17:49:27 +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
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
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
Geoff Mendal
bed6c4d1d4 Import translations. DO NOT MERGE 
Change-Id: I80c9e03e345f2a8ec20a4237922d0eb7e08b5502
Auto-generated-cl: translation import
 2014-10-13 13:03:15 -07:00
Geoff Mendal
2f1272a9f3 Import translations. DO NOT MERGE 
Change-Id: I8d9e5a58b77ec02b4311629c6520a86e9767a788
Auto-generated-cl: translation import
 2014-10-13 12:44:59 -07:00
Geoff Mendal
77c6794304 Import translations. DO NOT MERGE 
Change-Id: Ib43bc66e564fd16477a7b20724a60f0a4845243f
Auto-generated-cl: translation import
 2014-10-13 12:36:34 -07:00
Geoff Mendal
b0c0f773ce Import translations. DO NOT MERGE 
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
 2014-10-13 12:32:00 -07:00
Alan Viverette
e7d8b55f4c am 81db2fe7: am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '81db2fe78a02c3f01afde9e05f5594c3f2ebb80b':
  Add option for serif monospace captioning font
 2014-10-11 05:02:46 +00:00
Alan Viverette
81db2fe78a am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '44da5c19dbe7d438e9601477a17041b4a7700631':
  Add option for serif monospace captioning font
 2014-10-11 04:54:56 +00:00
Alan Viverette
4ed4249ccd am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
  Add option for serif monospace captioning font
 2014-10-11 02:49:47 +00:00
Alan Viverette
87b151c650 am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
  Add option for serif monospace captioning font
 2014-10-11 00:23:54 +00:00
Alan Viverette
48dd1bca69 Add option for serif monospace captioning font 
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
 2014-10-10 12:24:45 -07:00
Sanket Padawe
ea2e53ead5 am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp 
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
  Removing display number format from SIM UI
 2014-10-10 05:15:52 +00:00