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

Commit 16ac0ca0 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge changes I6e96864c,I6bc865d5,I15ca6994 into sc-dev am: 3530bccf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13840988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7d4cefdf1a30647fd4fbf98f0487203919e003
parents 2c7289ad 3530bccf

core/java/android/app/Notification.java

+52 −21
Original line number Diff line number Diff line
@@ -5011,9 +5011,13 @@ public class Notification implements Parcelable 
            boolean showProgress = handleProgressBar(contentView, ex, p);

            boolean hasSecondLine = showProgress;

            if (p.hasTitle()) {

                contentView.setViewVisibility(R.id.title, View.VISIBLE);

                contentView.setTextViewText(R.id.title, processTextSpans(p.title));

                setTextViewColorPrimary(contentView, R.id.title, p);

                contentView.setViewVisibility(p.mTitleViewId, View.VISIBLE);

                contentView.setTextViewText(p.mTitleViewId, processTextSpans(p.title));

                setTextViewColorPrimary(contentView, p.mTitleViewId, p);

            } else if (p.mTitleViewId != R.id.title) {

                // This alternate title view ID is not cleared by resetStandardTemplate

                contentView.setViewVisibility(p.mTitleViewId, View.GONE);

                contentView.setTextViewText(p.mTitleViewId, null);

            }

            if (p.text != null && p.text.length() != 0

                    && (!showProgress || p.mAllowTextWithProgress)) {
@@ -5441,6 +5445,11 @@ public class Notification implements Parcelable 
                // keep the divider visible between that title and the next text element.

                return true;

            }

            if (p.mHideAppName) {

                // The app name is being hidden, so we definitely want to return here.

                // Assume that there is a title which will replace it in the header.

                return p.hasTitle();

            }

            contentView.setViewVisibility(R.id.app_name_text, View.VISIBLE);

            contentView.setTextViewText(R.id.app_name_text, loadHeaderAppName());

            contentView.setTextColor(R.id.app_name_text, getSecondaryTextColor(p));
