center/cordova-plugin-splashscreen2
center/cordova-plugin-splashscreen2
13
0
Fork 0
forked from public/cordova-plugin-splashscreen
Code Pull Requests Activity

Revert "CB-8345 android: Make "splash" the default resource ID instead of null"

Browse Source 
This reverts commit 1d89a2aa1bf0b714d0debf5928cd85e66bbd090b.
There were some other changes in there that weren't meant to be made!
This commit is contained in:
Andrew Grieve 2015-03-30 09:46:55 -04:00
parent 89c23fad03
commit ba6730e594
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/android/SplashScreen.java
View File

@ -61,10 +61,10 @@ public class SplashScreen extends CordovaPlugin {
return;
}
// Make WebView invisible while loading URL
// getView().setVisibility(View.INVISIBLE);
getView().setVisibility(View.INVISIBLE);
int drawableId = preferences.getInteger("SplashDrawableId", 0);
if (drawableId == 0) {
String splashResource = preferences.getString("SplashScreen", "splash");
String splashResource = preferences.getString("SplashScreen", null);
if (splashResource != null) {
drawableId = cordova.getActivity().getResources().getIdentifier(splashResource, "drawable", cordova.getActivity().getClass().getPackage().getName());
if (drawableId == 0) {
@ -191,7 +191,7 @@ public class SplashScreen extends CordovaPlugin {
root.setMinimumWidth(display.getWidth());
root.setOrientation(LinearLayout.VERTICAL);
// TODO: Use the background color of the webView's parent instead of using the
// TODO: Use the background color of the webview's parent instead of using the
// preference.
root.setBackgroundColor(preferences.getInteger("backgroundColor", Color.BLACK));
root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
@ -258,12 +258,12 @@ public class SplashScreen extends CordovaPlugin {
cordova.getActivity().runOnUiThread(new Runnable() {
public void run() {
spinnerStop();
/*spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
new DialogInterface.OnCancelListener() {
public void onCancel(DialogInterface dialog) {
spinnerDialog = null;
}
});*/
});
}
});
}