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

Commit f24aad94 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Remove title from header"

parents bacc24ce c7f3bbeb

packages/SystemUI/res/layout/bubble_expanded_view.xml

+1 −15
Original line number Diff line number Diff line
@@ -39,26 +39,13 @@ 
            android:layout_height="@dimen/bubble_expanded_header_height"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:gravity="end|center_vertical"

            android:orientation="horizontal">



            <TextView

                android:id="@+id/header_text"

                android:textAppearance="@*android:style/TextAppearance.Material.Title"

                android:textSize="18sp"

                android:layout_weight="1"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:gravity="start|center_vertical"

                android:singleLine="true"

                android:paddingLeft="@dimen/bubble_expanded_header_horizontal_padding"

                android:paddingRight="@dimen/bubble_expanded_header_horizontal_padding"

            />



            <ImageButton

                android:id="@+id/deep_link_button"

                android:layout_width="@dimen/bubble_header_icon_size"

                android:layout_height="@dimen/bubble_header_icon_size"

                android:gravity="end|center_vertical"

                android:src="@drawable/ic_open_in_new"

                android:scaleType="center"

                android:tint="?android:attr/colorForeground"
@@ -70,7 +57,6 @@ 
                android:layout_width="@dimen/bubble_header_icon_size"

                android:layout_height="@dimen/bubble_header_icon_size"

                android:src="@drawable/ic_settings"

                android:gravity="end|center_vertical"

                android:scaleType="center"

                android:tint="?android:attr/colorForeground"

                android:background="?android:attr/selectableItemBackground"

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+0 −9
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 


    // Header

    private View mHeaderView;

    private TextView mHeaderTextView;

    private ImageButton mDeepLinkIcon;

    private ImageButton mSettingsIcon;
@@ -197,7 +196,6 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
        mHeaderHeight = getContext().getResources().getDimensionPixelSize(

                R.dimen.bubble_expanded_header_height);

        mHeaderView = findViewById(R.id.header_layout);

        mHeaderTextView = findViewById(R.id.header_text);

        mDeepLinkIcon = findViewById(R.id.deep_link_button);

        mSettingsIcon = findViewById(R.id.settings_button);

        mDeepLinkIcon.setOnClickListener(this);
@@ -295,13 +293,6 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
                R.string.bubbles_settings_button_description, mAppName));

        mDeepLinkIcon.setContentDescription(getResources().getString(

                R.string.bubbles_deep_link_button_description, mAppName));

        if (mEntry != null && mEntry.getBubbleMetadata() != null) {

            mHeaderTextView.setText(mEntry.getBubbleMetadata().getTitle());

        } else {

            // This should only happen if we're auto-bubbling notification content that isn't

            // explicitly a bubble

            mHeaderTextView.setText(mAppName);

        }

    }



    private void updatePermissionView() {