CHG: [droid] wraps native activity in a java class

koying · Mar 14, 2013 · 9bcc05a · 9bcc05a
1 parent 740be0a
commit 9bcc05a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
@@ -32,7 +32,7 @@
              This will take care of integrating with our NDK code.
         -->
         <activity
-            android:name="android.app.NativeActivity"
+            android:name=".Main"
             android:configChanges="orientation|keyboardHidden"
             android:finishOnTaskLaunch="true"
             android:label="XBMC"

diff --git a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java
@@ -0,0 +1,19 @@
+package org.xbmc.xbmc;
+
+import android.app.NativeActivity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class Main extends NativeActivity 
+{
+  public Main() 
+  {
+    super();
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) 
+  {
+    super.onCreate(savedInstanceState);
+  }
+}
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java
@@ -238,7 +238,7 @@ private boolean CheckCpuFeature(String feat) {
   protected void startXBMC() {
     // Run XBMC
     Intent intent = new Intent();
-    intent.setClass(this, android.app.NativeActivity.class);
+    intent.setClass(this, org.xbmc.xbmc.Main.class);
     startActivity(intent);
     finish();
   }
@@ -254,7 +254,7 @@ public void onCreate(Bundle savedInstanceState) {
         .getRunningTasks(Integer.MAX_VALUE);
     for (RunningTaskInfo task : tasks)
       if (task.topActivity.toString().equalsIgnoreCase(
-          "ComponentInfo{org.xbmc.xbmc/android.app.NativeActivity}")) {
+          "ComponentInfo{org.xbmc.xbmc/org.xbmc.xbmc.Main}")) {
         // XBMC already running; just activate it
         startXBMC();
         return;