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

Merge "Notification layout fixes:" into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-03 16:16:25 +00:00
committed by Android (Google) Code Review
parent f57262c38d 604c074dbe
commit 10de71a380
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5597,7 +5597,7 @@ public class Notification implements Parcelable
private void bindSnoozeAction(RemoteViews big, StandardTemplateParams p) {
boolean hideSnoozeButton = mN.isForegroundService() || mN.fullScreenIntent != null
|| isBackgroundColorized(p)
|| p.mViewType == StandardTemplateParams.VIEW_TYPE_HEADS_UP;
|| p.mViewType != StandardTemplateParams.VIEW_TYPE_BIG;
big.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton);
if (hideSnoozeButton) {
// Only hide; NotificationContentView will show it when it adds the click listener

5
core/res/res/layout/notification_template_material_base.xml
View File

@@ -14,11 +14,12 @@
~ limitations under the License
-->
<com.android.internal.widget.NotificationMaxHeightFrameLayout
<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="wrap_content"
android:layout_weight="1"
android:minHeight="@dimen/notification_headerless_min_height"
android:tag="base"
>
@@ -166,4 +167,4 @@
</LinearLayout>
</com.android.internal.widget.NotificationMaxHeightFrameLayout>
</FrameLayout>

8
core/res/res/layout/notification_template_material_heads_up_base.xml
View File

@@ -23,7 +23,7 @@
android:tag="headsUp"
>
<com.android.internal.widget.RemeasuringLinearLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
@@ -35,7 +35,7 @@
android:id="@null"
/>
<com.android.internal.widget.RemeasuringLinearLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-20dp"
@@ -60,6 +60,6 @@
/>
<include layout="@layout/notification_material_action_list" />
</com.android.internal.widget.RemeasuringLinearLayout>
</com.android.internal.widget.RemeasuringLinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>

2
core/res/res/layout/notification_template_material_messaging.xml
View File

@@ -199,11 +199,13 @@
android:id="@+id/notification_action_list_margin_target"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-20dp"
android:clipChildren="false"
android:orientation="vertical">
<include layout="@layout/notification_template_smart_reply_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/notification_content_margin"
android:layout_marginStart="@dimen/notification_content_margin_start"
android:layout_marginEnd="@dimen/notification_content_margin_end" />
<include layout="@layout/notification_material_action_list" />

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -151,7 +151,7 @@
<dimen name="notification_max_heads_up_height_before_s">162dp</dimen>
<!-- Height of a heads up notification in the status bar -->
<dimen name="notification_max_heads_up_height">143dp</dimen>
<dimen name="notification_max_heads_up_height">136dp</dimen>
<!-- Height of a heads up notification in the status bar -->
<dimen name="notification_max_heads_up_height_increased">188dp</dimen>