PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,982 Commits 1 Branch 0 Tags
69f5e5ed63cbbed6cbb7c60714e28c324b2bcac0
Commit Graph

16982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
868326a8bb am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6397b5e2f809596b2a77674dd7a701ede24dc3bb':
  Import translations. DO NOT MERGE
 2014-10-13 22:41:08 +00:00
Geoff Mendal
4083220dba am f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f5b9d136526549198b5cd8f3e626efa33a6631da':
  Import translations. DO NOT MERGE
 2014-10-13 22:41:04 +00:00
John Spurlock
dbd85a70a2 am a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts. 
* commit 'a0d28225352a10c542bb2ee6fd8daef7886c4a25':
  Fix battery-history-chart large-mode labels in RTL layouts.
 2014-10-13 22:40:54 +00:00
Geoff Mendal
6397b5e2f8 am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c92828231993aa2c1a447c37a4a6f9740e950a72':
  Import translations. DO NOT MERGE
 2014-10-13 22:25:17 +00:00
Geoff Mendal
f5b9d13652 am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ba35dd1bf70e74987e9d167961e747357574a264':
  Import translations. DO NOT MERGE
 2014-10-13 22:21:27 +00: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
80f283543b am f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'f1e148c5cf1d7eadc38b24ec8f686d6e5a16fc95':
  Import translations. DO NOT MERGE
 2014-10-13 22:17:59 +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
f1e148c5cf Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-13 22:15:24 +00:00
Geoff Mendal
e4d510fac1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 22:14:10 +00:00
John Spurlock
a0d2822535 am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts. 
* commit 'ef390443eb7a6a4ac52c62aea65e7ba94f1f897a':
  Fix battery-history-chart large-mode labels in RTL layouts.
 2014-10-13 22:13:01 +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
Alan Viverette
e74c772b11 am 6229d683: am ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev 
* commit '6229d683a54a262c77625f031269603969b2fbe5':
  Update Settings to use themed Context.getDrawable()
 2014-10-13 21:07:50 +00:00
Alan Viverette
6229d683a5 am ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev 
* commit 'ca2d56a84927e08eb5418b79ad5cd6d57db10d23':
  Update Settings to use themed Context.getDrawable()
 2014-10-13 21:03:17 +00:00
Alan Viverette
ca2d56a849 Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev 2014-10-13 20:58:39 +00:00
John Spurlock
af05fda24d Settings: Restart existing volumizers in volume prefs. 
Use the new .start() method to ensure the underlying volumizer
is always started, regardless of pref activity lifecycle.

Depends on frameworks/base:
  I2f860864161f818d5a62a28331ef1c47051fb39f

Bug:17898190
Change-Id: I55dea590c13363730549aa29f194337efccdeaf7
 2014-10-13 20:47:05 +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
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
c25f5c45bc Import translations. DO NOT MERGE 
Change-Id: I8c96d2b054e17385851ec38bdd482af6e4c67e6b
Auto-generated-cl: translation import
 2014-10-13 12:40:48 -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
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
Alan Viverette
0ba89bd54c Update Settings to use themed Context.getDrawable() 
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.

BUG: 17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
 2014-10-10 10:58:58 -07: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
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