diff options
6 files changed, 29 insertions, 44 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 3c26738eca28..146059b0667c 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5211,7 +5211,7 @@ public class Notification implements Parcelable } else { // views in states with a header (big states) result.mHeadingExtraMarginSet.applyToView(contentView, R.id.notification_header); - result.mTitleMarginSet.applyToView(contentView, R.id.line1); + result.mTitleMarginSet.applyToView(contentView, R.id.title); } } @@ -7015,9 +7015,9 @@ public class Notification implements Parcelable result); if (mBigContentTitle != null && mBigContentTitle.equals("")) { - contentView.setViewVisibility(R.id.line1, View.GONE); + contentView.setViewVisibility(R.id.title, View.GONE); } else { - contentView.setViewVisibility(R.id.line1, View.VISIBLE); + contentView.setViewVisibility(R.id.title, View.VISIBLE); } return contentView; @@ -9084,7 +9084,7 @@ public class Notification implements Parcelable private void handleImage(RemoteViews contentView) { if (mBuilder.mN.hasLargeIcon()) { - contentView.setViewLayoutMarginDimen(R.id.line1, RemoteViews.MARGIN_END, 0); + contentView.setViewLayoutMarginDimen(R.id.title, RemoteViews.MARGIN_END, 0); contentView.setViewLayoutMarginDimen(R.id.text, RemoteViews.MARGIN_END, 0); } } diff --git a/core/res/res/layout/notification_template_material_big_media.xml b/core/res/res/layout/notification_template_material_big_media.xml index b4cd170221b9..aa20ad36720b 100644 --- a/core/res/res/layout/notification_template_material_big_media.xml +++ b/core/res/res/layout/notification_template_material_big_media.xml @@ -59,21 +59,15 @@ <!--<include layout="@layout/notification_template_part_line1"/>--> <!--<include layout="@layout/notification_template_text"/>--> - <FrameLayout - android:id="@+id/line1" + <TextView android:id="@+id/title" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" android:layout_width="match_parent" android:layout_height="wrap_content" - > - <TextView android:id="@+id/title" - android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:textAlignment="viewStart" - /> - </FrameLayout> + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:textAlignment="viewStart" + /> <com.android.internal.widget.ImageFloatingTextView style="@style/Widget.DeviceDefault.Notification.Text" diff --git a/core/res/res/layout/notification_template_material_media.xml b/core/res/res/layout/notification_template_material_media.xml index 0481f0d4e4f7..542e59df76c0 100644 --- a/core/res/res/layout/notification_template_material_media.xml +++ b/core/res/res/layout/notification_template_material_media.xml @@ -63,21 +63,15 @@ <!--<include layout="@layout/notification_template_part_line1"/>--> <!--<include layout="@layout/notification_template_text"/>--> - <FrameLayout - android:id="@+id/line1" + <TextView android:id="@+id/title" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" android:layout_width="match_parent" android:layout_height="wrap_content" - > - <TextView android:id="@+id/title" - android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:textAlignment="viewStart" - /> - </FrameLayout> + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:textAlignment="viewStart" + /> <com.android.internal.widget.ImageFloatingTextView style="@style/Widget.DeviceDefault.Notification.Text" diff --git a/core/res/res/layout/notification_template_part_line1.xml b/core/res/res/layout/notification_template_part_line1.xml index 002b7eba05ab..c86bc6334ee9 100644 --- a/core/res/res/layout/notification_template_part_line1.xml +++ b/core/res/res/layout/notification_template_part_line1.xml @@ -15,18 +15,14 @@ ~ limitations under the License --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/line1" +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/title" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.BigTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - > - <TextView android:id="@+id/title" - android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.BigTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:textAlignment="viewStart" - /> -</FrameLayout> + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:textAlignment="viewStart" + /> diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index 0f0ac56f1e51..3a41d5fed238 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -29,6 +29,7 @@ <item type="id" name="icon2" /> <item type="id" name="input" /> <item type="id" name="left_icon" /> + <item type="id" name="line1" /> <item type="id" name="list" /> <item type="id" name="list_container" /> <item type="id" name="menu" /> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java index 9ef304d7e83c..992015320fa0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java @@ -430,7 +430,7 @@ public class NotificationGroupingUtil { public static final int[] MARGIN_ADJUSTED_VIEWS = { R.id.notification_headerless_view_column, - R.id.line1, + R.id.title, R.id.notification_main_column, R.id.notification_header}; |