You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by av...@apache.org on 2012/06/06 16:56:47 UTC
svn commit: r1346981 - in /incubator/photark/mobile/trunk/res:
layout/main.xml values/strings.xml xml/cordova.xml xml/plugins.xml
Author: avd
Date: Wed Jun 6 16:56:47 2012
New Revision: 1346981
URL: http://svn.apache.org/viewvc?rev=1346981&view=rev
Log:
fixed XML files in res/layout, res/values, res/xml have the xml content twice in the same file.
Modified:
incubator/photark/mobile/trunk/res/layout/main.xml
incubator/photark/mobile/trunk/res/values/strings.xml
incubator/photark/mobile/trunk/res/xml/cordova.xml
incubator/photark/mobile/trunk/res/xml/plugins.xml
Modified: incubator/photark/mobile/trunk/res/layout/main.xml
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/res/layout/main.xml?rev=1346981&r1=1346980&r2=1346981&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/res/layout/main.xml (original)
+++ incubator/photark/mobile/trunk/res/layout/main.xml Wed Jun 6 16:56:47 2012
@@ -9,16 +9,4 @@
android:layout_height="wrap_content"
android:text="@string/hello" />
-</LinearLayout>
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/hello" />
-
</LinearLayout>
\ No newline at end of file
Modified: incubator/photark/mobile/trunk/res/values/strings.xml
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/res/values/strings.xml?rev=1346981&r1=1346980&r2=1346981&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/res/values/strings.xml (original)
+++ incubator/photark/mobile/trunk/res/values/strings.xml Wed Jun 6 16:56:47 2012
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
-
<string name="hello">Hello World, Photark_MobileActivity!</string>
<string name="app_name">Photark_Mobile</string>
-
-</resources>
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="hello">Hello World, PhotArkMobileActivity!</string>
- <string name="app_name">PhotArkMobile</string>
-
</resources>
\ No newline at end of file
Modified: incubator/photark/mobile/trunk/res/xml/cordova.xml
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/res/xml/cordova.xml?rev=1346981&r1=1346980&r2=1346981&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/res/xml/cordova.xml (original)
+++ incubator/photark/mobile/trunk/res/xml/cordova.xml Wed Jun 6 16:56:47 2012
@@ -35,40 +35,3 @@
-<?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
-
- 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.
--->
-<cordova>
- <!--
- access elements control the Android whitelist.
- Domains are assumed blocked unless set otherwise
- -->
-
- <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
-
- <!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
- <!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
- <!-- <access origin=".*"/> Allow all domains, suggested development use only -->
-
- <log level="DEBUG"/>
- <preference name="classicRender" value="true" />
-</cordova>
-
-
-
Modified: incubator/photark/mobile/trunk/res/xml/plugins.xml
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/res/xml/plugins.xml?rev=1346981&r1=1346980&r2=1346981&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/res/xml/plugins.xml (original)
+++ incubator/photark/mobile/trunk/res/xml/plugins.xml Wed Jun 6 16:56:47 2012
@@ -36,41 +36,3 @@
<plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
<plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
</plugins>
-<?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
-
- 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.
--->
-<plugins>
- <plugin name="App" value="org.apache.cordova.App"/>
- <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
- <plugin name="Device" value="org.apache.cordova.Device"/>
- <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
- <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
- <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
- <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
- <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
- <plugin name="File" value="org.apache.cordova.FileUtils"/>
- <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
- <plugin name="Notification" value="org.apache.cordova.Notification"/>
- <plugin name="Storage" value="org.apache.cordova.Storage"/>
- <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
- <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
- <plugin name="Capture" value="org.apache.cordova.Capture"/>
- <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
- <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
-</plugins>