Delete the initial android app. It crashes the Android dev tools. There are several known causes of that, including the .svn files in the directories. So I'm switching to svn 1.7 (which puts all is metadata in one .svn directory) and will recreate the app.
git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@3882 f308d9b7-e957-4cde-b6ac-9a88185e7312
diff --git a/scout/proto1/android/.classpath b/scout/proto1/android/.classpath
deleted file mode 100644
index a4f1e40..0000000
--- a/scout/proto1/android/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/scout/proto1/android/.project b/scout/proto1/android/.project
deleted file mode 100644
index 5076b9f..0000000
--- a/scout/proto1/android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MyFirstApp</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/scout/proto1/android/AndroidManifest.xml b/scout/proto1/android/AndroidManifest.xml
deleted file mode 100644
index e828433..0000000
--- a/scout/proto1/android/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.jerry.myfirstapp"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk
- android:minSdkVersion="9"
- android:targetSdkVersion="17" />
- <permission android:name="android.permission.INTERNET"></permission>
-
- <application
- android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
- <activity
- android:name="com.jerry.myfirstapp.MainActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/scout/proto1/android/assets/index.html b/scout/proto1/android/assets/index.html
deleted file mode 100644
index 7d2ddc6..0000000
--- a/scout/proto1/android/assets/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
- <meta name="viewport" content="width=device-width,user-scalable=no" />
- <title>Native Web App</title>
-</head>
-<body onload="window.frc.info('Howdy!');">
- <h3>Native Web App</h3>
- <input type="text" id="ib"><br />
- <button onclick="window.frc.info(document.getElementById('ib').value);">Log Info</button>
- <button onclick="window.frc.error(document.getElementById('ib').value);">Log Error</button><br />
- <button onclick="if (window.confirm('Exit now?')) window.frc.exitApp();">Exit This App</button><br />
-</body>
-</html>
diff --git a/scout/proto1/android/ic_launcher-web.png b/scout/proto1/android/ic_launcher-web.png
deleted file mode 100644
index 00a687c..0000000
--- a/scout/proto1/android/ic_launcher-web.png
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/libs/android-support-v4.jar b/scout/proto1/android/libs/android-support-v4.jar
deleted file mode 100644
index 6080877..0000000
--- a/scout/proto1/android/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/proguard-project.txt b/scout/proto1/android/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/scout/proto1/android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/scout/proto1/android/project.properties b/scout/proto1/android/project.properties
deleted file mode 100644
index a3ee5ab..0000000
--- a/scout/proto1/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
diff --git a/scout/proto1/android/res/drawable-hdpi/ic_launcher.png b/scout/proto1/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 99a3c67..0000000
--- a/scout/proto1/android/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/res/drawable-ldpi/ic_launcher.png b/scout/proto1/android/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 6c51bbf..0000000
--- a/scout/proto1/android/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/res/drawable-mdpi/ic_launcher.png b/scout/proto1/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 612f324..0000000
--- a/scout/proto1/android/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/res/drawable-xhdpi/ic_launcher.png b/scout/proto1/android/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 45c7db2..0000000
--- a/scout/proto1/android/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/scout/proto1/android/res/layout/activity_main.xml b/scout/proto1/android/res/layout/activity_main.xml
deleted file mode 100644
index 80ec18a..0000000
--- a/scout/proto1/android/res/layout/activity_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".MainActivity" >
-
- <WebView
- android:id="@+id/webView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/scout/proto1/android/res/menu/activity_main.xml b/scout/proto1/android/res/menu/activity_main.xml
deleted file mode 100644
index c46abce..0000000
--- a/scout/proto1/android/res/menu/activity_main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/menu_settings"
- android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/menu_settings"/>
-
-</menu>
\ No newline at end of file
diff --git a/scout/proto1/android/res/values-v11/styles.xml b/scout/proto1/android/res/values-v11/styles.xml
deleted file mode 100644
index 9643ba1..0000000
--- a/scout/proto1/android/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
- <!--
- Base application theme for API 11+. This theme completely replaces
- AppBaseTheme from res/values/styles.xml on API 11+ devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
- <!-- API 11 theme customizations can go here. -->
- </style>
-
-</resources>
\ No newline at end of file
diff --git a/scout/proto1/android/res/values-v14/styles.xml b/scout/proto1/android/res/values-v14/styles.xml
deleted file mode 100644
index 50251a1..0000000
--- a/scout/proto1/android/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources>
-
- <!--
- Base application theme for API 14+. This theme completely replaces
- AppBaseTheme from BOTH res/values/styles.xml and
- res/values-v11/styles.xml on API 14+ devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
- <!-- API 14 theme customizations can go here. -->
- </style>
-
-</resources>
\ No newline at end of file
diff --git a/scout/proto1/android/res/values/strings.xml b/scout/proto1/android/res/values/strings.xml
deleted file mode 100644
index 375814f..0000000
--- a/scout/proto1/android/res/values/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">MyFirstApp</string>
- <string name="hello_world">Hello world!!</string>
- <string name="menu_settings">Settings</string>
-
-</resources>
\ No newline at end of file
diff --git a/scout/proto1/android/res/values/styles.xml b/scout/proto1/android/res/values/styles.xml
deleted file mode 100644
index 79a39af..0000000
--- a/scout/proto1/android/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
-</resources>
\ No newline at end of file
diff --git a/scout/proto1/android/src/org/frc971/proto1/MainActivity.java b/scout/proto1/android/src/org/frc971/proto1/MainActivity.java
deleted file mode 100644
index 8a0699c..0000000
--- a/scout/proto1/android/src/org/frc971/proto1/MainActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.frc971.proto1;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.Window;
-import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-public class MainActivity extends Activity {
- private WebView browser = null;
-
- final class JSHandler {
- // write Info to LogCat
- @JavascriptInterface
- public void info(String str) {
- Log.i("FRC", str);
- }
-
- // write Error to LogCat
- @JavascriptInterface
- public void error(String str) {
- Log.e("FRC", str);
- }
-
- // Exit the app
- @JavascriptInterface
- public void exitApp() {
- finish();
- }
- }
-
- @SuppressLint("SetJavaScriptEnabled") // Don't warn about XSS potential.
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // The web page shows a heading so hide the app title.
- requestWindowFeature(Window.FEATURE_NO_TITLE);
-
- setContentView(R.layout.activity_main);
-
- browser = (WebView)findViewById(R.id.webView);
- browser.clearCache(true); // includeDiskFiles
-
- // Configure the WebView.
- WebSettings settings = browser.getSettings();
- settings.setJavaScriptEnabled(true);
-
- // Needed for "alert()" to work.
- // TODO: Configure or subclass the WebChromeClient?
- browser.setWebChromeClient(new WebChromeClient());
-
- // TODO: more setup...
- browser.setWebViewClient(new WebViewClient());
-
- // Add custom functionality to the JavaScript environment.
- browser.addJavascriptInterface(new JSHandler(), "frc");
-
- browser.loadUrl("file:///android_asset/index.html");
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.activity_main, menu);
- return true;
- }
-
-}
