Merge branch 'master' into 4.0.x

Conflicts: framework/src/org/apache/cordova/CordovaActivity.java
2026-05-11 00:00:05 +08:00 · 2014-09-11 10:18:35 -04:00
parent 51e634ccb4 bf13fd48ce
commit dd5a337a49
8 changed files with 244 additions and 28 deletions
@@ -212,10 +212,8 @@ public class CordovaActivity extends Activity implements CordovaInterface {
        root.addView(appView.getView());
        setContentView(root);

-        // TODO: Setting this on the appView causes it to show when <html style="opacity:0">.
        int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
        root.setBackgroundColor(backgroundColor);
-        appView.getView().setBackgroundColor(backgroundColor);
    }

    /**