github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/SplashScreenInternal.java
This commit is contained in:
Andrew Grieve
2014-12-11 13:47:07 -05:00
parent 87cdc5ad1c 56a3ee5fe6
commit f086ef5cad
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/org/apache/cordova/CordovaPreferences.java
+3
View File
@@ -133,6 +133,9 @@ public class CordovaPreferences {
} else if (name.equals("splashscreen")) {
// Note: We should probably pass in the classname for the variable splash on splashscreen!
int resource = action.getResources().getIdentifier(value, "drawable", action.getClass().getPackage().getName());
if(resource == 0) {
resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
}
action.getIntent().putExtra(name, resource);
}
else if(name.equals("backgroundcolor")) {