mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-26 12:03:28 +08:00
CB-779: Verify that fullscreen and backgroundColor preferences are set properly - This check-in enables background color and adds test for it.
This commit is contained in:
Bryce Curtis
parent
2d7b7160c3
commit
ac504768b2
@ -330,10 +330,8 @@ public class DroidGap extends Activity implements CordovaInterface {
|
|||||||
this.init();
|
this.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO @bc - background color doesn't work
|
// Set backgroundColor
|
||||||
// If backgroundColor
|
|
||||||
this.backgroundColor = this.getIntegerProperty("backgroundColor", Color.BLACK);
|
this.backgroundColor = this.getIntegerProperty("backgroundColor", Color.BLACK);
|
||||||
LOG.e(TAG, "Setting background color=" + this.backgroundColor);
|
|
||||||
this.root.setBackgroundColor(this.backgroundColor);
|
this.root.setBackgroundColor(this.backgroundColor);
|
||||||
|
|
||||||
// If keepRunning
|
// If keepRunning
|
||||||
@ -457,7 +455,18 @@ public class DroidGap extends Activity implements CordovaInterface {
|
|||||||
if (bundle == null) {
|
if (bundle == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
Boolean p = (Boolean) bundle.get(name);
|
Boolean p;
|
||||||
|
try {
|
||||||
|
p = (Boolean) bundle.get(name);
|
||||||
|
} catch (ClassCastException e) {
|
||||||
|
String s = bundle.get(name).toString();
|
||||||
|
if ("true".equals(s)) {
|
||||||
|
p = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
p = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (p == null) {
|
if (p == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
@ -476,7 +485,12 @@ public class DroidGap extends Activity implements CordovaInterface {
|
|||||||
if (bundle == null) {
|
if (bundle == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
Integer p = (Integer) bundle.get(name);
|
Integer p;
|
||||||
|
try {
|
||||||
|
p = (Integer) bundle.get(name);
|
||||||
|
} catch (ClassCastException e) {
|
||||||
|
p = Integer.parseInt(bundle.get(name).toString());
|
||||||
|
}
|
||||||
if (p == null) {
|
if (p == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
@ -514,7 +528,12 @@ public class DroidGap extends Activity implements CordovaInterface {
|
|||||||
if (bundle == null) {
|
if (bundle == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
Double p = (Double) bundle.get(name);
|
Double p;
|
||||||
|
try {
|
||||||
|
p = (Double) bundle.get(name);
|
||||||
|
} catch (ClassCastException e) {
|
||||||
|
p = Double.parseDouble(bundle.get(name).toString());
|
||||||
|
}
|
||||||
if (p == null) {
|
if (p == null) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -150,5 +150,8 @@
|
|||||||
<activity android:name="fullscreen" android:label="@string/app_name"
|
<activity android:name="fullscreen" android:label="@string/app_name"
|
||||||
android:configChanges="orientation|keyboardHidden">
|
android:configChanges="orientation|keyboardHidden">
|
||||||
</activity>
|
</activity>
|
||||||
|
<activity android:name="backgroundcolor" android:label="@string/app_name"
|
||||||
|
android:configChanges="orientation|keyboardHidden">
|
||||||
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
41
test/assets/www/backgroundcolor/index.html
Executable file
41
test/assets/www/backgroundcolor/index.html
Executable file
@ -0,0 +1,41 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
<!DOCTYPE HTML>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=320; user-scalable=no" />
|
||||||
|
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
|
||||||
|
<title>Cordova Tests</title>
|
||||||
|
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
|
||||||
|
<script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
|
||||||
|
<script type="text/javascript" charset="utf-8" src="../main.js"></script>
|
||||||
|
</head>
|
||||||
|
<body onload="init();" id="stage" class="theme">
|
||||||
|
<h1>Background Color Test</h1>
|
||||||
|
<div id="info">
|
||||||
|
<h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
|
||||||
|
<h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
|
||||||
|
<h4>Width: <span id="width"> </span>, Height: <span id="height">
|
||||||
|
</span>, Color Depth: <span id="colorDepth"></span></h4>
|
||||||
|
</div>
|
||||||
|
<div id="info">
|
||||||
|
Before this page was show, you should have seen the background flash green.</br>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
40
test/src/org/apache/cordova/test/backgroundcolor.java
Executable file
40
test/src/org/apache/cordova/test/backgroundcolor.java
Executable file
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
package org.apache.cordova.test;
|
||||||
|
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import org.apache.cordova.*;
|
||||||
|
|
||||||
|
public class backgroundcolor extends DroidGap {
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// Properties must be set before init() is called, since some are processed during init().
|
||||||
|
|
||||||
|
// backgroundColor can also be set in cordova.xml, but you must use the number equivalent of the color. For example, Color.RED is
|
||||||
|
// <preference name="backgroundColor" value="-65536" />
|
||||||
|
super.setIntegerProperty("backgroundColor", Color.GREEN);
|
||||||
|
|
||||||
|
super.init();
|
||||||
|
super.loadUrl("file:///android_asset/www/backgroundcolor/index.html");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user