From: Mike Beattie Date: Sun, 26 Feb 2012 09:30:09 +0000 (+1300) Subject: Adjust service to be persistent. X-Git-Tag: 1.1~67^2~37 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=fc9aed1ef3485d259722c9b89e19969e0afe257c;ds=sidebyside Adjust service to be persistent. * Run as a foreground service -> high priority * Notification set to display as "Ongoing". Changed logo to be in colour at keithp's request. Greyscale logos still present as *_g.png Signed-off-by: Mike Beattie --- diff --git a/altosdroid/res/drawable-hdpi/am_status.png b/altosdroid/res/drawable-hdpi/am_status.png deleted file mode 100644 index 03f9dd7d..00000000 Binary files a/altosdroid/res/drawable-hdpi/am_status.png and /dev/null differ diff --git a/altosdroid/res/drawable-hdpi/am_status_c.png b/altosdroid/res/drawable-hdpi/am_status_c.png new file mode 100644 index 00000000..d4393217 Binary files /dev/null and b/altosdroid/res/drawable-hdpi/am_status_c.png differ diff --git a/altosdroid/res/drawable-hdpi/am_status_g.png b/altosdroid/res/drawable-hdpi/am_status_g.png new file mode 100644 index 00000000..03f9dd7d Binary files /dev/null and b/altosdroid/res/drawable-hdpi/am_status_g.png differ diff --git a/altosdroid/res/drawable-mdpi/am_status.png b/altosdroid/res/drawable-mdpi/am_status.png deleted file mode 100644 index 07f7f073..00000000 Binary files a/altosdroid/res/drawable-mdpi/am_status.png and /dev/null differ diff --git a/altosdroid/res/drawable-mdpi/am_status_c.png b/altosdroid/res/drawable-mdpi/am_status_c.png new file mode 100644 index 00000000..30a8d29a Binary files /dev/null and b/altosdroid/res/drawable-mdpi/am_status_c.png differ diff --git a/altosdroid/res/drawable-mdpi/am_status_g.png b/altosdroid/res/drawable-mdpi/am_status_g.png new file mode 100644 index 00000000..07f7f073 Binary files /dev/null and b/altosdroid/res/drawable-mdpi/am_status_g.png differ diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml index 249550fb..72a4ddec 100644 --- a/altosdroid/res/values/strings.xml +++ b/altosdroid/res/values/strings.xml @@ -39,24 +39,27 @@ Control Service (Un)Bind Service + + - AltOS Telemetry Service + AltosDroid Telemetry Service Telemetry Service Started Telemetry Service Stopped - - App/Service/Local Service Controller - This demonstrates how you can implement persistent services that - may be started and stopped as desired. + + Telemetry Service Controller + Use the following buttons to start and stop the Telemetry + service. Start Service Stop Service - App/Service/Local Service Binding + Telemetry Service Binding This demonstrates how you can connect with a persistent service. Notice how it automatically starts for you, and play around with the interaction between this and Local Service Controller. Bind Service Unbind Service + Connected to local service Disconnected from local service diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java index 40dff354..c0a32c92 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java @@ -37,7 +37,7 @@ public class TelemetryService extends Service { // Unique Identification Number for the Notification. // We use it on Notification start, and to cancel it. - private int NOTIFICATION = R.string.telemetry_service_started; + private int NOTIFICATION = R.string.telemetry_service_label; /** * Class for clients to access. Because we know this service always @@ -52,15 +52,32 @@ public class TelemetryService extends Service { @Override public void onCreate() { + // Create a reference to the NotificationManager so that we can update our notifcation text later mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); - - // Display a notification about us starting. We put an icon in the status bar. - showNotification(); } @Override public int onStartCommand(Intent intent, int flags, int startId) { Log.i("TelemetryService", "Received start id " + startId + ": " + intent); + + CharSequence text = getText(R.string.telemetry_service_started); + + // Create notification to be displayed while the service runs + Notification notification = new Notification(R.drawable.am_status_c, text, 0); + + // The PendingIntent to launch our activity if the user selects this notification + PendingIntent contentIntent = PendingIntent.getActivity(this, 0, + new Intent(this, TelemetryServiceActivities.Controller.class), 0); + + // Set the info for the views that show in the notification panel. + notification.setLatestEventInfo(this, getText(R.string.telemetry_service_label), text, contentIntent); + + // Set the notification to be in the "Ongoing" section. + notification.flags |= Notification.FLAG_ONGOING_EVENT; + + // Move us into the foreground. + startForeground(NOTIFICATION, notification); + // We want this service to continue running until it is explicitly // stopped, so return sticky. return START_STICKY; @@ -68,8 +85,8 @@ public class TelemetryService extends Service { @Override public void onDestroy() { - // Cancel the persistent notification. - mNM.cancel(NOTIFICATION); + // Demote us from the foreground, and cancel the persistent notification. + stopForeground(true); // Tell the user we stopped. Toast.makeText(this, R.string.telemetry_service_stopped, Toast.LENGTH_SHORT).show(); @@ -84,26 +101,4 @@ public class TelemetryService extends Service { // RemoteService for a more complete example. private final IBinder mBinder = new TelemetryBinder(); - /** - * Show a notification while this service is running. - */ - private void showNotification() { - // In this sample, we'll use the same text for the ticker and the expanded notification - CharSequence text = getText(R.string.telemetry_service_started); - - // Set the icon, scrolling text and timestamp - Notification notification = new Notification(R.drawable.am_status, text, - System.currentTimeMillis()); - - // The PendingIntent to launch our activity if the user selects this notification - PendingIntent contentIntent = PendingIntent.getActivity(this, 0, - new Intent(this, TelemetryServiceActivities.Controller.class), 0); - - // Set the info for the views that show in the notification panel. - notification.setLatestEventInfo(this, getText(R.string.telemetry_service_label), - text, contentIntent); - - // Send the notification. - mNM.notify(NOTIFICATION, notification); - } }