Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the line1 container for the title

Browse Source 
Bug: 181048615
Test: visual inspection
Change-Id: I5a18f3ac93f9054500d65db606ac6284281123db
This commit is contained in:
Jeff DeCew
2021-03-05 14:52:01 -05:00
parent a9d3e22de1
commit 8eb955427a
6 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Notification.java
View File

@@ -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);
}
}

20
core/res/res/layout/notification_template_material_big_media.xml
View File

@@ -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"

20
core/res/res/layout/notification_template_material_media.xml
View File

@@ -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"

22
core/res/res/layout/notification_template_part_line1.xml
View File

@@ -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"
/>

1
core/res/res/values/ids.xml
View File

@@ -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" />

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
View File

@@ -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};