Merge change 26130 into eclair (7f3fb7de) · Commits · e / os / android_frameworks_base

api/current.xml

+26 −0

Original line number	Diff line number	Diff line
		@@ -36741,6 +36741,17 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_ACTIVITY_NO_ANIMATION"
		type="int"
		transient="false"
		volatile="false"
		value="65536"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_ACTIVITY_NO_HISTORY"
		type="int"
		transient="false"
		@@ -134820,6 +134831,21 @@
		<parameter name="addr" type="int">
		</parameter>
		</method>
		<method name="formatShortFileSize"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="context" type="android.content.Context">
		</parameter>
		<parameter name="number" type="long">
		</parameter>
		</method>
		</class>
		<class name="Time"
		extends="java.lang.Object"

+2 −2

Original line number	Diff line number	Diff line
		@@ -790,8 +790,8 @@ public class Activity extends ContextThemeWrapper
		* @see #onPostCreate
		*/
		protected void onCreate(Bundle savedInstanceState) {
		mVisibleFromClient = mWindow.getWindowStyle().getBoolean(
		com.android.internal.R.styleable.Window_windowNoDisplay, true);
		mVisibleFromClient = !mWindow.getWindowStyle().getBoolean(
		com.android.internal.R.styleable.Window_windowNoDisplay, false);
		mCalled = true;
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -2317,6 +2317,18 @@ public class Intent implements Parcelable {
		* specified.
		*/
		public static final int FLAG_ACTIVITY_REORDER_TO_FRONT = 0X00020000;
		/**
		* If set in an Intent passed to {@link Context#startActivity Context.startActivity()},
		* this flag will prevent the system from applying an activity transition
		* animation to go to the next activity state. This doesn't mean an
		* animation will never run -- if another activity change happens that doesn't
		* specify this flag before the activity started here is displayed, then
		* that transition will be used. This this flag can be put to good use
		* when you are going to do a series of activity operations but the
		* animation seen by the user shouldn't be driven by the first activity
		* change but rather a later one.
		*/
		public static final int FLAG_ACTIVITY_NO_ANIMATION = 0X00010000;
		/**
		* If set, when sending a broadcast only registered receivers will be
		* called -- no BroadcastReceiver components will be launched.

+29 −6

Original line number	Diff line number	Diff line
		@@ -32,6 +32,18 @@ public final class Formatter {
		* @return formated string with the number
		*/
		public static String formatFileSize(Context context, long number) {
		return formatFileSize(context, number, false);
		}

		/**
		* Like {@link #formatFileSize}, but trying to generate shorter numbers
		* (showing fewer digits of precisin).
		*/
		public static String formatShortFileSize(Context context, long number) {
		return formatFileSize(context, number, true);
		}

		private static String formatFileSize(Context context, long number, boolean shorter) {
		if (context == null) {
		return "";
		}
		@@ -58,13 +70,24 @@ public final class Formatter {
		suffix = com.android.internal.R.string.petabyteShort;
		result = result / 1024;
		}
		if (result < 100) {
		String value = String.format("%.2f", result);
		return context.getResources().
		getString(com.android.internal.R.string.fileSizeSuffix,
		value, context.getString(suffix));
		String value;
		if (result < 1) {
		value = String.format("%.2f", result);
		} else if (result < 10) {
		if (shorter) {
		value = String.format("%.1f", result);
		} else {
		value = String.format("%.2f", result);
		}
		} else if (result < 100) {
		if (shorter) {
		value = String.format("%.0f", result);
		} else {
		value = String.format("%.2f", result);
		}
		} else {
		value = String.format("%.0f", result);
		}
		String value = String.format("%.0f", result);
		return context.getResources().
		getString(com.android.internal.R.string.fileSizeSuffix,
		value, context.getString(suffix));

+3 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,9 @@ public interface WindowManagerPolicy {
		public boolean showLw(boolean doAnimation);
		}

		/** No transition happening. */
		/** Not set up for a transition. */
		public final int TRANSIT_UNSET = 0;
		/** No animation for transition. */
		public final int TRANSIT_NONE = 0;
		/** Window has been added to the screen. */
		public final int TRANSIT_ENTER = 1;