merge
authorDa Risk <darisk972@gmail.com>
Tue, 21 Apr 2009 19:41:58 +0200
changeset 128 52d32ded7b9d
parent 127 395f1beb409f (current diff)
parent 113 01b2fc87427b (diff)
child 129 a223ee5e7faa
merge
src/com/beem/project/beem/BeemApplication.java
src/com/beem/project/beem/ui/ChangeStatus.java
Binary file res/drawable/signal.png has changed
--- a/src/com/beem/project/beem/BeemApplication.java	Tue Apr 21 19:37:32 2009 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Tue Apr 21 19:41:58 2009 +0200
@@ -95,7 +95,7 @@
 	mBeemApp.mActivity = activity;
 	mBeemApp.mProgressDialog = new ProgressDialog(activity);
 	mBeemApp.mProgressDialog.setTitle("Beem");
-	// mBeemApp.mProgressDialog.setIcon(R.drawable.logo);
+	mBeemApp.mProgressDialog.setIcon(R.drawable.signal);
 	mBeemApp.mProgressDialog.setMessage("Connecting...");
 	mBeemApp.mApplicationContext = activity.getApplication();
 	mBeemApp.mPrivateResources = activity.getResources();
@@ -131,7 +131,7 @@
 	    mApplicationContext.unbindService(mServConn);
 	    mIsConnected = false;
 	}
-    }
+     }
 
     /**
      * Get the facade to use to access the Beem service.