Merge pull request #6247 from hieupham007/timob-17358-2

[Timob-17358]: Update Appcompat assets + scons
tidev · Nov 12, 2014 · 35e5860 · 35e5860
2 parents 6c38157 + ba58ea4
commit 35e5860
Show file tree

Hide file tree

Showing 596 changed files with 4,385 additions and 2,047 deletions.
diff --git a/SConstruct b/SConstruct
@@ -112,7 +112,7 @@ if build_type in ['full', 'android'] and not only_package:
 	d = os.getcwd()
 	os.chdir('android')
 	try:
-		sdk = AndroidSDK(ARGUMENTS.get("android_sdk", None), 17)
+		sdk = AndroidSDK(ARGUMENTS.get("android_sdk", None), 21)
 		build_x86 = int(ARGUMENTS.get('build_x86', 1))
 
 		# TODO re-enable javadoc targets = ["full.build", "build.titanium.javadoc"]

diff --git a/android/modules/accelerometer/project.properties b/android/modules/accelerometer/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:16
+target=android-21
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/analytics/project.properties b/android/modules/analytics/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:16
+target=android-21
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/android/project.properties b/android/modules/android/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:16
+target=android-21
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/android/src/java/ti/modules/titanium/android/AndroidModule.java b/android/modules/android/src/java/ti/modules/titanium/android/AndroidModule.java
@@ -26,6 +26,7 @@
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.ActionBar;
 import android.content.Context;
 import android.content.Intent;
@@ -223,6 +224,28 @@ public class AndroidModule extends KrollModule
 	@Kroll.constant public static final int FLAG_ONLY_ALERT_ONCE = Notification.FLAG_ONLY_ALERT_ONCE;
 	@Kroll.constant public static final int FLAG_SHOW_LIGHTS = Notification.FLAG_SHOW_LIGHTS;
 	@Kroll.constant public static final int STREAM_DEFAULT = Notification.STREAM_DEFAULT;
+	@Kroll.constant public static final int VISIBILITY_PRIVATE = NotificationCompat.VISIBILITY_PRIVATE;
+	@Kroll.constant public static final int VISIBILITY_PUBLIC = NotificationCompat.VISIBILITY_PUBLIC;
+	@Kroll.constant public static final int VISIBILITY_SECRET = NotificationCompat.VISIBILITY_SECRET;
+	@Kroll.constant public static final int PRIORITY_HIGH = NotificationCompat.PRIORITY_HIGH;
+	@Kroll.constant public static final int PRIORITY_MAX = NotificationCompat.PRIORITY_MAX;
+	@Kroll.constant public static final int PRIORITY_DEFAULT = NotificationCompat.PRIORITY_DEFAULT;
+	@Kroll.constant public static final int PRIORITY_LOW = NotificationCompat.PRIORITY_LOW;
+	@Kroll.constant public static final int PRIORITY_MIN = NotificationCompat.PRIORITY_MIN;
+	@Kroll.constant public static final String CATEGORY_ALARM = NotificationCompat.CATEGORY_ALARM;
+	@Kroll.constant public static final String CATEGORY_CALL = NotificationCompat.CATEGORY_CALL;
+	@Kroll.constant public static final String CATEGORY_EMAIL = NotificationCompat.CATEGORY_EMAIL;
+	@Kroll.constant public static final String CATEGORY_ERROR = NotificationCompat.CATEGORY_ERROR;
+	@Kroll.constant public static final String CATEGORY_EVENT = NotificationCompat.CATEGORY_EVENT;
+	@Kroll.constant public static final String CATEGORY_MESSAGE = NotificationCompat.CATEGORY_MESSAGE;
+	@Kroll.constant public static final String CATEGORY_PROGRESS = NotificationCompat.CATEGORY_PROGRESS;
+	@Kroll.constant public static final String CATEGORY_PROMO = NotificationCompat.CATEGORY_PROMO;
+	@Kroll.constant public static final String CATEGORY_RECOMMENDATION = NotificationCompat.CATEGORY_RECOMMENDATION;
+	@Kroll.constant public static final String CATEGORY_SERVICE = NotificationCompat.CATEGORY_SERVICE;
+	@Kroll.constant public static final String CATEGORY_SOCIAL = NotificationCompat.CATEGORY_SOCIAL;
+	@Kroll.constant public static final String CATEGORY_STATUS = NotificationCompat.CATEGORY_STATUS;
+	@Kroll.constant public static final String CATEGORY_TRANSPORT = NotificationCompat.CATEGORY_TRANSPORT;
+
 
 	@Kroll.constant public static final int START_NOT_STICKY = Service.START_NOT_STICKY;
 	@Kroll.constant public static final int START_REDELIVER_INTENT = Service.START_REDELIVER_INTENT;

diff --git a/...d/src/java/ti/modules/titanium/android/notificationmanager/NotificationManagerModule.java b/...d/src/java/ti/modules/titanium/android/notificationmanager/NotificationManagerModule.java
@@ -75,7 +75,7 @@ public void cancelAll()
 	@Kroll.method
 	public void notify(int id, NotificationProxy notificationProxy)
 	{
-		getManager().notify(id, notificationProxy.getNotification());
+		getManager().notify(id, notificationProxy.buildNotification());
 	}
 
 	@Override