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

Commit c1a0287a authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Bigger "small" icon in base expanded notif 

Note that notification_2025_template_expanded_base and
notification_2025_reply_container are forks of
notification_template_material_big_base and
notification_material_reply_text respectively.

Bug: 378660052
Test: visual test, screenshot tests to come later
Flag: android.app.notifications_redesign_templates
Change-Id: I1bfdfb71c0d9db36b9cb0978a38df2c1cfa3ab32
parent 5bd9799b

core/java/android/app/Notification.java

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

            return switch (layoutId) {

                case R.layout.notification_2025_template_collapsed_base,

                     R.layout.notification_2025_template_expanded_base,

                     R.layout.notification_2025_template_heads_up_base,

                     R.layout.notification_2025_template_header,

                     R.layout.notification_template_material_big_base,

                     R.layout.notification_template_material_big_picture,

                     R.layout.notification_template_material_big_text,

                     R.layout.notification_template_material_inbox,
@@ -7539,8 +7539,12 @@ public class Notification implements Parcelable 
        }















        private int getBigBaseLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_base;













            } else {















                return R.layout.notification_template_material_big_base;















            }













        }





























        private int getBigPictureLayoutResource() {















            return R.layout.notification_template_material_big_picture;

































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



+79
−0




























Original line number
Diff line number
Diff line













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













<!--













  ~ Copyright (C) 2024 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













  -->



























<!-- Note: this layout is included from a view stub; layout attributes will be overridden. -->













<LinearLayout













        xmlns:android="http://schemas.android.com/apk/res/android"













        android:id="@+id/notification_material_reply_container"













        android:layout_width="match_parent"













        android:layout_height="wrap_content"













        android:orientation="vertical"













        android:paddingStart="@dimen/notification_2025_content_margin_start">



























    <ImageView













            android:layout_width="match_parent"













            android:layout_height="1dip"













            android:id="@+id/action_divider"













            android:layout_marginTop="@dimen/notification_content_margin"













            android:layout_marginBottom="@dimen/notification_content_margin"













            android:layout_marginEnd="@dimen/notification_content_margin_end"













            android:background="@drawable/notification_template_divider" />



























    <TextView













            android:id="@+id/notification_material_reply_text_3"













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:layout_marginEnd="@dimen/notification_content_margin_end"













            android:visibility="gone"













            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"













            android:singleLine="true" />



























    <TextView













            android:id="@+id/notification_material_reply_text_2"













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:layout_marginEnd="@dimen/notification_content_margin_end"













            android:visibility="gone"













            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"













            android:singleLine="true" />



























    <LinearLayout













            android:id="@+id/notification_material_reply_text_1_container"













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:orientation="horizontal"













            android:layout_marginEnd="@dimen/notification_content_margin_end">













        <TextView













                android:id="@+id/notification_material_reply_text_1"













                android:layout_width="match_parent"













                android:layout_height="wrap_content"













                android:layout_weight="1"













                android:layout_marginEnd="@dimen/notification_content_margin_end"













                android:layout_gravity="center"













                android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"













                android:singleLine="true" />













        <ProgressBar













            android:id="@+id/notification_material_reply_progress"













            android:layout_height="@dimen/messaging_group_sending_progress_size"













            android:layout_width="@dimen/messaging_group_sending_progress_size"













            android:layout_marginStart="@dimen/notification_2025_content_margin_start"













            android:layout_gravity="center"













            android:indeterminate="true"













            style="?android:attr/progressBarStyleSmall" />













    </LinearLayout>



























</LinearLayout>
























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



+86
−0




























Original line number
Diff line number
Diff line













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













  ~ Copyright (C) 2024 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="big"













    >



























    <LinearLayout













        android:id="@+id/notification_action_list_margin_target"













        android:layout_width="match_parent"













        android:layout_height="wrap_content"













        android:layout_marginBottom="@dimen/notification_content_margin"













        android:orientation="vertical"













        >



























        <FrameLayout













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:layout_weight="1"













            android:layout_gravity="top"













            >



























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



























            <LinearLayout













                android:id="@+id/notification_main_column"













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













                android:orientation="vertical"













                >



























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



























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



























                <include













                    android:layout_width="match_parent"













                    android:layout_height="@dimen/notification_progress_bar_height"













                    android:layout_marginTop="@dimen/notification_progress_margin_top"













                    layout="@layout/notification_template_progress"













                    />













            </LinearLayout>



























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













        </FrameLayout>



























        <ViewStub













            android:layout="@layout/notification_2025_reply_container"













            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>













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