PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,403 Commits 1 Branch 0 Tags
960c98f91d44a9f9dfa5276f62e55f16e557e685
Commit Graph

15403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Geoff Mendal
c928282319 am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e4d510fac1c149784414004803b9d2e2b7b0f7af':
  Import translations. DO NOT MERGE
 2014-10-13 22:20:30 +00:00
Geoff Mendal
ba35dd1bf7 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 22:15:43 +00:00
Geoff Mendal
e4d510fac1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 22:14:10 +00:00
John Spurlock
ef390443eb am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts. 
* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
  Fix battery-history-chart large-mode labels in RTL layouts.
 2014-10-13 22:03:54 +00:00
John Spurlock
a312f7f804 Fix battery-history-chart large-mode labels in RTL layouts. 
Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
 2014-10-13 15:48:50 -04: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
b0c0f773ce Import translations. DO NOT MERGE 
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
 2014-10-13 12:32:00 -07: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
Amit Mahajan
8151ef29aa resolved conflicts for merge of 88b2790d to lmp-sprout-dev 
Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903
 2014-10-10 17:17:53 -07:00
Alan Viverette
178db4d5f7 Merge "Add option for serif monospace captioning font" into lmp-dev 2014-10-10 23:40:58 +00:00
Amit Mahajan
88b2790d73 Merge "Fix to show signal strength as 0 if out of service." into lmp-dev 2014-10-10 22:41:09 +00:00
Amit Mahajan
4d49e3f5b1 Fix to show signal strength as 0 if out of service. 
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
 2014-10-10 14:40:44 -07:00
Alan Viverette
48dd1bca69 Add option for serif monospace captioning font 
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
 2014-10-10 12:24:45 -07:00
Dianne Hackborn
8541206e6b am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
  Update to use "real" L codename.
 2014-10-09 19:29:33 +00:00
Zoltan Szatmary-Ban
95dda800a9 am 50263efb: Remove CA Cert UI item from one list only 
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
  Remove CA Cert UI item from one list only
 2014-10-09 19:11:25 +00:00
Dianne Hackborn
a4204bde45 Merge "Update to use "real" L codename." into lmp-dev 2014-10-09 16:54:16 +00:00
Zoltan Szatmary-Ban
50263efbaf Remove CA Cert UI item from one list only 
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.

Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
 2014-10-09 13:00:32 +01:00
Sanket Padawe
e4cbb86596 Merge "Removing display number format from SIM UI" into lmp-sprout-dev 2014-10-09 00:33:10 +00:00
Sanket Padawe
770bdd771e Removing display number format from SIM UI 
Removed "Display Number" from the SIM settings UI.

Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
 2014-10-08 16:05:36 -07:00
Dianne Hackborn
308c8fdfec Update to use "real" L codename. 
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
 2014-10-08 15:48:25 -07:00
Amith Yamasani
c55c581a8a am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
  Set default restrictions for a newly created user
 2014-10-07 19:58:24 +00:00
Amith Yamasani
742a6803c3 Merge "Set default restrictions for a newly created user" into lmp-dev 2014-10-07 17:41:10 +00:00
Amith Yamasani
a766bfa3de Set default restrictions for a newly created user 
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.

Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
 2014-10-07 17:13:16 +00:00
Geoff Mendal
237abb0a37 am 7096c2dd: (-s ours) Import translations. DO NOT MERGE 
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
  Import translations. DO NOT MERGE
 2014-10-07 00:08:25 +00:00
Geoff Mendal
c3cd6d956b Import translations. DO NOT MERGE 
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
 2014-10-06 17:04:43 -07:00
Geoff Mendal
7096c2dd0b Import translations. DO NOT MERGE 
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
 2014-10-06 16:53:34 -07:00
Baligh Uddin
b305e7adec am 43848de1: (-s ours) Import translations. DO NOT MERGE 
* commit '43848de1603dc30e390049e2057285303132a836':
  Import translations. DO NOT MERGE
 2014-10-05 18:10:55 +00:00
Baligh Uddin
4aed423562 Import translations. DO NOT MERGE 
Change-Id: I9049c251a4ee54d87835a2a4a892c15ddf313a1e
Auto-generated-cl: translation import
 2014-10-04 21:38:39 -07:00
Baligh Uddin
43848de160 Import translations. DO NOT MERGE 
Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import
 2014-10-04 21:30:28 -07:00
PauloftheWest
4046cf9cb4 Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 2014-10-03 22:45:26 +00:00
PauloftheWest
50e6ecacf9 [DS] DSDS support for Settings 
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
 2014-10-03 15:22:59 -07:00
Svetoslav
35314f2771 am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
  Update accessibility plus secure lock warning messages.
 2014-10-03 22:06:18 +00:00
Svetoslav
5cdd3f4f6f Update accessibility plus secure lock warning messages. 
bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
 2014-10-03 13:27:13 -07:00
John Spurlock
40fdd48204 am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev 
* commit 'c05b739c691684350b63ca2e232319ee4fcaa76d':
  Settings: Update media & alarm stream icons.
 2014-10-03 14:00:25 +00:00
John Spurlock
c05b739c69 Merge "Settings: Update media & alarm stream icons." into lmp-dev 2014-10-03 13:55:35 +00:00
PauloftheWest
32ce9484b7 am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit '6e26427e521a79a11c1a9e1b64995494290eaf7c':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 13:46:28 +00:00