Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-17358] (3_4_X) Android: Update Appcompat assets + scons #6346

Closed
wants to merge 10 commits into from
Closed

[TIMOB-17358] (3_4_X) Android: Update Appcompat assets + scons #6346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac9b827
[TIMOB-17358]: Update Appcompat assets + lib
hieupham007 Oct 20, 2014
3a67621
[TIMOB-17358]: Update scons.
hieupham007 Oct 21, 2014
8e2a851
[TIMOB-17358]: Update theme + appcompat assets
hieupham007 Nov 6, 2014
eabd9bd
[TIMOB-17358]: Refactor notification
hieupham007 Nov 6, 2014
33bbf13
[TIMOB-17358]: Fix ActionBar crash
hieupham007 Nov 6, 2014
0c1f8d4
[TIMOB-17358]: Actionbar fixes
hieupham007 Nov 7, 2014
6e706b6
[TIMOB-17358]: Remove workaround
hieupham007 Nov 7, 2014
a73d908
[TIMOB-17358]: Update doc + Minor fixes
hieupham007 Nov 10, 2014
29b7bff
[TIMOB-17358]: Add null checks
hieupham007 Nov 11, 2014
b070077
[TIMOB-17358]: Update docs.
hieupham007 Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion android/modules/accelerometer/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/analytics/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/android/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions android/modules/android/src/java/ti/modules/titanium/android/AndroidModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...d/src/java/ti/modules/titanium/android/notificationmanager/NotificationManagerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down