diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-09 11:22:00 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-09 17:11:04 -0800 |
commit | dc6dd58d9da441b591580684f3d2f38d7898e7d4 (patch) | |
tree | e61233c887e2903d4ee42990508cef2e75d5c0e2 | |
parent | f8d8f7d08d2bd1b23f4f6ad9c3d412b3da7797ed (diff) | |
download | scala-dc6dd58d9da441b591580684f3d2f38d7898e7d4.tar.gz scala-dc6dd58d9da441b591580684f3d2f38d7898e7d4.tar.bz2 scala-dc6dd58d9da441b591580684f3d2f38d7898e7d4.zip |
Remove unused android test and corresponding license.
-rw-r--r-- | docs/licenses/apache_android.txt | 16 | ||||
-rw-r--r-- | test/files/android/HelloAndroid.scala | 16 | ||||
-rw-r--r-- | test/files/android/HelloAndroid.xml | 11 |
3 files changed, 0 insertions, 43 deletions
diff --git a/docs/licenses/apache_android.txt b/docs/licenses/apache_android.txt deleted file mode 100644 index 00f339625f..0000000000 --- a/docs/licenses/apache_android.txt +++ /dev/null @@ -1,16 +0,0 @@ -Scala includes various example files for Android: - -Copyright (c) 2005-2009, The Android Open Source Project -Copyright (c) 2007, Steven Osborn - -Licensed 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.
\ No newline at end of file diff --git a/test/files/android/HelloAndroid.scala b/test/files/android/HelloAndroid.scala deleted file mode 100644 index 9fd145a4f1..0000000000 --- a/test/files/android/HelloAndroid.scala +++ /dev/null @@ -1,16 +0,0 @@ -//package examples.hello3 - -import android.app.Activity -import android.os.Bundle -import android.widget.TextView - -//class HelloAndroid extends Activity { -class Test extends Activity { - /** Called when the activity is first created. */ - override def onCreate(icicle: Bundle) { - super.onCreate(icicle) - val tv = new TextView(this) - tv setText "Hello, Android (Scala)" - setContentView(tv) - } -} diff --git a/test/files/android/HelloAndroid.xml b/test/files/android/HelloAndroid.xml deleted file mode 100644 index 41907b16a3..0000000000 --- a/test/files/android/HelloAndroid.xml +++ /dev/null @@ -1,11 +0,0 @@ -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package=""> - <application> - <activity class="HelloAndroid" android:label="HelloAndroid"> - <intent-filter> - <action android:value="android.intent.action.MAIN" /> - <category android:value="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> -</manifest> |