@@ -5817,7 +5826,7 @@ public class Notification implements Parcelable 
         *

         * @hide

         */

        public RemoteViews makeNotificationHeader() {

        public RemoteViews makeNotificationGroupHeader() {

            return makeNotificationHeader(mParams.reset()

                    .viewType(StandardTemplateParams.VIEW_TYPE_GROUP_HEADER)

                    .fillTextsFrom(this));
@@ -6583,10 +6592,6 @@ public class Notification implements Parcelable 
            return R.layout.notification_template_material_conversation;

        }



        private int getCallLayoutResource() {

            return R.layout.notification_template_material_call;

        }



        private int getActionLayoutResource() {

            return R.layout.notification_material_action;

        }
@@ -9329,7 +9334,7 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeContentView(boolean increasedHeight) {

            return makeCallLayout();

            return makeCallLayout(StandardTemplateParams.VIEW_TYPE_NORMAL);

        }



        /**
@@ -9337,14 +9342,14 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {

            return makeCallLayout();

            return makeCallLayout(StandardTemplateParams.VIEW_TYPE_HEADS_UP);

        }



        /**

         * @hide

         */

        public RemoteViews makeBigContentView() {

            return makeCallLayout();

            return makeCallLayout(StandardTemplateParams.VIEW_TYPE_BIG);

        }



        @NonNull
@@ -9443,8 +9448,10 @@ public class Notification implements Parcelable 
            return resultActions;

        }



        private RemoteViews makeCallLayout() {

        private RemoteViews makeCallLayout(int viewType) {

            final boolean isCollapsed = viewType == StandardTemplateParams.VIEW_TYPE_NORMAL;

            Bundle extras = mBuilder.mN.extras;

            CharSequence title = mPerson != null ? mPerson.getName() : null;

            CharSequence text = mBuilder.processLegacyText(extras.getCharSequence(EXTRA_TEXT));

            if (text == null) {

                text = getDefaultText();
@@ -9452,20 +9459,30 @@ public class Notification implements Parcelable 


            // Bind standard template

            StandardTemplateParams p = mBuilder.mParams.reset()

                    .viewType(StandardTemplateParams.VIEW_TYPE_BIG)

                    .viewType(viewType)

                    .callStyleActions(true)

                    .allowTextWithProgress(true)

                    .hideLargeIcon(true)

                    .hideAppName(isCollapsed)

                    .titleViewId(R.id.conversation_text)

                    .title(title)

                    .text(text)

                    .summaryText(mBuilder.processLegacyText(mVerificationText));

            mBuilder.mActions = getActionsListWithSystemActions();

            RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(

                    mBuilder.getCallLayoutResource(), p, null /* result */);

            final RemoteViews contentView;

            if (isCollapsed) {

                contentView = mBuilder.applyStandardTemplate(

                        R.layout.notification_template_material_call, p, null /* result */);

            } else {

                contentView = mBuilder.applyStandardTemplateWithActions(

                        R.layout.notification_template_material_big_call, p, null /* result */);

            }



            // Bind some extra conversation-specific header fields.

            mBuilder.setTextViewColorPrimary(contentView, R.id.conversation_text, p);

            if (!p.mHideAppName) {

                mBuilder.setTextViewColorSecondary(contentView, R.id.app_name_divider, p);

                contentView.setViewVisibility(R.id.app_name_divider, View.VISIBLE);

            }

            bindCallerVerification(contentView, p);



            // Bind some custom CallLayout properties
@@ -12142,12 +12159,13 @@ public class Notification implements Parcelable 
        public static int VIEW_TYPE_NORMAL = 1;

        public static int VIEW_TYPE_BIG = 2;

        public static int VIEW_TYPE_HEADS_UP = 3;

        public static int VIEW_TYPE_MINIMIZED = 4;

        public static int VIEW_TYPE_PUBLIC = 5;

        public static int VIEW_TYPE_GROUP_HEADER = 6;

        public static int VIEW_TYPE_MINIMIZED = 4;    // header only for minimized state

        public static int VIEW_TYPE_PUBLIC = 5;       // header only for automatic public version

        public static int VIEW_TYPE_GROUP_HEADER = 6; // header only for top of group



        int mViewType = VIEW_TYPE_UNSPECIFIED;

        boolean mHeaderless;

        boolean mHideAppName;

        boolean mHideTitle;

        boolean mHideActions;

        boolean mHideProgress;
@@ -12155,6 +12173,7 @@ public class Notification implements Parcelable 
        boolean mPromotePicture;

        boolean mCallStyleActions;

        boolean mAllowTextWithProgress;

        int mTitleViewId;

        int mTextViewId;

        CharSequence title;

        CharSequence text;
@@ -12168,6 +12187,7 @@ public class Notification implements Parcelable 
        final StandardTemplateParams reset() {

            mViewType = VIEW_TYPE_UNSPECIFIED;

            mHeaderless = false;

            mHideAppName = false;

            mHideTitle = false;

            mHideActions = false;

            mHideProgress = false;
@@ -12175,6 +12195,7 @@ public class Notification implements Parcelable 
            mPromotePicture = false;

            mCallStyleActions = false;

            mAllowTextWithProgress = false;

            mTitleViewId = R.id.title;

            mTextViewId = R.id.text;

            title = null;

            text = null;
@@ -12200,6 +12221,11 @@ public class Notification implements Parcelable 
            return this;

        }



        public StandardTemplateParams hideAppName(boolean hideAppName) {

            mHideAppName = hideAppName;

            return this;

        }



        final StandardTemplateParams hideActions(boolean hideActions) {

            this.mHideActions = hideActions;

            return this;
@@ -12235,6 +12261,11 @@ public class Notification implements Parcelable 
            return this;

        }



        public StandardTemplateParams titleViewId(int titleViewId) {

            mTitleViewId = titleViewId;

            return this;

        }



        public StandardTemplateParams textViewId(int textViewId) {

            mTextViewId = textViewId;

            return this;

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

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ public class CallLayout extends FrameLayout { 
        }

        // TODO(b/179178086): crop/clip the icon to a circle?

        mConversationIconView.setImageIcon(icon);

        mConversationText.setText(callerName);

    }



    @RemotableViewMethod

core/res/res/layout/notification_template_material_big_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:id="@+id/notification_action_list_margin_target"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/notification_action_list_height"

        android:layout_marginBottom="@dimen/notification_content_margin"

        android:orientation="vertical"

        >

core/res/res/layout/notification_template_material_big_call.xml

0 → 100644
+107 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 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.CallLayout

    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:clipChildren="false"

    android:tag="call"

    android:theme="@style/Theme.DeviceDefault.Notification"

    >



    <!-- CallLayout shares visual appearance with ConversationLayout, so shares layouts -->

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



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

        >



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="horizontal"

            >



            <LinearLayout

                android:id="@+id/notification_main_column"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_marginStart="@dimen/conversation_content_start"

                android:orientation="vertical"

                android:minHeight="68dp"

                >



                <include

                    layout="@layout/notification_template_conversation_header"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />



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



            <FrameLayout

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:minWidth="@dimen/notification_content_margin_end"

                >



                <include

                    layout="@layout/notification_expand_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />



            </FrameLayout>



        </LinearLayout>



        <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_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>



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

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginBottom="@dimen/notification_action_list_height"

        android:layout_marginBottom="@dimen/notification_content_margin"

        android:clipToPadding="false"

        android:orientation="vertical"

        >