Merge branch 'ub-launcher3-dorval' into launcher3merge
am: 7e0801eafb
Change-Id: Idea7a9c3217661f1b570dbd835dfe85ea2f00cb0
diff --git a/src/com/android/launcher3/graphics/IconShapeOverride.java b/src/com/android/launcher3/graphics/IconShapeOverride.java
index 6e4d366..f78f8a5 100644
--- a/src/com/android/launcher3/graphics/IconShapeOverride.java
+++ b/src/com/android/launcher3/graphics/IconShapeOverride.java
@@ -134,7 +134,7 @@
private final int mOverrideId;
private final String mOverrideValue;
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
public ResourcesOverride(Resources parent, int overrideId, String overrideValue) {
super(parent.getAssets(), parent.getDisplayMetrics(), parent.getConfiguration());
mOverrideId = overrideId;
diff --git a/tests/Android.mk b/tests/Android.mk
index c7d4737..6e6453c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,8 +20,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
ub-uiautomator \
- mockito-target-minus-junit4 \
- legacy-android-test
+ legacy-android-test \
+ mockito-target-minus-junit4
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml