drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs

Browse Source 
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
This commit is contained in:
Katie McCormick
2013-11-26 14:00:33 -08:00
committed by Android Git Automerger
parent 1ccc6633bf 484b57a565
commit 37e4c405a6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/PendingIntent.java
View File

@ -96,8 +96,8 @@ public final class PendingIntent implements Parcelable {
public static final int FLAG_ONE_SHOT = 1<<30; public static final int FLAG_ONE_SHOT = 1<<30;
/** /**
* Flag for use with {@link #getActivity}, {@link #getBroadcast}, and * Flag for use with {@link #getActivity}, {@link #getBroadcast}, and
* {@link #getService}: if the described PendingIntent does not already * {@link #getService}: if the described PendingIntent already exists,
* exist, then simply return null instead of creating it. * then simply return null instead of creating it.
*/ */
public static final int FLAG_NO_CREATE = 1<<29; public static final int FLAG_NO_CREATE = 1<<29;
/** /**

4
core/java/android/hardware/SensorManager.java
View File

@ -1056,8 +1056,8 @@ public abstract class SensorManager {
* is mapped. * is mapped.
* *
* @param outR * @param outR
* the transformed rotation matrix. inR and outR can be the same * the transformed rotation matrix. inR and outR should not be the same
* array, but it is not recommended for performance reason. * array.
* *
* @return <code>true</code> on success. <code>false</code> if the input * @return <code>true</code> on success. <code>false</code> if the input
* parameters are incorrect, for instance if X and Y define the same * parameters are incorrect, for instance if X and Y define the same

2
core/java/android/widget/ShareActionProvider.java
View File

@ -266,7 +266,7 @@ public class ShareActionProvider extends ActionProvider {
* Intent shareIntent = new Intent(Intent.ACTION_SEND); * Intent shareIntent = new Intent(Intent.ACTION_SEND);
* shareIntent.setType("image/*"); * shareIntent.setType("image/*");
* Uri uri = Uri.fromFile(new File(getFilesDir(), "foo.jpg")); * Uri uri = Uri.fromFile(new File(getFilesDir(), "foo.jpg"));
* shareIntent.putExtra(Intent.EXTRA_STREAM, uri.toString());</pre> * shareIntent.putExtra(Intent.EXTRA_STREAM, uri));</pre>
* *
* @param shareIntent The share intent. * @param shareIntent The share intent.
* *

2
graphics/java/android/graphics/ColorMatrix.java
View File

@ -19,7 +19,7 @@ package android.graphics;
import android.util.FloatMath; import android.util.FloatMath;
/** /**
* 5x4 matrix for transforming the color+alpha components of a Bitmap. * 4x5 matrix for transforming the color+alpha components of a Bitmap.
* The matrix is stored in a single array, and its treated as follows: * The matrix is stored in a single array, and its treated as follows:
* [ a, b, c, d, e, * [ a, b, c, d, e,
* f, g, h, i, j, * f, g, h, i, j,