am 93dc642e: docs: fix misc bugs from external tracker (bde31762) · Commits · e / os / android_frameworks_base

core/java/android/view/LayoutInflater.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import java.lang.reflect.Constructor;
		import java.util.HashMap;

		/**
		* This class is used to instantiate layout XML file into its corresponding View
		* objects. It is never be used directly -- use
		* Instantiates a layout XML file into its corresponding {@link android.view.View}
		* objects. It is never used directly. Instead, use
		* {@link android.app.Activity#getLayoutInflater()} or
		* {@link Context#getSystemService} to retrieve a standard LayoutInflater instance
		* that is already hooked up to the current context and correctly configured

core/java/android/widget/RemoteViews.java

+25 −24

Original line number	Diff line number	Diff line
		@@ -1183,7 +1183,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Equivalent to calling ImageView.setImageBitmap
		*
		* @param viewId The id of the view whose drawable should change
		* @param viewId The id of the view whose bitmap should change
		* @param bitmap The new Bitmap for the drawable
		*/
		public void setImageViewBitmap(int viewId, Bitmap bitmap) {
		@@ -1206,7 +1206,7 @@ public class RemoteViews implements Parcelable, Filter {
		* and {@link Chronometer#start Chronometer.start()} or
		* {@link Chronometer#stop Chronometer.stop()}.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the {@link Chronometer} to change
		* @param base The time at which the timer would have read 0:00. This
		* time should be based off of
		* {@link android.os.SystemClock#elapsedRealtime SystemClock.elapsedRealtime()}.
		@@ -1227,7 +1227,7 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* If indeterminate is true, then the values for max and progress are ignored.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the {@link ProgressBar} to change
		* @param max The 100% value for the progress bar
		* @param progress The current value of the progress bar.
		* @param indeterminate True if the progress bar is indeterminate,
		@@ -1333,7 +1333,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Equivalent to calling {@link android.widget.TextView#setTextColor(int)}.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view whose text color should change
		* @param color Sets the text color for all the states (normal, selected,
		* focused) to be this color.
		*/
		@@ -1346,7 +1346,7 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @param appWidgetId The id of the app widget which contains the specified view. (This
		* parameter is ignored in this deprecated method)
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the {@link AbsListView}
		* @param intent The intent of the service which will be
		* providing data to the RemoteViewsAdapter
		* @deprecated This method has been deprecated. See
		@@ -1361,7 +1361,7 @@ public class RemoteViews implements Parcelable, Filter {
		* Equivalent to calling {@link android.widget.AbsListView#setRemoteViewsAdapter(Intent)}.
		* Can only be used for App Widgets.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the {@link AbsListView}
		* @param intent The intent of the service which will be
		* providing data to the RemoteViewsAdapter
		*/
		@@ -1372,7 +1372,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Equivalent to calling {@link android.widget.AbsListView#smoothScrollToPosition(int, int)}.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view to change
		* @param position Scroll to this adapter position
		*/
		public void setScrollPosition(int viewId, int position) {
		@@ -1382,7 +1382,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Equivalent to calling {@link android.widget.AbsListView#smoothScrollToPosition(int, int)}.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view to change
		* @param offset Scroll by this adapter position offset
		*/
		public void setRelativeScrollPosition(int viewId, int offset) {
		@@ -1392,7 +1392,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one boolean on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1403,7 +1403,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one byte on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1414,7 +1414,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one short on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1425,7 +1425,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one int on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1436,7 +1436,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one long on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1447,7 +1447,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one float on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1458,7 +1458,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one double on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1469,7 +1469,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one char on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1480,7 +1480,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one String on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1491,7 +1491,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one CharSequence on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1502,7 +1502,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one Uri on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1516,7 +1516,7 @@ public class RemoteViews implements Parcelable, Filter {
		* <p class="note">The bitmap will be flattened into the parcel if this object is
		* sent across processes, so it may end up using a lot of memory, and may be fairly slow.</p>
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1527,7 +1527,7 @@ public class RemoteViews implements Parcelable, Filter {
		/**
		* Call a method taking one Bundle on a view in the layout for this RemoteViews.
		*
		* @param viewId The id of the view whose text should change
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The value to pass to the method.
		*/
		@@ -1536,10 +1536,11 @@ public class RemoteViews implements Parcelable, Filter {
		}

		/**
		* Call a method taking one Intent on a view in the layout for this RemoteViews.
		*
		* @param viewId
		* @param methodName
		* @param value
		* @param viewId The id of the view on which to call the method.
		* @param methodName The name of the method to call.
		* @param value The {@link android.content.Intent} to pass the method.
		*/
		public void setIntent(int viewId, String methodName, Intent value) {
		addAction(new ReflectionAction(viewId, methodName, ReflectionAction.INTENT, value));

docs/html/guide/developing/devices/emulator.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ preinstalled applications (such as the dialer) that you can access from your
		applications. You can choose what version of the Android system you want to
		run in the emulator by configuring AVDs, and you can also customize the
		mobile device skin and key mappings. When launching the emulator and at runtime,
		you can use a variety of commands and options to control the its behaviors.
		you can use a variety of commands and options to control its behavior.
		</p>

		<p>The Android system image distributed in the SDK contains ARM machine code for

docs/html/guide/developing/tools/emulator.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,7 @@ the keys of your keyboard. </p>
		</tr>
		<tr>
		<td>Audio volume up button</td>
		<td>KEYPAD_PLUS, Ctrl-5</td>
		<td>KEYPAD_PLUS, Ctrl-F5</td>
		</tr>

		<tr>

docs/html/guide/topics/fundamentals/activities.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ is presented to the user when launching the application for the first time. Each
		activity can then start another activity in order to perform different actions. Each time a new
		activity starts, the previous activity is stopped, but the system preserves the activity
		in a stack (the "back stack"). When a new activity starts, it is pushed onto the back stack and
		takes user focus. The back stack abides to the basic "last in, first out" queue mechanism,
		takes user focus. The back stack abides to the basic "last in, first out" stack mechanism,
		so, when the user is done with the current activity and presses the <em>Back</em> button, it
		is popped from the stack (and destroyed) and the previous activity resumes. (The back stack is
		discussed more in the <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks