Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66d31a49 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Bigger "small" icon in HUN 

Note that notification_2025_template_heads_up is a fork of
notification_template_material_heads_up.

Bug: 378660052
Test: visual test, screenshot tests to come later
Flag: android.app.notifications_redesign_templates
Change-Id: I32d3a355900cb10470600b3c467caa28e87d30da
parent 59fa0b77

core/java/android/app/Notification.java

+6 −2
Original line number Diff line number Diff line
@@ -814,8 +814,8 @@ public class Notification implements Parcelable 
        if (Flags.notificationsRedesignTemplates()) {

            return switch (layoutId) {

                case R.layout.notification_2025_template_collapsed_base,

                     R.layout.notification_2025_template_heads_up_base,

                     R.layout.notification_2025_template_header,

                     R.layout.notification_template_material_heads_up_base,

                     R.layout.notification_template_material_big_base,

                     R.layout.notification_template_material_big_picture,

                     R.layout.notification_template_material_big_text,
@@ -7517,8 +7517,12 @@ public class Notification implements Parcelable 
        }















        private int getHeadsUpBaseLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_heads_up_base;













            } else {















                return R.layout.notification_template_material_heads_up_base;















            }













        }





























        private int getCompactHeadsUpBaseLayoutResource() {















            return R.layout.notification_template_material_compact_heads_up_base;

































core/res/res/layout/notification_2025_template_heads_up_base.xml
0 → 100644



+66
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?><!--













  ~ Copyright (C) 2014 The Android Open Source Project













  ~













  ~ Licensed under the Apache License, Version 2.0 (the "License");













  ~ you may not use this file except in compliance with the License.













  ~ You may obtain a copy of the License at













  ~













  ~      http://www.apache.org/licenses/LICENSE-2.0













  ~













  ~ Unless required by applicable law or agreed to in writing, software













  ~ distributed under the License is distributed on an "AS IS" BASIS,













  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













  ~ See the License for the specific language governing permissions and













  ~ limitations under the License













  -->



























<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:orientation="vertical"













    android:clipChildren="false"













    android:tag="headsUp"













    >



























    <LinearLayout













        android:layout_width="match_parent"













        android:layout_height="wrap_content"













        android:clipChildren="false"













        android:orientation="vertical"













        >



























        <include













            layout="@layout/notification_2025_template_collapsed_base"













            android:id="@null"













            />



























        <LinearLayout













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:layout_marginTop="-20dp"













            android:clipChildren="false"













            android:orientation="vertical"













            >



























            <ViewStub













                android:layout="@layout/notification_material_reply_text"













                android:id="@+id/notification_material_reply_container"













                android:layout_width="match_parent"













                android:layout_height="wrap_content"













                />



























            <include













                layout="@layout/notification_template_smart_reply_container"













                android:layout_width="match_parent"













                android:layout_height="wrap_content"













                android:layout_marginStart="@dimen/notification_2025_content_margin_start"













                android:layout_marginEnd="@dimen/notification_content_margin_end"













                android:layout_marginTop="@dimen/notification_content_margin"













                />



























            <include layout="@layout/notification_material_action_list" />













        </LinearLayout>













    </LinearLayout>













</FrameLayout>
























core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -2390,6 +2390,7 @@













  <java-symbol type="layout" name="notification_material_action_list" />















  <java-symbol type="layout" name="notification_material_action_tombstone" />















  <java-symbol type="layout" name="notification_2025_template_collapsed_base" />













  <java-symbol type="layout" name="notification_2025_template_heads_up_base" />















  <java-symbol type="layout" name="notification_2025_template_header" />















  <java-symbol type="layout" name="notification_template_material_base" />















  <java-symbol type="layout" name="notification_template_material_heads_up_base" />