Merge "Progress Dialog documentation example uses onPrepareDialog" (a78eca95) · Commits · e / os / android_frameworks_base

docs/html/guide/topics/ui/dialogs.jd

+11 −6

Original line number	Diff line number	Diff line
		@@ -472,18 +472,25 @@ public class NotificationTest extends Activity {
		progressDialog = new ProgressDialog(NotificationTest.this);
		progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
		progressDialog.setMessage("Loading...");
		progressThread = new ProgressThread(handler);
		progressThread.start();
		return progressDialog;
		default:
		return null;
		}
		}

		@Override
		protected void onPrepareDialog(int id, Dialog dialog) {
		switch(id) {
		case PROGRESS_DIALOG:
		progressDialog.setProgress(0);
		progressThread = new ProgressThread(handler);
		progressThread.start();
		}

		// Define the Handler that receives messages from the thread and update the progress
		final Handler handler = new Handler() {
		public void handleMessage(Message msg) {
		int total = msg.getData().getInt("total");
		int total = msg.arg1;
		progressDialog.setProgress(total);
		if (total >= 100){
		dismissDialog(PROGRESS_DIALOG);
		@@ -514,9 +521,7 @@ public class NotificationTest extends Activity {
		Log.e("ERROR", "Thread Interrupted");
		}
		Message msg = mHandler.obtainMessage();
		Bundle b = new Bundle();
		b.putInt("total", total);
		msg.setData(b);
		msg.arg1 = total;
		mHandler.sendMessage(msg);
		total++;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class BitmapFactory {
		/**
		* The pixel density to use for the bitmap. This will always result
		* in the returned bitmap having a density set for it (see
		* {@link Bitmap#setDensity(int) Bitmap.setDensity(int))}. In addition,
		* {@link Bitmap#setDensity(int) Bitmap.setDensity(int)}). In addition,
		* if {@link #inScaled} is set (which it is by default} and this
		* density does not match {@link #inTargetDensity}, then the bitmap
		* will be scaled to the target density before being returned.