Return-Path: 
 <commits-return-11467-apmail-cordova-commits-archive=cordova.apache.org@cordova.apache.org>
X-Original-To: apmail-cordova-commits-archive@www.apache.org
Delivered-To: apmail-cordova-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B2143F44B
	for <apmail-cordova-commits-archive@www.apache.org>;
 Fri, 10 May 2013 21:03:27 +0000 (UTC)
Received: (qmail 30532 invoked by uid 500); 10 May 2013 21:03:27 -0000
Delivered-To: apmail-cordova-commits-archive@cordova.apache.org
Received: (qmail 30502 invoked by uid 500); 10 May 2013 21:03:27 -0000
Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cordova.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cordova.apache.org>
List-Post: <mailto:commits@cordova.apache.org>
List-Id: <commits.cordova.apache.org>
Reply-To: dev@cordova.apache.org
Delivered-To: mailing list commits@cordova.apache.org
Received: (qmail 30474 invoked by uid 99); 10 May 2013 21:03:27 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 21:03:27 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0A9B888B8FF; Fri, 10 May 2013 21:03:27 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bowserj@apache.org
To: commits@cordova.apache.org
Date: Fri, 10 May 2013 21:03:30 -0000
Message-Id: <12784a7f8e11471fab2b73688796292f@git.apache.org>
In-Reply-To: <28a63e860572400682266b4ce2a627fa@git.apache.org>
References: <28a63e860572400682266b4ce2a627fa@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/13] android commit: [CB-1108] Update config.xml template's list
 of available <preference>s

[CB-1108] Update config.xml template's list of available <preference>s


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/27cd9dde
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/27cd9dde
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/27cd9dde

Branch: refs/heads/3.0.0
Commit: 27cd9dde38368e8eab7b84a20a1f21a595313853
Parents: 373da39
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Fri May 3 12:18:36 2013 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Fri May 3 12:18:36 2013 -0400

----------------------------------------------------------------------
 framework/res/xml/config.xml |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/27cd9dde/framework/res/xml/config.xml
----------------------------------------------------------------------
diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml
index c915f0c..2fb16c4 100644
--- a/framework/res/xml/config.xml
+++ b/framework/res/xml/config.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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
+   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.
+-->
 <widget xmlns     = "http://www.w3.org/ns/widgets"
         id        = "io.cordova.helloCordova"
         version   = "2.0.0">
@@ -8,21 +23,23 @@
         A sample Apache Cordova application that responds to the deviceready event.
     </description>
 
-    <author href="http://cordova.io" email="callback-dev@incubator.apache.org">
+    <author href="http://cordova.io" email="dev@cordova.apache.org">
         Apache Cordova Team
     </author>
 
     <access origin="*"/>
- 
 
     <!-- <content src="http://mysite.com/myapp.html" /> for external pages -->
     <content src="index.html" />
 
-    <log level="DEBUG"/>
-
-    <!-- Preferences for Android -->
-    <preference name="useBrowserHistory" value="true" />
-    <preference name="exit-on-suspend" value="false" />
+    <preference name="loglevel" value="DEBUG" />
+    <!--
+      <preference name="splashscreen" value="resourceName" />
+      <preference name="backgroundColor" value="0xFFF" />
+      <preference name="loadUrlTimeoutValue" value="20000" />
+      <preference name="InAppBrowserStorageEnabled" value="true" />
+      <preference name="disallowOverscroll" value="true" />
+    -->
 
     <feature name="App">
       <param name="android-package" value="org.apache.cordova.App"/>
@@ -81,5 +98,4 @@
     <feature name="InAppBrowser">
       <param name="android-package" value="org.apache.cordova.InAppBrowser"/>
     </feature>
-         
 </widget>