diff options
author | Greg Hartman <ghartman@google.com> | 2018-10-24 18:48:35 -0700 |
---|---|---|
committer | Greg Hartman <ghartman@google.com> | 2018-10-24 18:48:35 -0700 |
commit | 8af14a4c74e8b456389545b5401d0a4d64f0d6bb (patch) | |
tree | 939cb89f49f840f04cbc4ddde75333ccf06b0d1f /testapps/libsTest/lib1 | |
parent | 182e4691d1c5e724fc60ed94b6de8a3356018cb6 (diff) | |
parent | 246ae79db48d3570818277fa45d3265736cb804c (diff) | |
download | device_generic_opengl-transport-8af14a4c74e8b456389545b5401d0a4d64f0d6bb.tar.gz device_generic_opengl-transport-8af14a4c74e8b456389545b5401d0a4d64f0d6bb.tar.bz2 device_generic_opengl-transport-8af14a4c74e8b456389545b5401d0a4d64f0d6bb.zip |
Merging from ab/5068661
BUG: 117514054
Test: TH
Change-Id: I2fe8bc306369d45939b50d21aa6516882ca0d049
Diffstat (limited to 'testapps/libsTest/lib1')
-rw-r--r-- | testapps/libsTest/lib1/.classpath | 8 | ||||
-rw-r--r-- | testapps/libsTest/lib1/.project | 33 | ||||
-rw-r--r-- | testapps/libsTest/lib1/AndroidManifest.xml | 21 | ||||
-rw-r--r-- | testapps/libsTest/lib1/build.xml | 90 | ||||
-rw-r--r-- | testapps/libsTest/lib1/proguard-project.txt | 20 | ||||
-rw-r--r-- | testapps/libsTest/lib1/project.properties | 16 | ||||
-rw-r--r-- | testapps/libsTest/lib1/res/drawable-hdpi/ic_launcher.png | bin | 4147 -> 0 bytes | |||
-rw-r--r-- | testapps/libsTest/lib1/res/drawable-ldpi/ic_launcher.png | bin | 1723 -> 0 bytes | |||
-rw-r--r-- | testapps/libsTest/lib1/res/drawable-mdpi/ic_launcher.png | bin | 2574 -> 0 bytes | |||
-rw-r--r-- | testapps/libsTest/lib1/res/layout/lib1_main.xml | 20 | ||||
-rw-r--r-- | testapps/libsTest/lib1/res/values/strings.xml | 7 | ||||
-rw-r--r-- | testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.java | 43 | ||||
-rw-r--r-- | testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.txt | 1 | ||||
-rw-r--r-- | testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/MainActivity.java | 18 |
14 files changed, 0 insertions, 277 deletions
diff --git a/testapps/libsTest/lib1/.classpath b/testapps/libsTest/lib1/.classpath deleted file mode 100644 index a4763d1ee..000000000 --- a/testapps/libsTest/lib1/.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/testapps/libsTest/lib1/.project b/testapps/libsTest/lib1/.project deleted file mode 100644 index 627133591..000000000 --- a/testapps/libsTest/lib1/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>libsTest-Lib1</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/testapps/libsTest/lib1/AndroidManifest.xml b/testapps/libsTest/lib1/AndroidManifest.xml deleted file mode 100644 index 194faeabe..000000000 --- a/testapps/libsTest/lib1/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.tests.libstest.lib1" - android:versionCode="1" - android:versionName="1.0" > - - <application - android:icon="@drawable/ic_launcher" - android:label="@string/lib1_name" > - <activity - android:name="com.android.tests.libstest.lib1.MainActivity" - android:label="@string/lib1_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/testapps/libsTest/lib1/build.xml b/testapps/libsTest/lib1/build.xml deleted file mode 100644 index ed2552189..000000000 --- a/testapps/libsTest/lib1/build.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="libsAndJarTest-lib1" default="help"> - - <!-- The local.properties file is created and updated by the 'android' tool. - It contains the path to the SDK. It should *NOT* be checked into - Version Control Systems. --> - <property file="local.properties" /> - - <!-- The ant.properties file can be created by you. It is only edited by the - 'android' tool to add properties to it. - This is the place to change some Ant specific build properties. - Here are some properties you may want to change/update: - - source.dir - The name of the source directory. Default is 'src'. - out.dir - The name of the output directory. Default is 'bin'. - - For other overridable properties, look at the beginning of the rules - files in the SDK, at tools/ant/build.xml - - Properties related to the SDK location or the project target should - be updated using the 'android' tool with the 'update' action. - - This file is an integral part of the build system for your - application and should be checked into Version Control Systems. - - --> - <property file="ant.properties" /> - - <!-- The project.properties file is created and updated by the 'android' - tool, as well as ADT. - - This contains project specific properties such as project target, and library - dependencies. Lower level build properties are stored in ant.properties - (or in .classpath for Eclipse projects). - - This file is an integral part of the build system for your - application and should be checked into Version Control Systems. --> - <loadproperties srcFile="project.properties" /> - - <!-- if sdk.dir was not set from one of the property file, then - get it from the ANDROID_HOME env var. --> - <property environment="env" /> - <condition property="sdk.dir" value="${env.ANDROID_HOME}"> - <isset property="env.ANDROID_HOME" /> - </condition> - - <!-- quick check on sdk.dir --> - <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." - unless="sdk.dir" - /> - - <!-- - Import per project custom build rules if present at the root of the project. - This is the place to put custom intermediary targets such as: - -pre-build - -pre-compile - -post-compile (This is typically used for code obfuscation. - Compiled code location: ${out.classes.absolute.dir} - If this is not done in place, override ${out.dex.input.absolute.dir}) - -post-package - -post-build - -pre-clean - --> - <import file="custom_rules.xml" optional="true" /> - - <!-- Import the actual build file. - - To customize existing targets, there are two options: - - Customize only one target: - - copy/paste the target into this file, *before* the - <import> task. - - customize it to your needs. - - Customize the whole content of build.xml - - copy/paste the content of the rules files (minus the top node) - into this file, replacing the <import> task. - - customize to your needs. - - *********************** - ****** IMPORTANT ****** - *********************** - In all cases you must update the value of version-tag below to read 'custom' instead of an integer, - in order to avoid having your file be overridden by tools such as "android update project" - --> - <!-- version-tag: 1 --> - <import file="${sdk.dir}/tools/ant/build.xml" /> - -</project> diff --git a/testapps/libsTest/lib1/proguard-project.txt b/testapps/libsTest/lib1/proguard-project.txt deleted file mode 100644 index f2fe1559a..000000000 --- a/testapps/libsTest/lib1/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/testapps/libsTest/lib1/project.properties b/testapps/libsTest/lib1/project.properties deleted file mode 100644 index 480c5b62a..000000000 --- a/testapps/libsTest/lib1/project.properties +++ /dev/null @@ -1,16 +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-15 -android.library=true -android.library.reference.1=../lib2 diff --git a/testapps/libsTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/libsTest/lib1/res/drawable-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 8074c4c57..000000000 --- a/testapps/libsTest/lib1/res/drawable-hdpi/ic_launcher.png +++ /dev/null diff --git a/testapps/libsTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/libsTest/lib1/res/drawable-ldpi/ic_launcher.png Binary files differdeleted file mode 100644 index 1095584ec..000000000 --- a/testapps/libsTest/lib1/res/drawable-ldpi/ic_launcher.png +++ /dev/null diff --git a/testapps/libsTest/lib1/res/drawable-mdpi/ic_launcher.png b/testapps/libsTest/lib1/res/drawable-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index a07c69fa5..000000000 --- a/testapps/libsTest/lib1/res/drawable-mdpi/ic_launcher.png +++ /dev/null diff --git a/testapps/libsTest/lib1/res/layout/lib1_main.xml b/testapps/libsTest/lib1/res/layout/lib1_main.xml deleted file mode 100644 index 3666d1296..000000000 --- a/testapps/libsTest/lib1/res/layout/lib1_main.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/lib1_text1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/lib1_string" /> - - <TextView - android:id="@+id/lib1_text2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> - - <include layout="@layout/lib2_main" /> - -</LinearLayout>
\ No newline at end of file diff --git a/testapps/libsTest/lib1/res/values/strings.xml b/testapps/libsTest/lib1/res/values/strings.xml deleted file mode 100644 index 8d2061094..000000000 --- a/testapps/libsTest/lib1/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <string name="lib1_name">LibsTest-lib1</string> - <string name="lib1_string">SUCCESS-LIB1</string> - -</resources>
\ No newline at end of file diff --git a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.java b/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.java deleted file mode 100644 index c62bec228..000000000 --- a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.android.tests.libstest.lib1; - -import android.app.Activity; -import android.widget.TextView; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -public class Lib1 { - - public static void handleTextView(Activity a) { - TextView tv = (TextView) a.findViewById(R.id.lib1_text2); - if (tv != null) { - tv.setText(Lib1.getContent()); - } - } - - public static String getContent() { - InputStream input = Lib1.class.getResourceAsStream("Lib1.txt"); - if (input == null) { - return "FAILED TO FIND Lib1.txt"; - } - - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); - - return reader.readLine(); - } catch (IOException e) { - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - } - } - } - - return "FAILED TO READ CONTENT"; - } -} diff --git a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.txt b/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.txt deleted file mode 100644 index 452e39773..000000000 --- a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/Lib1.txt +++ /dev/null @@ -1 +0,0 @@ -SUCCESS-LIB1
\ No newline at end of file diff --git a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/MainActivity.java b/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/MainActivity.java deleted file mode 100644 index 078bf64cf..000000000 --- a/testapps/libsTest/lib1/src/com/android/tests/libstest/lib1/MainActivity.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.android.tests.libstest.lib1; - -import android.app.Activity; -import android.os.Bundle; - -import com.android.tests.libstest.lib2.Lib2; - -public class MainActivity extends Activity { - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.lib1_main); - - Lib1.handleTextView(this); - Lib2.handleTextView(this); - } -} |