You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/03/24 19:50:16 UTC
cordova-plugin-splashscreen git commit: CB-8345 android: Make
"splash" the default resource ID instead of null
Repository: cordova-plugin-splashscreen
Updated Branches:
refs/heads/master 0ff8d5208 -> 1d89a2aa1
CB-8345 android: Make "splash" the default resource ID instead of null
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/1d89a2aa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/1d89a2aa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/1d89a2aa
Branch: refs/heads/master
Commit: 1d89a2aa1bf0b714d0debf5928cd85e66bbd090b
Parents: 0ff8d52
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Mar 24 14:49:20 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Mar 24 14:50:09 2015 -0400
----------------------------------------------------------------------
src/android/SplashScreen.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/1d89a2aa/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index ec3ad93..4e2099e 100644
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -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", null);
+ String splashResource = preferences.getString("SplashScreen", "splash");
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;
}
- });
+ });*/
}
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org