cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Fixing CB-2685: This class does nothing. Cordova is a Library not an Application
Date Mon, 22 Apr 2013 23:58:07 GMT
Updated Branches:
  refs/heads/master a03df3fad -> a17c7b9bb


Fixing CB-2685: This class does nothing. Cordova is a Library not an Application


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

Branch: refs/heads/master
Commit: a17c7b9bbf468e2ec9e3a3079e88a8d98b99eaf2
Parents: a03df3f
Author: Joe Bowser <bowserj@apache.org>
Authored: Mon Apr 22 16:57:54 2013 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon Apr 22 16:57:54 2013 -0700

----------------------------------------------------------------------
 framework/AndroidManifest.xml                    |    9 +----
 framework/src/org/apache/cordova/StandAlone.java |   32 -----------------
 2 files changed, 2 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a17c7b9b/framework/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/framework/AndroidManifest.xml b/framework/AndroidManifest.xml
index 8405172..f1336ea 100755
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -50,16 +50,11 @@
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:debuggable="true">
-        <activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
-               android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden">
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a17c7b9b/framework/src/org/apache/cordova/StandAlone.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/StandAlone.java b/framework/src/org/apache/cordova/StandAlone.java
deleted file mode 100644
index a199dda..0000000
--- a/framework/src/org/apache/cordova/StandAlone.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-       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;
-
-import android.os.Bundle;
-
-public class StandAlone extends DroidGap {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        super.loadUrl("file:///android_asset/www/index.html");
-    }
-
-}


Mime
View raw message