Merge commit 'korg/cupcake' (5e8c31ac) · Commits · e / os / android_frameworks_base

api/3.xml

+54992 −31245

File changed.

Preview size limit exceeded, changes collapsed.

api/current.xml

+708 −73

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/AlarmManager.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,17 @@ import android.os.ServiceManager;
		* device is asleep (and can optionally wake the device up if they go off
		* during that time), but will be cleared if it is turned off and rebooted.
		*
		* <p>The Alarm Manager holds a CPU wake lock as long as the alarm receiver's
		* onReceive() method is executing. This guarantees that the phone will not sleep
		* until you have finished handling the broadcast. Once onReceive() returns, the
		* Alarm Manager releases this wake lock. This means that the phone will in some
		* cases sleep as soon as your onReceive() method completes. If your alarm receiver
		* called {@link android.content.Context#startService Context.startService()}, it
		* is possible that the phone will sleep before the requested service is launched.
		* To prevent this, your BroadcastReceiver and Service will need to implement a
		* separate wake lock policy to ensure that the phone continues running until the
		* service becomes available.
		*
		* <p><b>Note: The Alarm Manager is intended for cases where you want to have
		* your application code run at a specific time, even if your application is
		* not currently running. For normal timing operations (ticks, timeouts,

core/java/android/app/AlertDialog.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -738,7 +738,10 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set
		* methods
		*
		* @hide pending API review
		*
		* This is currently hidden because it seems like people should just
		* be able to put padding around the view.
		* @hide
		*/
		public Builder setView(View view, int viewSpacingLeft, int viewSpacingTop,
		int viewSpacingRight, int viewSpacingBottom) {

core/java/android/app/ProgressDialog.java

+22 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Message;
		import android.text.Spannable;
		import android.text.SpannableString;
		import android.text.style.StyleSpan;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.ProgressBar;
		@@ -52,6 +55,7 @@ public class ProgressDialog extends AlertDialog {

		private int mProgressStyle = STYLE_SPINNER;
		private TextView mProgressNumber;
		private String mProgressNumberFormat;
		private TextView mProgressPercent;
		private NumberFormat mProgressPercentFormat;

		@@ -121,13 +125,18 @@ public class ProgressDialog extends AlertDialog {
		int progress = mProgress.getProgress();
		int max = mProgress.getMax();
		double percent = (double) progress / (double) max;
		mProgressNumber.setText(progress + "/" + max);
		mProgressPercent.setText(mProgressPercentFormat.format(percent));
		String format = mProgressNumberFormat;
		mProgressNumber.setText(String.format(format, progress, max));
		SpannableString tmp = new SpannableString(mProgressPercentFormat.format(percent));
		tmp.setSpan(new StyleSpan(android.graphics.Typeface.BOLD),
		0, tmp.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
		mProgressPercent.setText(tmp);
		}
		};
		View view = inflater.inflate(R.layout.alert_dialog_progress, null);
		mProgress = (ProgressBar) view.findViewById(R.id.progress);
		mProgressNumber = (TextView) view.findViewById(R.id.progress_number);
		mProgressNumberFormat = "%d/%d";
		mProgressPercent = (TextView) view.findViewById(R.id.progress_percent);
		mProgressPercentFormat = NumberFormat.getPercentInstance();
		mProgressPercentFormat.setMaximumFractionDigits(0);
		@@ -293,6 +302,17 @@ public class ProgressDialog extends AlertDialog {
		mProgressStyle = style;
		}

		/**
		* Change the format of Progress Number. The default is "current/max".
		* Should not be called during the number is progressing.
		* @param format Should contain two "%d". The first is used for current number
		* and the second is used for the maximum.
		* @hide
		*/
		public void setProgressNumberFormat(String format) {
		mProgressNumberFormat = format;
		}

		private void onProgressChanged() {
		if (mProgressStyle == STYLE_HORIZONTAL) {
		mViewUpdateHandler.sendEmptyMessage(0);