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

Commit e12ff8a2 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove the old seamless chip 

Test: manual - play audio, use the real seamless chip
Change-Id: I0cc93c222dd6ae7bc3a823f27967d98fb39e8cd9
parent 2374b914

core/java/android/app/Notification.java

+1 −11
Original line number Diff line number Diff line
@@ -8457,9 +8457,7 @@ public class Notification implements Parcelable 
                Action action, StandardTemplateParams p) {

            final boolean tombstone = (action.actionIntent == null);

            container.setViewVisibility(buttonId, View.VISIBLE);

            if (buttonId != R.id.media_seamless) {

            container.setImageViewIcon(buttonId, action.getIcon());

            }



            // If the action buttons should not be tinted, then just use the default

            // notification color. Otherwise, just use the passed-in color.
@@ -8513,10 +8511,6 @@ public class Notification implements Parcelable 
                    view.setViewVisibility(MEDIA_BUTTON_IDS[i], View.GONE);

                }

            }

            bindMediaActionButton(view, R.id.media_seamless, new Action(

                    R.drawable.ic_media_seamless, mBuilder.mContext.getString(

                            com.android.internal.R.string.ext_media_seamless_action), null), p);

            view.setViewVisibility(R.id.media_seamless, View.GONE);

            handleImage(view);

            // handle the content margin

            int endMargin = R.dimen.notification_content_margin_end;
@@ -8553,10 +8547,6 @@ public class Notification implements Parcelable 
                    big.setViewVisibility(MEDIA_BUTTON_IDS[i], View.GONE);

                }

            }

            bindMediaActionButton(big, R.id.media_seamless, new Action(R.drawable.ic_media_seamless,

                    mBuilder.mContext.getString(

                            com.android.internal.R.string.ext_media_seamless_action), null), p);

            big.setViewVisibility(R.id.media_seamless, View.GONE);

            handleImage(big);

            return big;

        }

core/java/android/view/NotificationHeaderView.java

+2 −7
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.graphics.Rect; 
import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.RemoteViews;



import com.android.internal.R;
@@ -54,7 +53,6 @@ public class NotificationHeaderView extends ViewGroup { 
    private OnClickListener mExpandClickListener;

    private OnClickListener mFeedbackListener;

    private HeaderTouchListener mTouchListener = new HeaderTouchListener();

    private LinearLayout mTransferChip;

    private NotificationExpandButton mExpandButton;

    private CachingIconView mIcon;

    private View mProfileBadge;
@@ -111,7 +109,6 @@ public class NotificationHeaderView extends ViewGroup { 
        mAppName = findViewById(com.android.internal.R.id.app_name_text);

        mHeaderText = findViewById(com.android.internal.R.id.header_text);

        mSecondaryHeaderText = findViewById(com.android.internal.R.id.header_text_secondary);

        mTransferChip = findViewById(com.android.internal.R.id.media_seamless);

        mExpandButton = findViewById(com.android.internal.R.id.expand_button);

        mIcon = findViewById(com.android.internal.R.id.icon);

        mProfileBadge = findViewById(com.android.internal.R.id.profile_badge);
@@ -143,8 +140,7 @@ public class NotificationHeaderView extends ViewGroup { 
            // Icons that should go at the end

            if ((child == mExpandButton && mShowExpandButtonAtEnd)

                    || child == mProfileBadge

                    || child == mFeedbackIcon

                    || child == mTransferChip) {

                    || child == mFeedbackIcon) {

                iconWidth += lp.leftMargin + lp.rightMargin + child.getMeasuredWidth();

            } else {

                totalWidth += lp.leftMargin + lp.rightMargin + child.getMeasuredWidth();
@@ -208,8 +204,7 @@ public class NotificationHeaderView extends ViewGroup { 
            // Icons that should go at the end

            if ((child == mExpandButton && mShowExpandButtonAtEnd)

                    || child == mProfileBadge

                    || child == mFeedbackIcon

                    || child == mTransferChip) {

                    || child == mFeedbackIcon) {

                if (end == getMeasuredWidth()) {

                    layoutRight = end - mContentEndMargin;

                } else {

core/res/res/layout/notification_material_media_transfer_action.xml

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

<!--

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

  -->

<LinearLayout

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:visibility="gone"

        android:padding="4dp"

        android:layout_marginStart="10dp"

        android:gravity="center"

        android:background="@drawable/media_seamless_background">

    <ImageView

        android:layout_width="?attr/notificationHeaderIconSize"

        android:layout_height="?attr/notificationHeaderIconSize"

        android:src="@drawable/ic_media_seamless"

        android:id="@+id/media_seamless_image" />

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?attr/notificationHeaderTextAppearance"

        android:text="@string/ext_media_seamless_action"

        android:id="@+id/media_seamless_text"

        android:paddingEnd="2dp" />

</LinearLayout>
 
 No newline at end of file

core/res/res/layout/notification_template_header.xml

+0 −4
Original line number Diff line number Diff line
@@ -160,9 +160,5 @@ 
        android:visibility="gone"

        android:contentDescription="@string/notification_work_profile_content_description"

        />

    <include

        layout="@layout/notification_material_media_transfer_action"

        android:id="@+id/media_seamless"

    />

</NotificationHeaderView>

core/res/res/values/symbols.xml

+0 −3
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ 
  <java-symbol type="id" name="action2" />

  <java-symbol type="id" name="action3" />

  <java-symbol type="id" name="action4" />

  <java-symbol type="id" name="media_seamless" />

  <java-symbol type="id" name="media_seamless_image" />

  <java-symbol type="id" name="media_seamless_text" />

  <java-symbol type="id" name="notification_media_seekbar_container" />

  <java-symbol type="id" name="notification_media_content" />

  <java-symbol type="id" name="notification_media_progress" />