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

Commit 7e50f267 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Update Call/ConversationLayout alignment to new icon size 

Note that notification_2025_conversation_header is a fork of notification_template_conversation_header.

Also removed an unused field in CallLayout.

Bug: 378660052
Test: visual test, screenshot tests to come later
Flag: android.app.notifications_redesign_templates
Change-Id: Ifa63ae58f2e306661a9f7e93e69dcd6e95c63546
parent 710eca22

core/java/com/android/internal/widget/CallLayout.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.util.AttributeSet; 
import android.view.RemotableViewMethod;

import android.widget.FrameLayout;

import android.widget.RemoteViews;

import android.widget.TextView;

import android.widget.flags.Flags;



import com.android.internal.R;
@@ -59,7 +58,6 @@ public class CallLayout extends FrameLayout { 
    private CachingIconView mConversationIconView;

    private CachingIconView mIcon;

    private CachingIconView mConversationIconBadgeBg;

    private TextView mConversationText;



    public CallLayout(@NonNull Context context) {

        super(context);
@@ -83,7 +81,6 @@ public class CallLayout extends FrameLayout { 
    protected void onFinishInflate() {

        super.onFinishInflate();

        mPeopleHelper.init(getContext());

        mConversationText = findViewById(R.id.conversation_text);

        mConversationIconView = findViewById(R.id.conversation_icon);

        mIcon = findViewById(R.id.icon);

        mConversationIconBadgeBg = findViewById(R.id.conversation_icon_badge_bg);

core/res/res/layout/notification_2025_conversation_header.xml

0 → 100644
+171 −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

  -->



<com.android.internal.widget.ConversationHeaderLinearLayout

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

    android:id="@+id/conversation_header"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingTop="@dimen/notification_2025_margin"

    >



    <TextView

        android:id="@+id/conversation_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:textSize="16sp"

        android:singleLine="true"

        android:layout_weight="1"

        />



    <TextView

        android:id="@+id/app_name_divider"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:text="@string/notification_header_divider_symbol"

        android:singleLine="true"

        android:visibility="gone"

        />



    <!-- App Name -->

    <com.android.internal.widget.ObservableTextView

        android:id="@+id/app_name_text"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:singleLine="true"

        android:visibility="gone"

        />



    <TextView

        android:id="@+id/time_divider"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:text="@string/notification_header_divider_symbol"

        android:singleLine="true"

        android:visibility="gone"

        />



    <DateTimeView

        android:id="@+id/time"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:showRelative="true"

        android:singleLine="true"

        android:visibility="gone"

        />



    <ViewStub

        android:id="@+id/chronometer"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:layout="@layout/notification_template_part_chronometer"

        android:visibility="gone"

        />



    <TextView

        android:id="@+id/verification_divider"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:text="@string/notification_header_divider_symbol"

        android:singleLine="true"

        android:visibility="gone"

        />



    <ImageView

        android:id="@+id/verification_icon"

        android:layout_width="@dimen/notification_verification_icon_size"

        android:layout_height="@dimen/notification_verification_icon_size"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_notifications_alerted"

        android:visibility="gone"

        />



    <TextView

        android:id="@+id/verification_text"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:layout_weight="100"

        android:showRelative="true"

        android:singleLine="true"

        android:visibility="gone"

        />



    <ImageButton

        android:id="@+id/feedback"

        android:layout_width="@dimen/notification_feedback_size"

        android:layout_height="@dimen/notification_feedback_size"

        android:layout_marginStart="@dimen/notification_header_separating_margin"

        android:background="?android:selectableItemBackgroundBorderless"

        android:contentDescription="@string/notification_feedback_indicator"

        android:baseline="13dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_feedback_indicator"

        android:visibility="gone"

        />



    <ImageView

        android:id="@+id/phishing_alert"

        android:layout_width="@dimen/notification_phishing_alert_size"

        android:layout_height="@dimen/notification_phishing_alert_size"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_dialog_alert_material"

        android:visibility="gone"

        android:contentDescription="@string/notification_phishing_alert_content_description"

        />



    <ImageView

        android:id="@+id/profile_badge"

        android:layout_width="@dimen/notification_badge_size"

        android:layout_height="@dimen/notification_badge_size"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:visibility="gone"

        android:contentDescription="@string/notification_work_profile_content_description"

        />



    <ImageView

        android:id="@+id/alerted_icon"

        android:layout_width="@dimen/notification_alerted_size"

        android:layout_height="@dimen/notification_alerted_size"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:contentDescription="@string/notification_alerted_content_description"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_notifications_alerted"

        android:visibility="gone"

        />

</com.android.internal.widget.ConversationHeaderLinearLayout>

core/res/res/layout/notification_2025_template_collapsed_call.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginStart="@dimen/conversation_content_start"

            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

            android:orientation="vertical"

            android:paddingBottom="@dimen/notification_2025_margin"

            >



            <include

                layout="@layout/notification_template_conversation_header"

                layout="@layout/notification_2025_conversation_header"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                />

core/res/res/layout/notification_2025_template_conversation.xml

+3 −3
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ 
                <!-- Use layout_marginStart instead of paddingStart to work around strange

                     measurement behavior on lower display densities. -->

                <include

                    layout="@layout/notification_template_conversation_header"

                    layout="@layout/notification_2025_conversation_header"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginBottom="2dp"

                    android:layout_marginStart="@dimen/conversation_content_start"

                    android:layout_marginStart="@dimen/notification_2025_content_margin_start"

                    />



                <!-- Messages -->
@@ -86,7 +86,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_content_margin"

            android:layout_marginStart="@dimen/conversation_content_start"

            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end" />

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

    </com.android.internal.widget.RemeasuringLinearLayout>

core/res/res/layout/notification_2025_template_expanded_call.xml

+3 −3
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_marginStart="@dimen/conversation_content_start"

                android:layout_marginStart="@dimen/notification_2025_content_margin_start"

                android:orientation="vertical"

                android:minHeight="68dp"

                >



                <include

                    layout="@layout/notification_template_conversation_header"

                    layout="@layout/notification_2025_conversation_header"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />
@@ -97,7 +97,7 @@ 
            layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginTop="@dimen/notification_content_margin"

            />