cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/2] cordova-plugin-splashscreen git commit: Revert "CB-8345 android: Make "splash" the default resource ID instead of null"
Date Mon, 30 Mar 2015 13:48:34 GMT
Repository: cordova-plugin-splashscreen
Updated Branches:
  refs/heads/master 89c23fad0 -> 9b3f75008


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

This reverts commit 1d89a2aa1bf0b714d0debf5928cd85e66bbd090b.
There were some other changes in there that weren't meant to be made!


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/ba6730e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/ba6730e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/ba6730e5

Branch: refs/heads/master
Commit: ba6730e5941a4e33f8b38e80b038a741671bcc9f
Parents: 89c23fa
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Mon Mar 30 09:46:55 2015 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Mon Mar 30 09:47:00 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/ba6730e5/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index 4e2099e..ec3ad93 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", "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;
                             }
-                        });*/
+                        });
             }
         });
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message