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

17849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
b3c1c09528 am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 
* commit '5c467bc615e1a7553d05c361cd7fd7ac8cc4c0cb':
  Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
 2014-10-17 21:00:51 +00:00
Fabrice Di Meglio
dd6c3cc2b4 am dd89d6d5: am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'dd89d6d570272612e21719321ea4042f09bc5427':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 20:58:14 +00:00
Fabrice Di Meglio
dd89d6d570 am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '27c0b548ab701aefef7655e78401a52c33c6270c':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 20:53:16 +00:00
Fabrice Di Meglio
5c467bc615 Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 2014-10-17 20:52:56 +00:00
Fabrice Di Meglio
27c0b548ab Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-17 20:46:32 +00:00
Amith Yamasani
e52c159cd9 Fix some strings for the encryption stuff. 
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
 2014-10-17 13:42:14 -07:00
Jim Miller
40fbd26a40 am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit 'ae2ee1dd0537cb92d3df4568bc0cd82ef4663ad0':
  Add strings for upcoming change.
 2014-10-17 20:28:56 +00:00
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
Jim Miller
ae2ee1dd05 am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit '0303bb203059e75c729804405d481bd3333c4098':
  Add strings for upcoming change.
 2014-10-17 20:02:22 +00:00
Jim Miller
0303bb2030 am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a':
  Add strings for upcoming change.
 2014-10-17 19:56:45 +00:00
Jim Miller
c7ccba6859 am 4f903c3e: Add strings for upcoming change. 
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
  Add strings for upcoming change.
 2014-10-17 19:52:03 +00:00
Jim Miller
9a7f7a34ae am 4f903c3e: Add strings for upcoming change. 
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
  Add strings for upcoming change.
 2014-10-17 19:32:09 +00:00
Jim Miller
4f903c3e65 Add strings for upcoming change. 
Fixes bug 17881324

Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
 2014-10-17 12:18:42 -07: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
Fabrice Di Meglio
440e245a67 Fix bug #18024258 Crash in Settings observed after tap on Usage statistics 
- update to correct class name (was changed in a former CL and introduced
this regression)

Change-Id: Ia945a5be2d8c7d19c1daf400a9d2d2a6589de137
 2014-10-17 11:29:06 -07:00
Alan Viverette
03b976ac7b am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev 
automerge: 026c1ac

* commit '026c1ac3e7a9f8d465a546c161eac464512cbc62':
  Prevent NPE when no accessibility services are enabled
 2014-10-17 18:12:11 +00:00
Alan Viverette
026c1ac3e7 am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev 
* commit '2106c79bc28324aa2bb3658b19c58551ddc1cc14':
  Prevent NPE when no accessibility services are enabled
 2014-10-17 18:07:21 +00:00
Alan Viverette
2106c79bc2 Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev 2014-10-17 18:03:35 +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
Svetoslav
c8a1bb5a4d 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:55:46 +00:00
John Spurlock
27b64086fd am 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue. 
* commit '8d6d8f02fa94ec32d43d7532df2a5d000c0e3edc':
  Settings: Fix hotspot switch state issue.
 2014-10-17 16:41:17 +00:00
John Spurlock
8d6d8f02fa am 27334dbe: Settings: Fix hotspot switch state issue. 
* commit '27334dbe75c131103606e455eb75c55804fe93de':
  Settings: Fix hotspot switch state issue.
 2014-10-17 16:36:18 +00:00
John Spurlock
27334dbe75 Settings: Fix hotspot switch state issue. 
Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
 2014-10-17 11:55:26 -04:00
Alan Viverette
ea2810ad0f Prevent NPE when no accessibility services are enabled 
BUG: 18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
 2014-10-16 18:27:18 -07: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
1bc996532c Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch 
Per UX request, convert Account Sync feeds CheckBoxes to Switches

Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
 2014-10-16 17:16:26 -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
Alexandra Gherghina
06cd50177a Reset spinner selection 
This makes sure that when you go back to the spinner screen, the
selection is the one corresponding to the current profile.

Bug: 17378446
Change-Id: I536cc2701f9481986a63df1b01a38151edf2fa83
 2014-10-16 23:05:49 +01: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
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
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