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

17309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8bc8e94cd0 am 32de3fa8: (-s ours) am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE 
* commit '32de3fa8c60a8b776b0f5a6352ba8a7bad4a0050':
  Import translations. DO NOT MERGE
 2014-10-13 20:42:18 +00:00
Geoff Mendal
32de3fa8c6 am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE 
* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
  Import translations. DO NOT MERGE
 2014-10-13 20:36:52 +00:00
Geoff Mendal
91e2b2d232 am 77c67943: (-s ours) Import translations. DO NOT MERGE 
* commit '77c67943048591b182527757e89b5916a2881d91':
  Import translations. DO NOT MERGE
 2014-10-13 20:32:26 +00: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
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
Amit Mahajan
556ced3741 am 9530280c: am 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev 
* commit '9530280c1bc2b9ac22a3c1db94c76dbcf8a94917':
  Fix to show signal strength as 0 if out of service.
 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
Amit Mahajan
9530280c1b am 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev 
* commit '63fce990971121eb74fb64a79807223fb3f36cf8':
  Fix to show signal strength as 0 if out of service.
 2014-10-11 04:54:55 +00:00
Alan Viverette
44da5c19db am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '4ed4249ccd9de8f34a7d59ab48b28494ff942d53':
  Add option for serif monospace captioning font
 2014-10-11 03:17:23 +00:00
Amit Mahajan
63fce99097 am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev 
* commit '5c340458fdebc191d70f33913594e9e3429fc5d2':
  Fix to show signal strength as 0 if out of service.
 2014-10-11 03:17:20 +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
Amit Mahajan
5c340458fd am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev 
* commit '8151ef29aa80006b7597ed57d507fe48338110c7':
  Fix to show signal strength as 0 if out of service.
 2014-10-11 02:49:38 +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
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
449eac9f66 am eac414ae: am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit 'eac414ae23a2b0db870ca5ed82b2900aa18e38cc':
  Update to use "real" L codename.
 2014-10-10 18:41:57 +00:00
Zoltan Szatmary-Ban
e9cc344746 am ac8a4c07: am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only 
* commit 'ac8a4c0762df40b5525eadad4f979ae38ab78229':
  Remove CA Cert UI item from one list only
 2014-10-10 18:41:56 +00:00
Svetoslav
1337305a8e am aaeaa9da: am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev 
* commit 'aaeaa9dadc004929b2fb4ee5e21c2099ec36cbbd':
  Update accessibility service toggle switch when resuming.
 2014-10-10 18:41:55 +00:00
Dianne Hackborn
eac414ae23 am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit '9d49e51c854bb25d50c2aefd66aeed6aeb942d2c':
  Update to use "real" L codename.
 2014-10-10 17:01:10 +00:00
Zoltan Szatmary-Ban
ac8a4c0762 am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only 
* commit 'e807e1ead6f78951b8b84d55f8772d0317f09f14':
  Remove CA Cert UI item from one list only
 2014-10-10 16:59:44 +00:00
Svetoslav
aaeaa9dadc am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev 
* commit 'a883dbba7194b19c14c4fff83f94ee852c7bb798':
  Update accessibility service toggle switch when resuming.
 2014-10-10 16:58:15 +00: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
Sanket Padawe
ce1bfbb04e resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp 
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
 2014-10-09 20:19:59 -07:00
Dianne Hackborn
9d49e51c85 am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit 'c30661c05d2455d251f8cedddc3a048e78455f6c':
  Update to use "real" L codename.
 2014-10-09 22:11:49 +00:00
Dianne Hackborn
c30661c05d am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
  Update to use "real" L codename.
 2014-10-09 22:02:02 +00: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
e807e1ead6 am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only 
* commit '90625329608c19c3a0b8f7c98bb8710fe346a220':
  Remove CA Cert UI item from one list only
 2014-10-09 19:28:05 +00:00
Zoltan Szatmary-Ban
9062532960 am 95dda800: am 50263efb: Remove CA Cert UI item from one list only 
* commit '95dda800a988c1ca778dae08563b6875c30d089a':
  Remove CA Cert UI item from one list only
 2014-10-09 19:22:48 +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
Svetoslav
a883dbba71 am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev 
* commit '396748110b8e7e761ee1d82827cc4396ecc5ee66':
  Update accessibility service toggle switch when resuming.
 2014-10-09 18:26:25 +00:00
Svetoslav
396748110b Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev 2014-10-09 18:21:53 +00:00
Dianne Hackborn
a4204bde45 Merge "Update to use "real" L codename." into lmp-dev 2014-10-09 16:54:16 +00:00
Sanket Padawe
61719a801c am 04b8b4c1: am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev 
* commit '04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
  Removing display number format from SIM UI
 2014-10-09 13:16:15 +00:00
Sanket Padawe
04b8b4c1a4 am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev 
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
  Removing display number format from SIM UI
 2014-10-09 13:03:33 +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
Svetoslav
17fd600fc6 Update accessibility service toggle switch when resuming. 
An accessibility service can be enabled via a global gesture
in which case if the settings activity for enabling the service
is running its toggle switch is shown in the wrong state.

bug:16558106

Change-Id: I2821b148475a7afae21e29148ef98db724c817f2
 2014-10-08 19:47:55 +00:00
Amith Yamasani
b7a635f66d am 711785f5: am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '711785f59cfe9aeb71e686bd7f45781bd545472c':
  Set default restrictions for a newly created user
 2014-10-07 20:41:15 +00:00
Amith Yamasani
711785f59c am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '436796e4ccf327c09e104a5bda27788a029c85e7':
  Set default restrictions for a newly created user
 2014-10-07 20:34:51 +00:00
Amith Yamasani
436796e4cc am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '6b911d59eb2da863c53e5e338dec22974a79b654':
  Set default restrictions for a newly created user
 2014-10-07 20:08:32 +00:00
Amith Yamasani
6b911d59eb am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
  Set default restrictions for a newly created user
 2014-10-07 20:03:26 +00: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
Mike Lockwood
b7597d5bd0 Merge "Add developer setting for changing the current USB configuration" 2014-10-07 17:12:21 +00:00