Convert to Android Studio 1.0

Builds and runs on Android 5.0 (Lollipop) Need to update documentation, bring over examples, test, etc.
jackpal · Dec 14, 2014 · 6f0fe93 · marom1035 · Nov 1, 2017 · 6f0fe93
1 parent 05f4485
commit 6f0fe93
Show file tree

Hide file tree

Showing 288 changed files with 615 additions and 7,202 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,6 @@
-bin/
-gen/
-libs/
-obj/
-.classpath
-.project
-.settings/
-examples/widget/assets/
-pushnote
-
-# Generated by tools/update.sh
-build.xml
-local.properties
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Android-Terminal-Emulator.iml b/Android-Terminal-Emulator.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/Android.mk b/Android.mk
diff --git a/ant.properties b/ant.properties
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/emulatorview/.gitignore b/emulatorview/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/emulatorview/build.gradle b/emulatorview/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 11
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 3
+        targetSdkVersion 11
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
diff --git a/emulatorview/emulatorview.iml b/emulatorview/emulatorview.iml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":emulatorview" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 11 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/libraries/emulatorview/AndroidManifest.xml → emulatorview/src/main/AndroidManifest.xml b/libraries/emulatorview/AndroidManifest.xml → emulatorview/src/main/AndroidManifest.xml
diff --git a/...idterm/emulatorview/BaseTextRenderer.java → ...idterm/emulatorview/BaseTextRenderer.java b/...idterm/emulatorview/BaseTextRenderer.java → ...idterm/emulatorview/BaseTextRenderer.java
diff --git a/...m/emulatorview/Bitmap4x8FontRenderer.java → ...m/emulatorview/Bitmap4x8FontRenderer.java b/...m/emulatorview/Bitmap4x8FontRenderer.java → ...m/emulatorview/Bitmap4x8FontRenderer.java
diff --git a/...l/androidterm/emulatorview/ByteQueue.java → ...l/androidterm/emulatorview/ByteQueue.java b/...l/androidterm/emulatorview/ByteQueue.java → ...l/androidterm/emulatorview/ByteQueue.java
diff --git a/...androidterm/emulatorview/ColorScheme.java → ...androidterm/emulatorview/ColorScheme.java b/...androidterm/emulatorview/ColorScheme.java → ...androidterm/emulatorview/ColorScheme.java
diff --git a/...droidterm/emulatorview/EmulatorDebug.java → ...droidterm/emulatorview/EmulatorDebug.java b/...droidterm/emulatorview/EmulatorDebug.java → ...droidterm/emulatorview/EmulatorDebug.java
diff --git a/...ndroidterm/emulatorview/EmulatorView.java → ...ndroidterm/emulatorview/EmulatorView.java b/...ndroidterm/emulatorview/EmulatorView.java → ...ndroidterm/emulatorview/EmulatorView.java
diff --git a/...idterm/emulatorview/GrowableIntArray.java → ...idterm/emulatorview/GrowableIntArray.java b/...idterm/emulatorview/GrowableIntArray.java → ...idterm/emulatorview/GrowableIntArray.java
diff --git a/...droidterm/emulatorview/PaintRenderer.java → ...droidterm/emulatorview/PaintRenderer.java b/...droidterm/emulatorview/PaintRenderer.java → ...droidterm/emulatorview/PaintRenderer.java
diff --git a/...kpal/androidterm/emulatorview/Screen.java → ...kpal/androidterm/emulatorview/Screen.java b/...kpal/androidterm/emulatorview/Screen.java → ...kpal/androidterm/emulatorview/Screen.java
diff --git a/...al/androidterm/emulatorview/StyleRow.java → ...al/androidterm/emulatorview/StyleRow.java b/...al/androidterm/emulatorview/StyleRow.java → ...al/androidterm/emulatorview/StyleRow.java
diff --git a/...oidterm/emulatorview/TermKeyListener.java → ...oidterm/emulatorview/TermKeyListener.java b/...oidterm/emulatorview/TermKeyListener.java → ...oidterm/emulatorview/TermKeyListener.java
diff --git a/...androidterm/emulatorview/TermSession.java → ...androidterm/emulatorview/TermSession.java b/...androidterm/emulatorview/TermSession.java → ...androidterm/emulatorview/TermSession.java
diff --git a/...idterm/emulatorview/TerminalEmulator.java → ...idterm/emulatorview/TerminalEmulator.java b/...idterm/emulatorview/TerminalEmulator.java → ...idterm/emulatorview/TerminalEmulator.java
diff --git a/...ndroidterm/emulatorview/TextRenderer.java → ...ndroidterm/emulatorview/TextRenderer.java b/...ndroidterm/emulatorview/TextRenderer.java → ...ndroidterm/emulatorview/TextRenderer.java
diff --git a/...l/androidterm/emulatorview/TextStyle.java → ...l/androidterm/emulatorview/TextStyle.java b/...l/androidterm/emulatorview/TextStyle.java → ...l/androidterm/emulatorview/TextStyle.java
diff --git a/...idterm/emulatorview/TranscriptScreen.java → ...idterm/emulatorview/TranscriptScreen.java b/...idterm/emulatorview/TranscriptScreen.java → ...idterm/emulatorview/TranscriptScreen.java
diff --git a/...dterm/emulatorview/UnicodeTranscript.java → ...dterm/emulatorview/UnicodeTranscript.java b/...dterm/emulatorview/UnicodeTranscript.java → ...dterm/emulatorview/UnicodeTranscript.java
diff --git a/...roidterm/emulatorview/UpdateCallback.java → ...roidterm/emulatorview/UpdateCallback.java b/...roidterm/emulatorview/UpdateCallback.java → ...roidterm/emulatorview/UpdateCallback.java
diff --git a/...orview/compat/AndroidCharacterCompat.java → ...orview/compat/AndroidCharacterCompat.java b/...orview/compat/AndroidCharacterCompat.java → ...orview/compat/AndroidCharacterCompat.java
diff --git a/...rm/emulatorview/compat/AndroidCompat.java → ...rm/emulatorview/compat/AndroidCompat.java b/...rm/emulatorview/compat/AndroidCompat.java → ...rm/emulatorview/compat/AndroidCompat.java
diff --git a/...orview/compat/ClipboardManagerCompat.java → ...orview/compat/ClipboardManagerCompat.java b/...orview/compat/ClipboardManagerCompat.java → ...orview/compat/ClipboardManagerCompat.java
diff --git a/...compat/ClipboardManagerCompatFactory.java → ...compat/ClipboardManagerCompatFactory.java b/...compat/ClipboardManagerCompatFactory.java → ...compat/ClipboardManagerCompatFactory.java
diff --git a/...view/compat/ClipboardManagerCompatV1.java → ...view/compat/ClipboardManagerCompatV1.java b/...view/compat/ClipboardManagerCompatV1.java → ...view/compat/ClipboardManagerCompatV1.java
diff --git a/...iew/compat/ClipboardManagerCompatV11.java → ...iew/compat/ClipboardManagerCompatV11.java b/...iew/compat/ClipboardManagerCompatV11.java → ...iew/compat/ClipboardManagerCompatV11.java
diff --git a/...torview/compat/KeyCharacterMapCompat.java → ...torview/compat/KeyCharacterMapCompat.java b/...torview/compat/KeyCharacterMapCompat.java → ...torview/compat/KeyCharacterMapCompat.java
diff --git a/...emulatorview/compat/KeycodeConstants.java → ...emulatorview/compat/KeycodeConstants.java b/...emulatorview/compat/KeycodeConstants.java → ...emulatorview/compat/KeycodeConstants.java
diff --git a/...oidterm/emulatorview/compat/Patterns.java → ...oidterm/emulatorview/compat/Patterns.java b/...oidterm/emulatorview/compat/Patterns.java → ...oidterm/emulatorview/compat/Patterns.java
diff --git a/...pal/androidterm/emulatorview/package.html → ...pal/androidterm/emulatorview/package.html b/...pal/androidterm/emulatorview/package.html → ...pal/androidterm/emulatorview/package.html
diff --git a/.../res/drawable-nodpi/atari_small_nodpi.png → .../res/drawable-nodpi/atari_small_nodpi.png b/.../res/drawable-nodpi/atari_small_nodpi.png → .../res/drawable-nodpi/atari_small_nodpi.png
diff --git a/...emulatorview/res/drawable/atari_small.png → ...iew/src/main/res/drawable/atari_small.png b/...emulatorview/res/drawable/atari_small.png → ...iew/src/main/res/drawable/atari_small.png
diff --git a/examples/intents/AndroidManifest.xml b/examples/intents/AndroidManifest.xml
diff --git a/examples/intents/ant.properties b/examples/intents/ant.properties
diff --git a/examples/intents/proguard-project.txt b/examples/intents/proguard-project.txt
diff --git a/examples/intents/project.properties b/examples/intents/project.properties