Skip to content
This repository was archived by the owner on Jan 14, 2022. It is now read-only.

Commit 6f0fe93

Browse files
jackpaljackpal
committed
Convert to Android Studio 1.0
Builds and runs on Android 5.0 (Lollipop) Need to update documentation, bring over examples, test, etc.
1 parent 05f4485 commit 6f0fe93

File tree

288 files changed

+615
-7202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+615
-7202
lines changed

‎.gitignore

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
bin/
2-
gen/
3-
libs/
4-
obj/
5-
.classpath
6-
.project
7-
.settings/
8-
examples/widget/assets/
9-
pushnote
10-
11-
# Generated by tools/update.sh
12-
build.xml
13-
local.properties
1+
.gradle
2+
/local.properties
3+
/.idea/workspace.xml
4+
/.idea/libraries
5+
.DS_Store
6+
/build

‎.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/compiler.xml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/profiles_settings.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/encodings.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/scopes/scope_settings.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android-Terminal-Emulator.iml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
13+
<exclude-output />
14+
<content url="file://$MODULE_DIR$">
15+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
16+
</content>
17+
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
18+
<orderEntry type="sourceFolder" forTests="false" />
19+
</component>
20+
</module>
21+

‎Android.mk

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎ant.properties

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
buildscript {
3+
repositories {
4+
jcenter()
5+
}
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:1.0.0'
8+
}
9+
}
10+
11+
allprojects {
12+
repositories {
13+
jcenter()
14+
}
15+
}

‎emulatorview/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎emulatorview/build.gradle

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 11
5+
buildToolsVersion "21.1.2"
6+
7+
defaultConfig {
8+
minSdkVersion 3
9+
targetSdkVersion 11
10+
}
11+
12+
buildTypes {
13+
release {
14+
minifyEnabled false
15+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
16+
}
17+
}
18+
}

‎emulatorview/emulatorview.iml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":emulatorview" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
17+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22+
<option name="LIBRARY_PROJECT" value="true" />
23+
</configuration>
24+
</facet>
25+
</component>
26+
<component name="NewModuleRootManager" inherit-compiler-output="false">
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<exclude-output />
29+
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
84+
</content>
85+
<orderEntry type="jdk" jdkName="Android API 11 Platform" jdkType="Android SDK" />
86+
<orderEntry type="sourceFolder" forTests="false" />
87+
</component>
88+
</module>
89+

‎libraries/emulatorview/AndroidManifest.xml renamed to ‎emulatorview/src/main/AndroidManifest.xml

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/BaseTextRenderer.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/Bitmap4x8FontRenderer.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/Bitmap4x8FontRenderer.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/ByteQueue.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/ColorScheme.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/ColorScheme.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorDebug.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/GrowableIntArray.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/GrowableIntArray.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/PaintRenderer.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/Screen.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/Screen.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/StyleRow.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/StyleRow.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TermKeyListener.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TermSession.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TermSession.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TextRenderer.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TextStyle.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TextStyle.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/TranscriptScreen.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/TranscriptScreen.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/UnicodeTranscript.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/UnicodeTranscript.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/UpdateCallback.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/UpdateCallback.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/AndroidCharacterCompat.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCharacterCompat.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/AndroidCompat.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCompat.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompat.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompat.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatFactory.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatFactory.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV1.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV1.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV11.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV11.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/KeyCharacterMapCompat.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/KeyCharacterMapCompat.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/KeycodeConstants.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/KeycodeConstants.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/compat/Patterns.java renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/compat/Patterns.java

File renamed without changes.

‎libraries/emulatorview/src/jackpal/androidterm/emulatorview/package.html renamed to ‎emulatorview/src/main/java/jackpal/androidterm/emulatorview/package.html

File renamed without changes.

‎libraries/emulatorview/res/drawable-nodpi/atari_small_nodpi.png renamed to ‎emulatorview/src/main/res/drawable-nodpi/atari_small_nodpi.png

File renamed without changes.

‎libraries/emulatorview/res/drawable/atari_small.png renamed to ‎emulatorview/src/main/res/drawable/atari_small.png

File renamed without changes.

‎examples/intents/AndroidManifest.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎examples/intents/ant.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎examples/intents/proguard-project.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎examples/intents/project.properties

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)