diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-10-28 11:30:31 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-10-28 11:30:31 +0000 |
commit | 1a2851c298d9af88d5e0626ed4dedfde97364104 (patch) | |
tree | 3f4d30df32eafb7d071abf9d68e134057cc2053f | |
parent | d7bb580b5087c02a6b9579be4ae51b6ceafe5230 (diff) | |
download | rockbox-1a2851c298d9af88d5e0626ed4dedfde97364104.tar.gz rockbox-1a2851c298d9af88d5e0626ed4dedfde97364104.zip |
Redo "r28369, Android load progress screen". git+svn lost the actual code changed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28372 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | android/src/org/rockbox/RockboxActivity.java | 7 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxService.java | 1 |
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 @@ | |||
22 | package org.rockbox; | 22 | package org.rockbox; |
23 | 23 | ||
24 | import android.app.Activity; | 24 | import android.app.Activity; |
25 | import android.app.ProgressDialog; | ||
25 | import android.content.Intent; | 26 | import android.content.Intent; |
26 | import android.os.Bundle; | 27 | import android.os.Bundle; |
27 | import android.util.Log; | 28 | import 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; | |||
38 | import android.app.Notification; | 38 | import android.app.Notification; |
39 | import android.app.NotificationManager; | 39 | import android.app.NotificationManager; |
40 | import android.app.PendingIntent; | 40 | import android.app.PendingIntent; |
41 | import android.app.ProgressDialog; | ||
42 | import android.app.Service; | 41 | import android.app.Service; |
43 | import android.content.BroadcastReceiver; | 42 | import android.content.BroadcastReceiver; |
44 | import android.content.Context; | 43 | import android.content.Context; |