Merge "The beginning of expanded notifications." (970de33c) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3724,6 +3724,7 @@ package android.app {
		method public android.app.Notification.Builder setSmallIcon(int, int);
		method public android.app.Notification.Builder setSound(android.net.Uri);
		method public android.app.Notification.Builder setSound(android.net.Uri, int);
		method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
		method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
		method public android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
		method public android.app.Notification.Builder setUsesIntruderAlert(boolean);

core/java/android/app/Notification.java

+155 −26

Original line number	Diff line number	Diff line
		@@ -187,13 +187,20 @@ public class Notification implements Parcelable
		*/
		public RemoteViews contentView;


		/**
		* The view that will represent this notification in the pop-up "intruder alert" dialog.
		* @hide
		*/
		public RemoteViews intruderView;

		/**
		* A larger version of {@link #contentView}, giving the Notification an
		* opportunity to show more detail. The system UI may choose to show this
		* instead of the normal content view at its discretion.
		* @hide
		*/
		public RemoteViews bigContentView;

		/**
		* The bitmap that may escape the bounds of the panel and bar.
		*/
		@@ -584,6 +591,9 @@ public class Notification implements Parcelable
		if (parcel.readInt() != 0) {
		intruderView = RemoteViews.CREATOR.createFromParcel(parcel);
		}
		if (parcel.readInt() != 0) {
		bigContentView = RemoteViews.CREATOR.createFromParcel(parcel);
		}
		}

		@Override
		@@ -650,6 +660,9 @@ public class Notification implements Parcelable
		if (this.intruderView != null) {
		that.intruderView = this.intruderView.clone();
		}
		if (this.bigContentView != null) {
		that.bigContentView = this.bigContentView.clone();
		}

		return that;
		}
		@@ -747,6 +760,13 @@ public class Notification implements Parcelable
		} else {
		parcel.writeInt(0);
		}

		if (bigContentView != null) {
		parcel.writeInt(1);
		bigContentView.writeToParcel(parcel, 0);
		} else {
		parcel.writeInt(0);
		}
		}

		/**
		@@ -896,6 +916,7 @@ public class Notification implements Parcelable
		private CharSequence mContentTitle;
		private CharSequence mContentText;
		private CharSequence mContentInfo;
		private CharSequence mSubText;
		private PendingIntent mContentIntent;
		private RemoteViews mContentView;
		private PendingIntent mDeleteIntent;
		@@ -1012,6 +1033,15 @@ public class Notification implements Parcelable
		return this;
		}

		/**
		* Set the third line of text in the platform notification template.
		* Don't use if you're also using {@link #setProgress(int, int, boolean)}; they occupy the same location in the standard template.
		*/
		public Builder setSubText(CharSequence text) {
		mSubText = text;
		return this;
		}

		/**
		* Set the large number at the right-hand side of the notification. This is
		* equivalent to setContentInfo, although it might show the number in a different
		@@ -1025,7 +1055,6 @@ public class Notification implements Parcelable
		/**
		* A small piece of additional information pertaining to this notification.
		*

		* The platform template will draw this on the last line of the notification, at the far
		* right (to the right of a smallIcon if it has been placed there).
		*/
		@@ -1037,7 +1066,6 @@ public class Notification implements Parcelable
		/**
		* Set the progress this notification represents.
		*

		* The platform template will represent this using a {@link ProgressBar}.
		*/
		public Builder setProgress(int max, int progress, boolean indeterminate) {
		@@ -1050,7 +1078,6 @@ public class Notification implements Parcelable
		/**
		* Supply a custom RemoteViews to use instead of the platform template.
		*

		* @see Notification#contentView
		*/
		public Builder setContent(RemoteViews views) {
		@@ -1061,17 +1088,12 @@ public class Notification implements Parcelable
		/**
		* Supply a {@link PendingIntent} to be sent when the notification is clicked.
		*

		* As of {@link android.os.Build.VERSION_CODES#HONEYCOMB}, if this field is unset and you
		* have specified a custom RemoteViews with {@link #setContent(RemoteViews)}, you can use
		* {@link RemoteViews#setOnClickPendingIntent RemoteViews.setOnClickPendingIntent(int,PendingIntent)}

		* to assign PendingIntents to individual views in that custom layout (i.e., to create

		* clickable buttons inside the
		* notification view).
		* clickable buttons inside the notification view).
		*

		* @see Notification#contentIntent Notification.contentIntent
		*/
		public Builder setContentIntent(PendingIntent intent) {
		@@ -1082,7 +1104,6 @@ public class Notification implements Parcelable
		/**
		* Supply a {@link PendingIntent} to send when the notification is cleared explicitly by the user.
		*

		* @see Notification#deleteIntent
		*/
		public Builder setDeleteIntent(PendingIntent intent) {
		@@ -1115,7 +1136,6 @@ public class Notification implements Parcelable
		* Set the "ticker" text which is displayed in the status bar when the notification first
		* arrives.
		*

		* @see Notification#tickerText
		*/
		public Builder setTicker(CharSequence tickerText) {
		@@ -1355,20 +1375,28 @@ public class Notification implements Parcelable
		}
		}

		private RemoteViews makeRemoteViews(int resId) {
		private RemoteViews applyStandardTemplate(int resId) {
		RemoteViews contentView = new RemoteViews(mContext.getPackageName(), resId);
		boolean hasLine3 = false;
		boolean hasLine2 = false;
		int smallIconImageViewId = R.id.icon;
		if (mLargeIcon != null) {
		contentView.setImageViewBitmap(R.id.icon, mLargeIcon);
		smallIconImageViewId = R.id.right_icon;
		}
		if (mSmallIcon != 0) {
		contentView.setImageViewResource(R.id.icon, mSmallIcon);
		contentView.setViewVisibility(R.id.icon, View.VISIBLE);
		contentView.setImageViewResource(smallIconImageViewId, mSmallIcon);
		contentView.setViewVisibility(smallIconImageViewId, View.VISIBLE);
		} else {
		contentView.setViewVisibility(R.id.icon, View.GONE);
		contentView.setViewVisibility(smallIconImageViewId, View.GONE);
		}
		if (mContentTitle != null) {
		contentView.setTextViewText(R.id.title, mContentTitle);
		}
		if (mContentText != null) {
		contentView.setTextViewText(R.id.text, mContentText);
		contentView.setTextViewText(
		(mSubText != null) ? R.id.text2 : R.id.text,
		mContentText);
		hasLine3 = true;
		}
		if (mContentInfo != null) {
		@@ -1390,6 +1418,12 @@ public class Notification implements Parcelable
		} else {
		contentView.setViewVisibility(R.id.info, View.GONE);
		}

		if (mSubText != null) {
		contentView.setTextViewText(R.id.text, mSubText);
		contentView.setViewVisibility(R.id.text2, View.VISIBLE);
		} else {
		contentView.setViewVisibility(R.id.text2, View.GONE);
		if (mProgressMax != 0 \|\| mProgressIndeterminate) {
		contentView.setProgressBar(
		R.id.progress, mProgressMax, mProgress, mProgressIndeterminate);
		@@ -1397,6 +1431,7 @@ public class Notification implements Parcelable
		} else {
		contentView.setViewVisibility(R.id.progress, View.GONE);
		}
		}
		if (mWhen != 0) {
		contentView.setLong(R.id.time, "setTime", mWhen);
		}
		@@ -1408,9 +1443,7 @@ public class Notification implements Parcelable
		if (mContentView != null) {
		return mContentView;
		} else {
		return makeRemoteViews(mLargeIcon == null
		? R.layout.status_bar_latest_event_content
		: R.layout.status_bar_latest_event_content_large_icon);
		return applyStandardTemplate(R.layout.status_bar_latest_event_content); // no more special large_icon flavor
		}
		}

		@@ -1419,7 +1452,7 @@ public class Notification implements Parcelable
		return mTickerView;
		} else {
		if (mContentView == null) {
		return makeRemoteViews(mLargeIcon == null
		return applyStandardTemplate(mLargeIcon == null
		? R.layout.status_bar_latest_event_ticker
		: R.layout.status_bar_latest_event_ticker_large_icon);
		} else {
		@@ -1516,4 +1549,100 @@ public class Notification implements Parcelable
		return n;
		}
		}

		/**
		* @hide because this API is still very rough
		*
		* This is a "rebuilder": It consumes a Builder object and modifies its output.
		*
		* This represents the "big picture" style notification, with a large Bitmap atop the usual notification.
		*
		* Usage:
		* <pre class="prettyprint">
		* Notification noti = new Notification.BigPictureStyle(
		* new Notification.Builder()
		* .setContentTitle("New mail from " + sender.toString())
		* .setContentText(subject)
		* .setSmallIcon(R.drawable.new_mail)
		* .setLargeIcon(aBitmap))
		* .bigPicture(aBigBitmap)
		* .build();
		* </pre>
		*/
		public static class BigPictureStyle {
		private Builder mBuilder;
		private Bitmap mPicture;

		public BigPictureStyle(Builder builder) {
		mBuilder = builder;
		}

		public BigPictureStyle bigPicture(Bitmap b) {
		mPicture = b;
		return this;
		}

		private RemoteViews makeBigContentView() {
		RemoteViews contentView = mBuilder.applyStandardTemplate(R.layout.notification_template_big_picture);

		contentView.setImageViewBitmap(R.id.big_picture, mPicture);

		return contentView;
		}

		public Notification build() {
		Notification wip = mBuilder.getNotification();
		wip.bigContentView = makeBigContentView();
		return wip;
		}
		}

		/**
		* @hide because this API is still very rough
		*
		* This is a "rebuilder": It consumes a Builder object and modifies its output.
		*
		* This represents the "big text" style notification, with more area for the main content text to be read in its entirety.
		*
		* Usage:
		* <pre class="prettyprint">
		* Notification noti = new Notification.BigPictureStyle(
		* new Notification.Builder()
		* .setContentTitle("New mail from " + sender.toString())
		* .setContentText(subject)
		* .setSmallIcon(R.drawable.new_mail)
		* .setLargeIcon(aBitmap))
		* .bigText(aVeryLongString)
		* .build();
		* </pre>
		*/
		public static class BigTextStyle {
		private Builder mBuilder;
		private CharSequence mBigText;

		public BigTextStyle(Builder builder) {
		mBuilder = builder;
		}

		public BigTextStyle bigText(CharSequence cs) {
		mBigText = cs;
		return this;
		}

		private RemoteViews makeBigContentView() {
		RemoteViews contentView = mBuilder.applyStandardTemplate(R.layout.status_bar_latest_event_content);

		contentView.setTextViewText(R.id.big_text, mBigText);
		contentView.setViewVisibility(R.id.big_text, View.VISIBLE);
		contentView.setTextViewText(R.id.text, ""); // XXX: what do do with this spot?

		return contentView;
		}

		public Notification build() {
		Notification wip = mBuilder.getNotification();
		wip.bigContentView = makeBigContentView();
		return wip;
		}
		}
		}

core/res/res/layout/notification_template_big_picture.xml

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		>
		<ImageView
		android:id="@+id/big_picture"
		android:layout_width="match_parent"
		android:layout_height="192dp"
		android:scaleType="centerCrop"
		/>
		<include layout="@layout/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="@dimen/notification_large_icon_height"
		android:layout_marginTop="192dp"
		/>
		</FrameLayout>
		No newline at end of file

core/res/res/layout/status_bar_latest_event_content.xml

+1 −1

Original line number	Diff line number	Diff line
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		>
		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/notification_large_icon_width"

core/res/res/layout/status_bar_latest_event_content_large_icon.xml

+10 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		android:orientation="vertical"
		android:paddingLeft="12dp"
		android:paddingRight="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		>
		<LinearLayout
		android:id="@+id/line1"
		@@ -44,6 +46,13 @@
		android:ellipsize="marquee"
		android:visibility="gone"
		/>
		<TextView android:id="@+id/big_text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="false"
		android:visibility="gone"
		/>
		<LinearLayout
		android:id="@+id/line3"
		android:layout_width="match_parent"
		@@ -70,7 +79,7 @@
		android:gravity="center"
		android:paddingLeft="8dp"
		/>
		<ImageView android:id="@+id/icon"
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"