Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,681 Commits 1 Branch 0 Tags
8cfd94de1dcbe707f3747cc9515e4c3562f6b092
Commit Graph

5320 Commits

Author SHA1 Message Date
Svetoslav
8cfd94de1d am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit 'dfa12ed48476968b919e20770493cfb89985be54':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 20:28:30 +00:00
Svetoslav
dfa12ed484 am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit 'b363c26e2f3255ad891d0fd466c9bbd2794a734d':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 19:07:37 +00:00
Svetoslav
b363c26e2f am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 18:53:32 +00:00
Svetoslav
431e246032 am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 16:56:40 +00: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
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
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
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
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
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
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
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
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
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