github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 23:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate <log> in favour of <preference name="loglevel">

Browse Source
This commit is contained in:
Andrew Grieve 2013-05-03 12:11:09 -04:00
parent 4b9047b7d8
commit b7990b7df8
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
framework/src/org/apache/cordova/Config.java
View File

@ -97,7 +97,7 @@ public class Config {
} }
else if (strNode.equals("log")) { else if (strNode.equals("log")) {
String level = xml.getAttributeValue(null, "level"); String level = xml.getAttributeValue(null, "level");
LOG.i("CordovaLog", "Found log level %s", level); Log.d(TAG, "The <log> tags is deprecated. Use <preference name=\"loglevel\" value=\"" + level + "\"/> instead.");
if (level != null) { if (level != null) {
LOG.setLogLevel(level); LOG.setLogLevel(level);
} }
@ -113,7 +113,10 @@ public class Config {
Note: We should probably pass in the classname for the variable splash on splashscreen! Note: We should probably pass in the classname for the variable splash on splashscreen!
*/ */
if(name.equals("splashscreen")) { if (name.equals("loglevel")) {
String level = xml.getAttributeValue(null, "value");
LOG.setLogLevel(level);
} else if (name.equals("splashscreen")) {
String value = xml.getAttributeValue(null, "value"); String value = xml.getAttributeValue(null, "value");
int resource = 0; int resource = 0;
if (value != null) if (value != null)
@ -123,20 +126,14 @@ public class Config {
resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName()); resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
action.getIntent().putExtra(name, resource); action.getIntent().putExtra(name, resource);
LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + value);
} }
else if(name.equals("backgroundColor")) { else if(name.equals("backgroundColor")) {
int value = xml.getAttributeIntValue(null, "value", Color.BLACK); int value = xml.getAttributeIntValue(null, "value", Color.BLACK);
action.getIntent().putExtra(name, value); action.getIntent().putExtra(name, value);
LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
} }
else if(name.equals("loadUrlTimeoutValue")) { else if(name.equals("loadUrlTimeoutValue")) {
int value = xml.getAttributeIntValue(null, "value", 20000); int value = xml.getAttributeIntValue(null, "value", 20000);
action.getIntent().putExtra(name, value); action.getIntent().putExtra(name, value);
LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
} }
else if(name.equals("keepRunning")) else if(name.equals("keepRunning"))
{ {
@ -157,12 +154,9 @@ public class Config {
{ {
String value = xml.getAttributeValue(null, "value"); String value = xml.getAttributeValue(null, "value");
action.getIntent().putExtra(name, value); action.getIntent().putExtra(name, value);
LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + value);
} }
/* /*
LOG.i("CordovaLog", "Found preference for %s=%s", name, value); LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + value);
*/ */
} }
else if (strNode.equals("content")) { else if (strNode.equals("content")) {