Add dependency to prebuilt wearable jar.
Bug 14131130
Change-Id: Ia8af84c25bc7ab9450907184022c9a577ec7effd
(cherry picked from commit b73a16671e5ff1d5a7bfd4fb0ff40053f524a0d6)
diff --git a/Android.mk b/Android.mk
index bbc3587..bc81af2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,6 @@
##################################################
include $(CLEAR_VARS)
-# STOPSHIP: Use the real support jar before ship.
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- wearable-preview-support:libs/wearable-preview-support.jar
-
include $(BUILD_MULTI_PREBUILT)
##################################################
@@ -47,7 +43,8 @@
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker
-LOCAL_STATIC_JAVA_LIBRARIES += wearable-preview-support
+# STOPSHIP: Open source the wearable support jar
+LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support
LOCAL_SDK_VERSION := current
diff --git a/libs/wearable-preview-support.jar b/libs/wearable-preview-support.jar
deleted file mode 100644
index 423ba82..0000000
--- a/libs/wearable-preview-support.jar
+++ /dev/null
Binary files differ
diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index 15b151e..6dd05fc 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java
@@ -28,10 +28,10 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
-import android.preview.support.wearable.notifications.RemoteInput;
-import android.preview.support.wearable.notifications.WearableNotifications;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
+import android.support.wearable.notifications.RemoteInput;
+import android.support.wearable.notifications.WearableNotifications;
import android.widget.RemoteViews;
import com.android.mail.MailIntentService;
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 83bded2..fa93733 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -29,13 +29,13 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.preview.support.v4.app.NotificationManagerCompat;
-import android.preview.support.wearable.notifications.WearableNotifications;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.Contacts.Photo;
import android.support.v4.app.NotificationCompat;
import android.support.v4.text.BidiFormatter;
import android.support.v4.util.ArrayMap;
+import android.support.wearable.notifications.WearableNotifications;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;