diff --git a/android/res/drawable-hdpi/notification.png b/android/res/drawable-hdpi/notification.png new file mode 100644 index 0000000000000000000000000000000000000000..84d65662c3c0d04b2f04a6d1fda7e79fceb5da0b GIT binary patch literal 1905 zcmV-%2afoOP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igl1 z5Fi;k6H6ih000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000KeNkl{C|dk5o|6XbEJiL14~E5BM`s`YF~Ps z`{#a?d&7sEg# z>jTyb<0lBWO?1xeI|OIiKtzU>WJbF){mkLFpoHRRR_!r_yavbeDL6NZ(GJZi@X)|Q@5Q>;-| zrKF~7t#e332m(b_$OXc*I*+=E!tW0&KW(&p{0@&>YK8B;9P;4T^R%9J${oXeAK6Mj?!+%qbwSq|h zcCDI1*#OhU8KmSI7=}Xq?LOAR&b=X>DOkPK=ldID)J^bcSRdnLi)GvPJY$oFF-fo? zWOId+LB9bj*2x0LtO{WvYNa5X7Z%KRZMNypAuVn2#KUns-_V&A?)sR|`jt_h-4U?; z&45c+V02QrZIU4$_P>wwq0o|wr9zAKtONvBm{jXAXSzo!15dw}f3_*xHYAA0JV)>W?Ynedt7F!b3>zBC;=-!?qZonala~9|r`Z2iz}X9M z=7RFOKLxa$wpa@rJ|AO#eT00zgnfF{u|fz3(@t_Z;ek&@`TIM{tGl!Owbin8V+zl} zxEdiI6Xwo{Fmsx+`(U2c55%di9C!~At~ut;_JuIYVDE&&hKCY-`pzgVr$a7xC?hI_ z@uLls#~a4g7|va^EZf+@cV5Ww<8PFc&JO(bw$Q{~uT+Dz9(n^8Mc;!NQw=kwMtXfc z!293lv0_o2r(a9)*@bcHKO7+lwV$R^jHp~wr5%JSuZPkb#dn#U@YsXpjIK7k`bL&~ zC_Ucy#PzCF7sGV|y&i^KPMAGC%9v`8U;Z{j zX#1X9Jg|1D(qgdIV7WO%1j@?{v!=(`e<;hUr4@`C>Ghgt09)X>uN3;Enqj%=^f#__ zT4qd*vZJw+GZ&R)mFe@AWL41~2St}o9ZUx(1(Aqh&mS^;W!t;7owpbxoIY>+nyW=W z0DNP_sv5P{pn?p48ihm0vi$Mw3>67OK2XZy9#&27sS2v9#)$PpE9q3mv8gN&wU<=__1rJ|6Bq+L~(@z%NTgCVcA)W0&7C zHF9?>CL>jcKc&Vvbz0l|iYJ0*v-;lAQ@K4`Ub*n|&UC&_BEFCh)KA1r)wD^mks>5) r9|X9W!||N-$#=5vWpegP#FyZ|DJjeXjPe4k00000NkvXXu0mjfB&3Ln literal 0 HcmV?d00001 diff --git a/android/res/drawable-ldpi/notification.png b/android/res/drawable-ldpi/notification.png new file mode 100644 index 0000000000000000000000000000000000000000..22ba84b3222cfc8f4346217604f522d03e2809bc GIT binary patch literal 883 zcmV-(1C0EMP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igl1 z5FrAoZL^O6000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008cNkl78U{!9?QbD2dS!G6r2A5pwY`5HA`cM!k3t2?0SA{{wRr z@ho1&gMy&qThNV<7$3MA1tE?mSu_~j-N`)qSLLC5c9M17{lSOsLse1VddY+LkRNI@ zmu1YlBSnN>A6iWi0cYcwo@9@cYF#jVwei8}?0=TY=yF%U~&oXwZIRXNRyNNv3fw{fV z-VNu@!`q($LBQ8VKpX^fM8~Nbh&ePf;lxql{V(9$1-N(#5HS81S*@SD;8nivikZ^P zloy{>F8u?`Jt_5|*Vz3R83&`Js&x?|ofaA?y!$zvS%9ErhGUym#=b77BSa6F>s18k zDFQswQC@o0=q?JEmy{x|wN;`A93gQ8cfouzR3elG7P#%^z?rjf^ts6XUCLAwo_HXz zeWp}I)dHuIX=B}#m@Cu*X#(H;49h*3%7lB{NTJR;&z#Cy%7O_Flo)XJPh+guC|D zc;(H=!FGy^UgKv7YNl9Buoy6#Fc=2*@2>OIv5eZvf@62AYX;N!1G+;UT(UMrhaj#VJBN`Ks7nOk|a(0$mk zP5Etcz{Nj>9oqu{!6BNU=AjA}JX-a?hN2=`pq?h&xUI%Jr-mRCKl4E1u3p51=q{B| z+34K-@au^AZ--nz6Nr|05nbE_clD${)b8b_(9d&efXHUIYo-;reNT%6w>B6JYT`J{ zE8g!9v@3`2-kKlS)0nH(m@UuI=5H`G>Zz_?+R=#amka&*e*uYBo{81^sd)eZ002ov JPDHLkV1l}1nhF2_ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/notification.png b/android/res/drawable-mdpi/notification.png new file mode 100644 index 0000000000000000000000000000000000000000..0221d4fdd90e6e1068ca03cbc258239ce74bd4f1 GIT binary patch literal 1164 zcmV;71atd|P)P000>X1^@s6#OZ}&00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igl1 z00j-y9PG#d000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000B$Nkl%zQxvLkf(=LaC6ztO!z369O^FggzvK zY$n#%3MwSRpumVCED$6y$*nAR!PYi45Y5G%xpU9y!<}(ooRys(_`&7g^PF?f`Jd-S z0A10+l)^m}5+m!5AP@xrND^?Tt|5X4q1bbgp5xv0N6Xupa$pNx3)@+znTnOeuf0%; zp}hc6BT%j{ki~H7EJwB-WV_DFQ&`Z>I&B6rKn{+bf_1OMJ4a#p%W(WBAPb(U*o*^h zhJ_uhpPi?miIEK%@H7E%m^TCd{2Lxy2K%H7k@?yAt9U zGLevpBrSCa5_TU-`10)r@{?uc_9Mf(%MsivjH;`7TK~3*!Vjm7 z{wwg=w+UOG3bfrNeEn{YdnXIK4#qTOM$NDKL{d$xBGPCap=`?iGXqDzGp-E?yEbLn zzaz_%2Li7hidpqg;M@fe)tWxiOk6MzBpyiYc1mSs<)U=weB-^CRf{te%Yiqy0VVY*KR0#H@DLD;Q%*_f>Zfsig|#l z@QEvl@xRCXIgLze3!FGp=HdC-AzxMDL3}8^`alBRy~d)a`{|gKrRSny3@=vz#3L0g z7E1vQ)NvwJJ3;^>msPsY$81>BN;wHsd#GFj6)i@6m#w$^5Bq%X%!bYo>Wl%*p4P;^ zty58jLcW1`&~II(emh?}+IPu%1w@u~G) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/src/org/rockbox/Helper/RunForegroundManager.java b/android/src/org/rockbox/Helper/RunForegroundManager.java index eb6e4c9..0b3abe7 100644 --- a/android/src/org/rockbox/Helper/RunForegroundManager.java +++ b/android/src/org/rockbox/Helper/RunForegroundManager.java @@ -12,6 +12,7 @@ import android.app.PendingIntent; import android.app.Service; import android.content.Intent; import android.util.Log; +import android.widget.RemoteViews; public class RunForegroundManager { @@ -25,34 +26,32 @@ public class RunForegroundManager public RunForegroundManager(Service service) throws Exception { + mCurrentService = service; mNM = (NotificationManager) service.getSystemService(Service.NOTIFICATION_SERVICE); - /* For now we'll use the same text for the ticker and the - * expanded notification */ - CharSequence text = service.getText(R.string.notification); - /* Set the icon, scrolling text and timestamp */ - mNotification = new Notification(R.drawable.icon, text, - System.currentTimeMillis()); - - /* The PendingIntent to launch our activity if the user selects - * this notification */ + RemoteViews views = new RemoteViews(service.getPackageName(), R.layout.statusbar); + /* create Intent for clicking on the expanded notifcation area */ Intent intent = new Intent(service, RockboxActivity.class); - PendingIntent contentIntent = - PendingIntent.getActivity(service, 0, intent, 0); + intent = intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + + mNotification = new Notification(); + mNotification.tickerText = service.getString(R.string.notification); + mNotification.icon = R.drawable.notification; + mNotification.contentView = views; + mNotification.flags |= Notification.FLAG_ONGOING_EVENT; + mNotification.contentIntent = PendingIntent.getActivity(service, 0, intent, 0); - /* Set the info for the views that show in the notification panel. */ - mNotification.setLatestEventInfo(service, - service.getText(R.string.notification), text, contentIntent); - try { api = new newForegroundApi(R.string.notification, mNotification); } catch (NoSuchMethodException e) { /* Fall back on the old API */ api = new oldForegroundApi(); } - mCurrentService = service; } - + private void LOG(CharSequence text) + { + Log.d("Rockbox", (String)text); + } private void LOG(CharSequence text, Throwable tr) { Log.d("Rockbox", (String)text, tr); @@ -82,7 +81,26 @@ public class RunForegroundManager mNM.cancel(R.string.notification); api.stopForeground(); } + + private void updateNotificationText(String title, String line1, String line2) + { + RemoteViews views = mNotification.contentView; + String ticker; + views.setTextViewText(R.id.title, title); + views.setTextViewText(R.id.content_line1, line1); + views.setTextViewText(R.id.content_line2, line2); + if (line1 != null && line1 != "") + ticker = title + " - " + line1; + else + ticker = title; + mNotification.tickerText = ticker; + } + public void setNotificationText(String title, String line1, String line2) + { + updateNotificationText(title, line1, line2); + mNM.notify(R.string.notification, mNotification); + } private interface IRunForeground { diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java index 0737bf8..021fcc9 100644 --- a/android/src/org/rockbox/RockboxService.java +++ b/android/src/org/rockbox/RockboxService.java @@ -117,10 +117,13 @@ public class RockboxService extends Service /* Display a notification about us starting. * We put an icon in the status bar. */ - try { - fg_runner = new RunForegroundManager(this); - } catch (Exception e) { - e.printStackTrace(); + if (fg_runner == null) + { + try { + fg_runner = new RunForegroundManager(this); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/apps/SOURCES b/apps/SOURCES index c3020ec..0d0daf8 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -91,6 +91,7 @@ gui/statusbar-skinned.c #endif #if (CONFIG_PLATFORM&PLATFORM_ANDROID) hosted/yesno.c +hosted/notification.c #else gui/yesno.c #endif diff --git a/apps/apps.make b/apps/apps.make index 6afcd12..a430288 100644 --- a/apps/apps.make +++ b/apps/apps.make @@ -8,6 +8,9 @@ # INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) +ifdef APP_TYPE + INCLUDES += -I$(APPSDIR)/hosted +endif SRC += $(call preprocess, $(APPSDIR)/SOURCES) # apps/features.txt is a file that (is preprocessed and) lists named features diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 7d633ad..717a58a 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -1189,6 +1189,8 @@ static void wps_state_init(void) /* add the WPS track event callbacks */ add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, track_changed_callback); add_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, false, nextid3available_callback); + extern void notification_init(void); + notification_init(); } diff --git a/apps/hosted/notification.c b/apps/hosted/notification.c new file mode 100644 index 0000000..205c2a1 --- /dev/null +++ b/apps/hosted/notification.c @@ -0,0 +1,52 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "notification.h" +#include "appevents.h" +#include "string-extra.h" +#include "metadata.h" +#include "misc.h" + +/* + * notify about track change, and show track info */ +static void track_changed_callback(void *param) +{ + struct mp3entry* id3 = (struct mp3entry*)param; + if (id3) + { + char buf[100]; + const char * headline = id3->title; + if (!headline) + { /* pass the filename if id3 info isn't available */ + headline = + strip_extension(buf, sizeof(buf), strrchr(id3->path,'/') + 1); + } + const char * content1 = id3->artist; + const char * content2 = id3->album; + notification_notify(headline, content1, content2); + } +} + +void notification_init(void) +{ + notification_init_target(); + add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, track_changed_callback); +} diff --git a/apps/hosted/notification.h b/apps/hosted/notification.h new file mode 100644 index 0000000..af5e054 --- /dev/null +++ b/apps/hosted/notification.h @@ -0,0 +1,28 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef __NOTIFICATION_H__ +#define __NOTIFICATION_H__ + +#include "notification-target.h" +void notification_init(void); + +#endif diff --git a/apps/main.c b/apps/main.c index 950168d..00b2830 100644 --- a/apps/main.c +++ b/apps/main.c @@ -76,6 +76,9 @@ #include "skin_engine/skin_engine.h" #include "statusbar-skinned.h" #include "bootchart.h" +#if defined(APPLICATION) && (CONFIG_PLATFORM & PLATFORM_ANDROID) +#include "notification.h" +#endif #ifdef IPOD_ACCESSORY_PROTOCOL #include "iap.h" @@ -333,11 +336,11 @@ static void init_tagcache(void) static void init(void) { + system_init(); + kernel_init(); #ifdef APPLICATION paths_init(); #endif - system_init(); - kernel_init(); buffer_init(); enable_irq(); lcd_init(); @@ -351,6 +354,9 @@ static void init(void) #if (CONFIG_PLATFORM & PLATFORM_SDL) sim_tasks_init(); #endif +#if (CONFIG_PLATFORM & PLATFORM_ANDROID) + notification_init(); +#endif lang_init(core_language_builtin, language_strings, LANG_LAST_INDEX_IN_ARRAY); #ifdef DEBUG diff --git a/firmware/SOURCES b/firmware/SOURCES index a2aaac1..6b3ceea 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1717,6 +1717,7 @@ target/hosted/android/system-android.c target/hosted/android/telephony-android.c #ifdef APPLICATION target/hosted/android/app/button-application.c +target/hosted/android/app/notification-application.c #endif drivers/audio/android.c thread.c diff --git a/firmware/target/hosted/android/app/notification-application.c b/firmware/target/hosted/android/app/notification-application.c new file mode 100644 index 0000000..9eb52ac --- /dev/null +++ b/firmware/target/hosted/android/app/notification-application.c @@ -0,0 +1,66 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include "notification-target.h" + +extern JNIEnv *env_ptr; +extern jclass RockboxService_class; +extern jobject RockboxService_instance; + +static jmethodID setNotificationText; +static jobject NotificationManager_instance; +static jstring _headline, _content1, _content2; + + +bool notification_notify(const char *headline, + const char *content1, + const char *content2) +{ + JNIEnv e = *env_ptr; + /* passing NULL to DeleteLocalRef() is OK */ + e->DeleteLocalRef(env_ptr, _headline); + e->DeleteLocalRef(env_ptr, _content1); + e->DeleteLocalRef(env_ptr, _content2); + + _headline = e->NewStringUTF(env_ptr, headline); + _content1 = e->NewStringUTF(env_ptr, content1); + _content2 = e->NewStringUTF(env_ptr, content2); + + e->CallVoidMethod(env_ptr, NotificationManager_instance, + setNotificationText, _headline, _content1, _content2); + return true; +} + +void notification_init_target(void) +{ + JNIEnv e = *env_ptr; + jfieldID nNM = e->GetFieldID(env_ptr, RockboxService_class, + "fg_runner", "Lorg/rockbox/Helper/RunForegroundManager;"); + NotificationManager_instance = e->GetObjectField(env_ptr, + RockboxService_instance, nNM); + + jclass class = e->GetObjectClass(env_ptr, NotificationManager_instance); + setNotificationText = e->GetMethodID(env_ptr, class, "setNotificationText", + "(Ljava/lang/String;" + "Ljava/lang/String;" + "Ljava/lang/String;)V"); +} diff --git a/firmware/target/hosted/android/app/notification-target.h b/firmware/target/hosted/android/app/notification-target.h new file mode 100644 index 0000000..7c90da4 --- /dev/null +++ b/firmware/target/hosted/android/app/notification-target.h @@ -0,0 +1,31 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#ifndef __NOTIFICATION_TARGET_H__ +#define __NOTIFICATION_TARGET_H__ +#include + +void notification_init_target(void); +bool notification_notify(const char *headline, + const char *content1, + const char *content2); +#endif