summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/src/org/rockbox/RockboxActivity.java7
-rw-r--r--android/src/org/rockbox/RockboxService.java1
2 files changed, 7 insertions, 1 deletions
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index 7c9022e1ba..e50ff59df3 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -22,6 +22,7 @@
22package org.rockbox; 22package org.rockbox;
23 23
24import android.app.Activity; 24import android.app.Activity;
25import android.app.ProgressDialog;
25import android.content.Intent; 26import android.content.Intent;
26import android.os.Bundle; 27import android.os.Bundle;
27import android.util.Log; 28import android.util.Log;
@@ -42,6 +43,11 @@ public class RockboxActivity extends Activity
42 ,WindowManager.LayoutParams.FLAG_FULLSCREEN); 43 ,WindowManager.LayoutParams.FLAG_FULLSCREEN);
43 final Intent intent = new Intent(this, 44 final Intent intent = new Intent(this,
44 RockboxService.class); 45 RockboxService.class);
46 loadingdialog = new ProgressDialog(this);
47 loadingdialog.setMessage("Rockbox Loading. Please wait...");
48 loadingdialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
49 loadingdialog.setCancelable(false);
50 loadingdialog.show();
45 startService(intent); 51 startService(intent);
46 /* Now it gets a bit tricky: 52 /* Now it gets a bit tricky:
47 * The service is started in the same thread as we are now, 53 * The service is started in the same thread as we are now,
@@ -67,6 +73,7 @@ public class RockboxActivity extends Activity
67 runOnUiThread(new Runnable() 73 runOnUiThread(new Runnable()
68 { @Override 74 { @Override
69 public void run() { 75 public void run() {
76 loadingdialog.dismiss();
70 setContentView(RockboxService.fb); 77 setContentView(RockboxService.fb);
71 RockboxService.fb.invalidate(); 78 RockboxService.fb.invalidate();
72 } 79 }
diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java
index 32970821d0..964404c745 100644
--- a/android/src/org/rockbox/RockboxService.java
+++ b/android/src/org/rockbox/RockboxService.java
@@ -38,7 +38,6 @@ import java.util.zip.ZipFile;
38import android.app.Notification; 38import android.app.Notification;
39import android.app.NotificationManager; 39import android.app.NotificationManager;
40import android.app.PendingIntent; 40import android.app.PendingIntent;
41import android.app.ProgressDialog;
42import android.app.Service; 41import android.app.Service;
43import android.content.BroadcastReceiver; 42import android.content.BroadcastReceiver;
44import android.content.Context; 43import android.content.Context;