Updates for Android SDK 23.

AndroidManifest:
  Updated to reflect new required SDK: 18.

common.mk:
  Update to use current build tools and for my directory layout.
  Will investigate using variables for build system.

src/Task.java
  Use NotificationBuilder for Task notification
  Run is no longer overridden ?
  Use OnStartCommand instead of onStart.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e09fcda2fae7bc9ee780044d68be9dba3bf6237d..3bb3da91272a50a472aad2bc5ca1243bad873bd4 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,7 +5,7 @@
        android:versionName="1.0">
        <uses-permission android:name="android.permission.INTERNET" />
        <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
        android:versionName="1.0">
        <uses-permission android:name="android.permission.INTERNET" />
        <uses-feature android:glEsVersion="0x00020000" android:required="true"/>

-       <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="18" />
+       <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="23" />

        <application android:label="@string/app_name"
                android:icon="@drawable/icon">
                <activity android:name="Main"
        <application android:label="@string/app_name"
                android:icon="@drawable/icon">
                <activity android:name="Main"

diff --git a/common.mk b/common.mk
index 89d6c280806c1f3f30f78744bf6f936c03b3f56a..2104b981fcfae4a46d0f8baf37e61e204958c900 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,9 +2,9 @@
 KEYFILE ?= ~/.android/android.p12
 KEYTYPE ?= pkcs12
 KEYNAME ?= android
 KEYFILE ?= ~/.android/android.p12
 KEYTYPE ?= pkcs12
 KEYNAME ?= android

-ANDROID ?= /opt/android-sdk-update-manager/platforms/android-18/android.jar
+ANDROID ?= /opt/android-sdk-update-manager/platforms/android-23/android.jar

 SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar
 SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar

-TOOLS   ?= /opt/android-sdk-update-manager/build-tools/20.0.0
+TOOLS   ?= /opt/android-sdk-update-manager/build-tools/23.0.2

 
 # Variables
 PATH    := $(PATH):$(TOOLS)
 
 # Variables
 PATH    := $(PATH):$(TOOLS)


@@ -117,8 +117,8 @@ $(OBJ): $(SRC) $(GEN) makefile | obj
                -Xlint:deprecation        \
                -bootclasspath $(ANDROID) \
                -encoding      UTF-8      \
                -Xlint:deprecation        \
                -bootclasspath $(ANDROID) \
                -encoding      UTF-8      \

-               -source        1.5        \
-               -target        1.5        \
+               -source        1.7        \
+               -target        1.7        \

                -classpath     obj        \
                -d             obj        \
                $(filter-out makefile,$+)
                -classpath     obj        \
                -d             obj        \
                $(filter-out makefile,$+)

diff --git a/src/Task.java b/src/Task.java
index 26e0bd872343b7ce1a09c78755970ff5920d9ca6..f912a574fa4b809a6029b4417dd1073f4fa0faad 100644 (file)
--- a/src/Task.java
+++ b/src/Task.java
@@ -58,11 +58,17 @@ public class Task extends Service implements Runnable
                this.command(NOTIFY, text);
 
                // Notification bar
                this.command(NOTIFY, text);
 
                // Notification bar

-               Notification  note   = new Notification(icon, null, 0);

                Intent        intent = new Intent(this, Main.class);
                PendingIntent pend   = PendingIntent.getActivity(this, 0, intent, 0);
 
                Intent        intent = new Intent(this, Main.class);
                PendingIntent pend   = PendingIntent.getActivity(this, 0, intent, 0);
 

-               note.setLatestEventInfo(this, "Spades!", text, pend);
+               Notification.Builder nb = new Notification.Builder(this)
+                               .setContentIntent(pend)
+                               .setSmallIcon(icon)
+                               .setContentTitle("Spades!")
+                               .setOngoing(true)
+                               .setContentText(text);
+
+               Notification note = nb.build();

                this.startForeground(1, note);
        }
 
                this.startForeground(1, note);
        }
 


@@ -134,7 +140,6 @@ public class Task extends Service implements Runnable
        }
 
        /* Runnable methods */
        }
 
        /* Runnable methods */

-       @Override

        public void run()
        {
                Os.debug("Task: thread run");
        public void run()
        {
                Os.debug("Task: thread run");


@@ -221,14 +226,14 @@ public class Task extends Service implements Runnable
        }
 
        @Override
        }
 
        @Override

-       @SuppressWarnings("deprecation")
-       public void onStart(Intent intent, int startId)
+       public int onStartCommand(Intent intent, int flags, int startId)

        {
                Os.debug("Task: onStart");
        {
                Os.debug("Task: onStart");

-               super.onStart(intent, startId);
+               super.onStartCommand(intent, flags, startId);

                int       cmd = intent.getExtras().getInt("Command");
                Messenger mgr = (Messenger)intent.getExtras().get("Messenger");
                this.handle(cmd, mgr);
                int       cmd = intent.getExtras().getInt("Command");
                Messenger mgr = (Messenger)intent.getExtras().get("Messenger");
                this.handle(cmd, mgr);

+               return START_STICKY;

        }
 
        @Override
        }
 
        @Override