am f2326a49: am c40a7fe0: Merge "Fix three-line notifications." into jb-dev (859260ef) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+31 −21

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import com.android.internal.R;

		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.media.AudioManager;
		import android.net.Uri;
		@@ -31,6 +32,8 @@ import android.os.SystemClock;
		import android.text.TextUtils;
		import android.util.IntProperty;
		import android.util.Log;
		import android.util.Slog;
		import android.util.TypedValue;
		import android.view.View;
		import android.widget.ProgressBar;
		import android.widget.RemoteViews;
		@@ -1378,8 +1381,8 @@ public class Notification implements Parcelable

		private RemoteViews applyStandardTemplate(int resId) {
		RemoteViews contentView = new RemoteViews(mContext.getPackageName(), resId);
		boolean hasLine3 = false;
		boolean hasLine2 = false;
		boolean showLine3 = false;
		boolean showLine2 = false;
		int smallIconImageViewId = R.id.icon;
		if (mLargeIcon != null) {
		contentView.setImageViewBitmap(R.id.icon, mLargeIcon);
		@@ -1401,15 +1404,13 @@ public class Notification implements Parcelable
		contentView.setTextViewText(R.id.title, mContentTitle);
		}
		if (mContentText != null) {
		contentView.setTextViewText(
		(mSubText != null) ? R.id.text2 : R.id.text,
		mContentText);
		hasLine3 = true;
		contentView.setTextViewText(R.id.text, mContentText);
		showLine3 = true;
		}
		if (mContentInfo != null) {
		contentView.setTextViewText(R.id.info, mContentInfo);
		contentView.setViewVisibility(R.id.info, View.VISIBLE);
		hasLine3 = true;
		showLine3 = true;
		} else if (mNumber > 0) {
		final int tooBig = mContext.getResources().getInteger(
		R.integer.status_bar_notification_info_maxnum);
		@@ -1421,25 +1422,42 @@ public class Notification implements Parcelable
		contentView.setTextViewText(R.id.info, f.format(mNumber));
		}
		contentView.setViewVisibility(R.id.info, View.VISIBLE);
		hasLine3 = true;
		showLine3 = true;
		} else {
		contentView.setViewVisibility(R.id.info, View.GONE);
		}

		// Need to show three lines?
		if (mSubText != null) {
		contentView.setTextViewText(R.id.text, mSubText);
		contentView.setViewVisibility(R.id.text2,
		mContentText != null ? View.VISIBLE : View.GONE);
		if (mContentText != null) {
		contentView.setTextViewText(R.id.text2, mContentText);
		// need to shrink all the type to make sure everything fits
		contentView.setViewVisibility(R.id.text2, View.VISIBLE);
		showLine2 = true;
		} else {
		contentView.setViewVisibility(R.id.text2, View.GONE);
		}
		} else {
		contentView.setViewVisibility(R.id.text2, View.GONE);
		if (mProgressMax != 0 \|\| mProgressIndeterminate) {
		contentView.setProgressBar(
		R.id.progress, mProgressMax, mProgress, mProgressIndeterminate);
		contentView.setViewVisibility(R.id.progress, View.VISIBLE);
		showLine2 = true;
		} else {
		contentView.setViewVisibility(R.id.progress, View.GONE);
		}
		}
		if (showLine2) {
		final Resources res = mContext.getResources();
		final float subTextSize = res.getDimensionPixelSize(
		R.dimen.notification_subtext_size);
		contentView.setTextViewTextSize(R.id.text, TypedValue.COMPLEX_UNIT_PX, subTextSize);
		// vertical centering
		contentView.setViewPadding(R.id.line1, 0, 0, 0, 0);
		}

		if (mWhen != 0) {
		if (mUseChronometer) {
		contentView.setViewVisibility(R.id.chronometer, View.VISIBLE);
		@@ -1451,7 +1469,7 @@ public class Notification implements Parcelable
		contentView.setLong(R.id.time, "setTime", mWhen);
		}
		}
		contentView.setViewVisibility(R.id.line3, hasLine3 ? View.VISIBLE : View.GONE);
		contentView.setViewVisibility(R.id.line3, showLine3 ? View.VISIBLE : View.GONE);
		return contentView;
		}

		@@ -1629,18 +1647,8 @@ public class Notification implements Parcelable
		mBuilder.setContentTitle(mBigContentTitle);
		}

		if (mBuilder.mSubText == null) {
		mBuilder.setContentText(null);
		}

		RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(layoutId);

		if (mBuilder.mSubText == null) {
		contentView.setViewVisibility(R.id.line3, View.GONE);
		} else {
		contentView.setViewVisibility(R.id.line3, View.VISIBLE);
		}

		if (mBigContentTitle != null && mBigContentTitle.equals("")) {
		contentView.setViewVisibility(R.id.line1, View.GONE);
		} else {
		@@ -1650,8 +1658,10 @@ public class Notification implements Parcelable
		if (mSummaryText != null && !mSummaryText.equals("")) {
		contentView.setViewVisibility(R.id.overflow_title, View.VISIBLE);
		contentView.setTextViewText(R.id.overflow_title, mSummaryText);
		contentView.setViewVisibility(R.id.line3, View.GONE);
		} else {
		contentView.setViewVisibility(R.id.overflow_title, View.GONE);
		contentView.setViewVisibility(R.id.line3, View.VISIBLE);
		}

		return contentView;

core/res/res/layout/notification_template_base.xml

+14 −13

Original line number	Diff line number	Diff line
		@@ -38,14 +38,15 @@
		android:orientation="vertical"
		android:paddingLeft="12dp"
		android:paddingRight="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:gravity="center_vertical"
		android:paddingTop="2dp"
		android:paddingBottom="2dp"
		android:gravity="top"
		>
		<LinearLayout
		android:id="@+id/line1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dp"
		android:orientation="horizontal"
		>
		<TextView android:id="@+id/title"
		@@ -85,8 +86,15 @@
		android:ellipsize="marquee"
		android:visibility="gone"
		/>
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="12dp"
		android:visibility="gone"
		style="?android:attr/progressBarStyleHorizontal"
		/>
		<TextView android:id="@+id/overflow_title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		@@ -123,21 +131,14 @@
		/>
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:scaleType="center"
		android:scaleType="centerInside"
		android:paddingLeft="8dp"
		android:visibility="gone"
		android:drawableAlpha="180"
		/>
		</LinearLayout>
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		style="?android:attr/progressBarStyleHorizontal"
		/>
		</LinearLayout>
		</FrameLayout>

core/res/res/layout/notification_template_big_base.xml

+7 −6

Original line number	Diff line number	Diff line
		@@ -38,9 +38,9 @@
		android:orientation="vertical"
		android:paddingLeft="12dp"
		android:paddingRight="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:gravity="center_vertical"
		android:paddingTop="2dp"
		android:paddingBottom="2dp"
		android:gravity="top"
		>
		<LinearLayout
		android:layout_width="match_parent"
		@@ -52,6 +52,7 @@
		android:id="@+id/line1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dp"
		android:orientation="horizontal"
		>
		<TextView android:id="@+id/title"
		@@ -126,10 +127,10 @@
		/>
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:scaleType="center"
		android:scaleType="centerInside"
		android:paddingLeft="8dp"
		android:visibility="gone"
		android:drawableAlpha="180"
		@@ -138,7 +139,7 @@
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="12dp"
		android:visibility="gone"
		style="?android:attr/progressBarStyleHorizontal"
		/>

core/res/res/layout/notification_template_big_picture.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,13 @@
		android:layout_gravity="bottom"
		android:scaleType="centerCrop"
		/>
		<ImageView
		android:layout_width="match_parent"
		android:layout_height="6dp"
		android:layout_marginTop="64dp"
		android:scaleType="fitXY"
		android:src="@drawable/title_bar_shadow"
		/>
		<include layout="@layout/notification_template_base"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"

core/res/res/layout/notification_template_big_text.xml

+16 −16

Original line number	Diff line number	Diff line
		@@ -36,9 +36,9 @@
		android:orientation="vertical"
		android:paddingLeft="12dp"
		android:paddingRight="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:gravity="center_vertical"
		android:paddingTop="2dp"
		android:paddingBottom="2dp"
		android:gravity="top"
		>
		<LinearLayout
		android:layout_width="match_parent"
		@@ -50,6 +50,7 @@
		android:id="@+id/line1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dp"
		android:orientation="horizontal"
		android:layout_gravity="top"
		android:layout_weight="0"
		@@ -92,11 +93,18 @@
		android:layout_weight="0"
		android:visibility="gone"
		/>
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="12dp"
		android:visibility="gone"
		android:layout_weight="0"
		style="?android:attr/progressBarStyleHorizontal"
		/>
		<TextView android:id="@+id/big_text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_marginTop="2dp"
		android:layout_marginBottom="2dp"
		android:singleLine="false"
		android:visibility="gone"
		@@ -113,7 +121,7 @@
		android:layout_weight="1"
		/>
		<TextView android:id="@+id/overflow_title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		@@ -127,7 +135,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_weight="1"
		android:layout_weight="0"
		>
		<TextView android:id="@+id/text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		@@ -151,22 +159,14 @@
		/>
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:scaleType="center"
		android:scaleType="centerInside"
		android:paddingLeft="8dp"
		android:visibility="gone"
		android:drawableAlpha="180"
		/>
		</LinearLayout>
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		android:layout_weight="0"
		style="?android:attr/progressBarStyleHorizontal"
		/>
		</LinearLayout>
		</FrameLayout>