Merge "docs: misc bug fixes from external issues" into jb-dev (6958c161) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -897,12 +897,16 @@ public class Notification implements Parcelable
		* Builder class for {@link Notification} objects.
		*
		* Provides a convenient way to set the various fields of a {@link Notification} and generate
		* content views using the platform's notification layout template.
		* content views using the platform's notification layout template. If your app supports
		* versions of Android as old as API level 4, you can instead use
		* {@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder},
		* available in the <a href="{@docRoot}tools/extras/support-library.html">Android Support
		* library</a>.
		*
		* Example:
		* <p>Example:
		*
		* <pre class="prettyprint">
		* Notification noti = new Notification.Builder()
		* Notification noti = new Notification.Builder(mContext)
		* .setContentTitle("New mail from " + sender.toString())
		* .setContentText(subject)
		* .setSmallIcon(R.drawable.new_mail)

+6 −6

Original line number	Diff line number	Diff line
		@@ -1120,8 +1120,8 @@ public class Resources {
		* Return a StyledAttributes holding the values defined by
		* <var>Theme</var> which are listed in <var>attrs</var>.
		*
		* <p>Be sure to call StyledAttributes.recycle() when you are done with
		* the array.
		* <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
		* with the array.
		*
		* @param attrs The desired attributes.
		*
		@@ -1148,8 +1148,8 @@ public class Resources {
		* Return a StyledAttributes holding the values defined by the style
		* resource <var>resid</var> which are listed in <var>attrs</var>.
		*
		* <p>Be sure to call StyledAttributes.recycle() when you are done with
		* the array.
		* <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
		* with the array.
		*
		* @param resid The desired style resource.
		* @param attrs The desired attributes in the style.
		@@ -1208,8 +1208,8 @@ public class Resources {
		* AttributeSet specifies a style class (through the "style" attribute),
		* that style will be applied on top of the base attributes it defines.
		*
		* <p>Be sure to call StyledAttributes.recycle() when you are done with
		* the array.
		* <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
		* with the array.
		*
		* <p>When determining the final value of a particular attribute, there
		* are four inputs that come into play:</p>

+1 −1

Original line number	Diff line number	Diff line
		@@ -684,7 +684,7 @@ public class TypedArray {
		}

		/**
		* Give back a previously retrieved StyledAttributes, for later re-use.
		* Give back a previously retrieved array, for later re-use.
		*/
		public void recycle() {
		synchronized (mResources.mTmpValue) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -617,7 +617,7 @@ public class CameraActivity extends Activity {

		// Create our Preview view and set it as the content of our activity.
		mPreview = new CameraPreview(this, mCamera);
		FrameLayout preview = (FrameLayout) findViewById(id.camera_preview);
		FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);
		preview.addView(mPreview);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ click event for both radio buttons:</p>
		<pre>
		public void onRadioButtonClicked(View view) {
		// Is the button now checked?
		boolean checked = (RadioButton) view).isChecked();
		boolean checked = ((RadioButton) view).isChecked();

		// Check which radio button was clicked
		switch(view.getId()) {