diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.iml | 104 | ||||
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values-eu/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values-ja/strings.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 1 |
5 files changed, 52 insertions, 58 deletions
diff --git a/app/app.iml b/app/app.iml index fb1f329..3199b90 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="connectbot" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ConnectBot" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -9,15 +9,14 @@ <facet type="android" name="Android"> <configuration> <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" /> + <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" /> - <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" /> + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> + <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> <afterSyncTasks> + <task>generateDebugAndroidTestSources</task> <task>generateDebugSources</task> - <task>mockableAndroidJar</task> - <task>prepareDebugUnitTestDependencies</task> </afterSyncTasks> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> @@ -29,7 +28,7 @@ </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> - <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> + <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> @@ -38,6 +37,12 @@ <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/resValues/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/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" /> @@ -45,13 +50,6 @@ <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/testDebug/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> <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" /> @@ -59,13 +57,13 @@ <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/test/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> + <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" /> @@ -73,10 +71,17 @@ <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/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-contrib/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-intents/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> @@ -94,36 +99,29 @@ </content> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" /> - <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" /> <orderEntry type="library" exported="" name="jzlib-1.1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" /> - <orderEntry type="library" exported="" name="design-23.0.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" /> - <orderEntry type="library" exported="" name="sshlib-2.2.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-contrib-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="runner-0.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" /> + <orderEntry type="library" exported="" name="design-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-intents-2.2" level="project" /> + <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" /> + <orderEntry type="library" exported="" name="sshlib-2.2.1" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="rules-0.3" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.7.0" level="project" /> - <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" /> - <orderEntry type="library" exported="" name="jsocks-1.0.0" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" /> + <orderEntry type="library" exported="" name="simplesocks-1.0.1" level="project" /> + <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" /> + <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" /> </component> </module>
\ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 432357f..4f86971 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">Tecla cursor a la derecha</string> <string name="button_key_esc">Escape</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">TAB (Tabulador)</string> <string name="button_key_home">Inicio</string> <string name="button_key_end">Finalizar</string> <string name="button_key_pgup">Re Pág</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6104e7a..1184ef4 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <string name="app_desc">SSH bezero soil, ahaltsu eta librea</string> <string name="service_desc">SSH konexio eta kargatutako gako publikoak mantentzen ditu</string> <string name="title_hosts_list">Ostalariak</string> @@ -213,5 +213,4 @@ <string name="image_description_right">Eskuina gezia</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ktrl</string> - <string name="button_key_tab">Tab</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 212114b..9d06e08 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">右矢印</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">Tab</string> <string name="button_key_home">Home</string> <string name="button_key_end">End</string> <string name="button_key_pgup">PgUp</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1daebfe..a4cb39f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">向右的箭头</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">Tab</string> <string name="button_key_home">Home</string> <string name="button_key_end">End</string> <string name="button_key_pgup">PgUp</string> |