[automerger] Move exifinterface tests and manifest file to standard gradle directories. am: bf436ad573
Change-Id: I2954d608d0c786e30bb9ded50af1f8d9f1d10933
diff --git a/exifinterface/Android.mk b/exifinterface/Android.mk
index 1571116..18ffcf3 100644
--- a/exifinterface/Android.mk
+++ b/exifinterface/Android.mk
@@ -25,6 +25,7 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
LOCAL_JAVA_LIBRARIES := \
android-support-annotations
LOCAL_JAR_EXCLUDE_FILES := none
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index 67b458f..e81d422 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -19,5 +19,4 @@
mavenGroup = LibraryGroups.SUPPORT
inceptionYear = "2016"
description = "Android Support ExifInterface"
- legacySourceLocation = true
}
diff --git a/exifinterface/tests/AndroidManifest.xml b/exifinterface/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from exifinterface/tests/AndroidManifest.xml
rename to exifinterface/src/androidTest/AndroidManifest.xml
diff --git a/exifinterface/tests/NO_DOCS b/exifinterface/src/androidTest/NO_DOCS
similarity index 100%
rename from exifinterface/tests/NO_DOCS
rename to exifinterface/src/androidTest/NO_DOCS
diff --git a/exifinterface/tests/src/android/support/media/ExifInterfaceTest.java b/exifinterface/src/androidTest/java/android/support/media/ExifInterfaceTest.java
similarity index 95%
rename from exifinterface/tests/src/android/support/media/ExifInterfaceTest.java
rename to exifinterface/src/androidTest/java/android/support/media/ExifInterfaceTest.java
index 8836334..034ba09 100644
--- a/exifinterface/tests/src/android/support/media/ExifInterfaceTest.java
+++ b/exifinterface/src/androidTest/java/android/support/media/ExifInterfaceTest.java
@@ -98,33 +98,33 @@
{ExifInterface.ORIENTATION_NORMAL, -90, ExifInterface.ORIENTATION_ROTATE_270},
{ExifInterface.ORIENTATION_NORMAL, 0, ExifInterface.ORIENTATION_NORMAL},
{ExifInterface.ORIENTATION_NORMAL, 90, ExifInterface.ORIENTATION_ROTATE_90},
- {ExifInterface.ORIENTATION_NORMAL, 180,ExifInterface.ORIENTATION_ROTATE_180},
- {ExifInterface.ORIENTATION_NORMAL, 270,ExifInterface.ORIENTATION_ROTATE_270},
- {ExifInterface.ORIENTATION_NORMAL, 540,ExifInterface.ORIENTATION_ROTATE_180},
+ {ExifInterface.ORIENTATION_NORMAL, 180, ExifInterface.ORIENTATION_ROTATE_180},
+ {ExifInterface.ORIENTATION_NORMAL, 270, ExifInterface.ORIENTATION_ROTATE_270},
+ {ExifInterface.ORIENTATION_NORMAL, 540, ExifInterface.ORIENTATION_ROTATE_180},
{ExifInterface.ORIENTATION_ROTATE_90, -90, ExifInterface.ORIENTATION_NORMAL},
{ExifInterface.ORIENTATION_ROTATE_90, 0, ExifInterface.ORIENTATION_ROTATE_90},
{ExifInterface.ORIENTATION_ROTATE_90, 90, ExifInterface.ORIENTATION_ROTATE_180},
- {ExifInterface.ORIENTATION_ROTATE_90, 180,ExifInterface.ORIENTATION_ROTATE_270},
- {ExifInterface.ORIENTATION_ROTATE_90, 270,ExifInterface.ORIENTATION_NORMAL},
- {ExifInterface.ORIENTATION_ROTATE_90, 540,ExifInterface.ORIENTATION_ROTATE_270},
+ {ExifInterface.ORIENTATION_ROTATE_90, 180 , ExifInterface.ORIENTATION_ROTATE_270},
+ {ExifInterface.ORIENTATION_ROTATE_90, 270, ExifInterface.ORIENTATION_NORMAL},
+ {ExifInterface.ORIENTATION_ROTATE_90, 540, ExifInterface.ORIENTATION_ROTATE_270},
{ExifInterface.ORIENTATION_ROTATE_180, -90, ExifInterface.ORIENTATION_ROTATE_90},
{ExifInterface.ORIENTATION_ROTATE_180, 0, ExifInterface.ORIENTATION_ROTATE_180},
{ExifInterface.ORIENTATION_ROTATE_180, 90, ExifInterface.ORIENTATION_ROTATE_270},
- {ExifInterface.ORIENTATION_ROTATE_180, 180,ExifInterface.ORIENTATION_NORMAL},
- {ExifInterface.ORIENTATION_ROTATE_180, 270,ExifInterface.ORIENTATION_ROTATE_90},
- {ExifInterface.ORIENTATION_ROTATE_180, 540,ExifInterface.ORIENTATION_NORMAL},
+ {ExifInterface.ORIENTATION_ROTATE_180, 180, ExifInterface.ORIENTATION_NORMAL},
+ {ExifInterface.ORIENTATION_ROTATE_180, 270, ExifInterface.ORIENTATION_ROTATE_90},
+ {ExifInterface.ORIENTATION_ROTATE_180, 540, ExifInterface.ORIENTATION_NORMAL},
{ExifInterface.ORIENTATION_ROTATE_270, -90, ExifInterface.ORIENTATION_ROTATE_180},
{ExifInterface.ORIENTATION_ROTATE_270, 0, ExifInterface.ORIENTATION_ROTATE_270},
{ExifInterface.ORIENTATION_ROTATE_270, 90, ExifInterface.ORIENTATION_NORMAL},
- {ExifInterface.ORIENTATION_ROTATE_270, 180,ExifInterface.ORIENTATION_ROTATE_90},
- {ExifInterface.ORIENTATION_ROTATE_270, 270,ExifInterface.ORIENTATION_ROTATE_180},
- {ExifInterface.ORIENTATION_ROTATE_270, 540,ExifInterface.ORIENTATION_ROTATE_90},
+ {ExifInterface.ORIENTATION_ROTATE_270, 180, ExifInterface.ORIENTATION_ROTATE_90},
+ {ExifInterface.ORIENTATION_ROTATE_270, 270, ExifInterface.ORIENTATION_ROTATE_180},
+ {ExifInterface.ORIENTATION_ROTATE_270, 540, ExifInterface.ORIENTATION_ROTATE_90},
{ExifInterface.ORIENTATION_FLIP_VERTICAL, -90, ExifInterface.ORIENTATION_TRANSVERSE},
{ExifInterface.ORIENTATION_FLIP_VERTICAL, 0, ExifInterface.ORIENTATION_FLIP_VERTICAL},
{ExifInterface.ORIENTATION_FLIP_VERTICAL, 90, ExifInterface.ORIENTATION_TRANSPOSE},
{ExifInterface.ORIENTATION_FLIP_VERTICAL, 180,
ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
- {ExifInterface.ORIENTATION_FLIP_VERTICAL, 270,ExifInterface.ORIENTATION_TRANSVERSE},
+ {ExifInterface.ORIENTATION_FLIP_VERTICAL, 270, ExifInterface.ORIENTATION_TRANSVERSE},
{ExifInterface.ORIENTATION_FLIP_VERTICAL, 540,
ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
{ExifInterface.ORIENTATION_FLIP_HORIZONTAL, -90, ExifInterface.ORIENTATION_TRANSPOSE},
@@ -139,15 +139,15 @@
{ExifInterface.ORIENTATION_TRANSPOSE, -90, ExifInterface.ORIENTATION_FLIP_VERTICAL},
{ExifInterface.ORIENTATION_TRANSPOSE, 0, ExifInterface.ORIENTATION_TRANSPOSE},
{ExifInterface.ORIENTATION_TRANSPOSE, 90, ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
- {ExifInterface.ORIENTATION_TRANSPOSE, 180,ExifInterface.ORIENTATION_TRANSVERSE},
- {ExifInterface.ORIENTATION_TRANSPOSE, 270,ExifInterface.ORIENTATION_FLIP_VERTICAL},
- {ExifInterface.ORIENTATION_TRANSPOSE, 540,ExifInterface.ORIENTATION_TRANSVERSE},
+ {ExifInterface.ORIENTATION_TRANSPOSE, 180, ExifInterface.ORIENTATION_TRANSVERSE},
+ {ExifInterface.ORIENTATION_TRANSPOSE, 270, ExifInterface.ORIENTATION_FLIP_VERTICAL},
+ {ExifInterface.ORIENTATION_TRANSPOSE, 540, ExifInterface.ORIENTATION_TRANSVERSE},
{ExifInterface.ORIENTATION_TRANSVERSE, -90, ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
{ExifInterface.ORIENTATION_TRANSVERSE, 0, ExifInterface.ORIENTATION_TRANSVERSE},
{ExifInterface.ORIENTATION_TRANSVERSE, 90, ExifInterface.ORIENTATION_FLIP_VERTICAL},
- {ExifInterface.ORIENTATION_TRANSVERSE, 180,ExifInterface.ORIENTATION_TRANSPOSE},
- {ExifInterface.ORIENTATION_TRANSVERSE, 270,ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
- {ExifInterface.ORIENTATION_TRANSVERSE, 540,ExifInterface.ORIENTATION_TRANSPOSE},
+ {ExifInterface.ORIENTATION_TRANSVERSE, 180, ExifInterface.ORIENTATION_TRANSPOSE},
+ {ExifInterface.ORIENTATION_TRANSVERSE, 270, ExifInterface.ORIENTATION_FLIP_HORIZONTAL},
+ {ExifInterface.ORIENTATION_TRANSVERSE, 540, ExifInterface.ORIENTATION_TRANSPOSE},
};
private static final int[][] TEST_FLIP_VERTICALLY_STATE_MACHINE = {
{ExifInterface.ORIENTATION_UNDEFINED, ExifInterface.ORIENTATION_UNDEFINED},
@@ -260,7 +260,7 @@
return stringValue.trim();
}
- public ExpectedValue(TypedArray typedArray) {
+ ExpectedValue(TypedArray typedArray) {
// Reads thumbnail information.
hasThumbnail = typedArray.getBoolean(0, false);
thumbnailWidth = typedArray.getInt(1, 0);
@@ -706,7 +706,7 @@
if (stringValue != null) {
stringValue = stringValue.trim();
}
- stringValue = (stringValue == "") ? null : stringValue;
+ stringValue = ("".equals(stringValue)) ? null : stringValue;
assertEquals(expectedValue, stringValue);
}
diff --git a/exifinterface/tests/res/raw/image_exif_byte_order_ii.jpg b/exifinterface/src/androidTest/res/raw/image_exif_byte_order_ii.jpg
similarity index 100%
rename from exifinterface/tests/res/raw/image_exif_byte_order_ii.jpg
rename to exifinterface/src/androidTest/res/raw/image_exif_byte_order_ii.jpg
Binary files differ
diff --git a/exifinterface/tests/res/raw/image_exif_byte_order_mm.jpg b/exifinterface/src/androidTest/res/raw/image_exif_byte_order_mm.jpg
similarity index 100%
rename from exifinterface/tests/res/raw/image_exif_byte_order_mm.jpg
rename to exifinterface/src/androidTest/res/raw/image_exif_byte_order_mm.jpg
Binary files differ
diff --git a/exifinterface/tests/res/raw/lg_g4_iso_800.dng b/exifinterface/src/androidTest/res/raw/lg_g4_iso_800.dng
similarity index 100%
rename from exifinterface/tests/res/raw/lg_g4_iso_800.dng
rename to exifinterface/src/androidTest/res/raw/lg_g4_iso_800.dng
Binary files differ
diff --git a/exifinterface/tests/res/values/arrays.xml b/exifinterface/src/androidTest/res/values/arrays.xml
similarity index 100%
rename from exifinterface/tests/res/values/arrays.xml
rename to exifinterface/src/androidTest/res/values/arrays.xml
diff --git a/exifinterface/AndroidManifest.xml b/exifinterface/src/main/AndroidManifest.xml
similarity index 100%
rename from exifinterface/AndroidManifest.xml
rename to exifinterface/src/main/AndroidManifest.xml
