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

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java
This commit is contained in:
Ian Clelland
2014-09-11 10:18:35 -04:00
parent 51e634ccb4 bf13fd48ce
commit dd5a337a49
8 changed files with 244 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/build.gradle
+23 -2
View File
@@ -1,3 +1,24 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
buildscript {
repositories {
mavenCentral()
@@ -11,8 +32,8 @@ buildscript {
apply plugin: 'android-library'
android {
compileSdkVersion 19
buildToolsVersion "19.0.0"
compileSdkVersion cordova.cordovaSdkVersion
buildToolsVersion cordova.cordovaBuildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
framework/src/org/apache/cordova/CordovaActivity.java
-2
View File
@@ -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);
}
/**