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

Commit 3b050317 authored by Selim Cinek's avatar Selim Cinek
Browse files

Removed the bundle number from the header 

Bug: 27431551
Change-Id: Ia0c663f0bab875abba4b35d565f3ac4ed2306079
parent 2b542424

core/java/android/app/Notification.java

+0 −6
Original line number Diff line number Diff line
@@ -2994,7 +2994,6 @@ public class Notification implements Parcelable 
            contentView.setViewVisibility(R.id.chronometer, View.GONE);

            contentView.setViewVisibility(R.id.header_sub_text, View.GONE);

            contentView.setViewVisibility(R.id.header_content_info, View.GONE);

            contentView.setViewVisibility(R.id.number_of_children, View.GONE);

            contentView.setViewVisibility(R.id.sub_text_divider, View.GONE);

            contentView.setViewVisibility(R.id.content_info_divider, View.GONE);

            contentView.setViewVisibility(R.id.time_divider, View.GONE);
@@ -3095,7 +3094,6 @@ public class Notification implements Parcelable 


        private void bindNotificationHeader(RemoteViews contentView) {

            bindSmallIcon(contentView);

            bindChildCountColor(contentView);

            bindHeaderAppName(contentView);

            bindHeaderSubText(contentView);

            bindContentInfo(contentView);
@@ -3104,10 +3102,6 @@ public class Notification implements Parcelable 
            bindProfileBadge(contentView);

        }



        private void bindChildCountColor(RemoteViews contentView) {

            contentView.setTextColor(R.id.number_of_children, resolveColor());

        }



        private void bindContentInfo(RemoteViews contentView) {

            boolean visible = false;

            if (mN.extras.getCharSequence(EXTRA_INFO_TEXT) != null) {

core/java/android/view/NotificationHeaderView.java

+0 −13
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public class NotificationHeaderView extends ViewGroup { 
    private HeaderTouchListener mTouchListener = new HeaderTouchListener();

    private ImageView mExpandButton;

    private View mIcon;

    private TextView mChildCount;

    private View mProfileBadge;

    private View mInfo;

    private int mIconColor;
@@ -80,7 +79,6 @@ public class NotificationHeaderView extends ViewGroup { 
        mSubTextView = findViewById(com.android.internal.R.id.header_sub_text);

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

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

        mChildCount = (TextView) findViewById(com.android.internal.R.id.number_of_children);

        mProfileBadge = findViewById(com.android.internal.R.id.profile_badge);

        mInfo = findViewById(com.android.internal.R.id.header_content_info);

    }
@@ -193,17 +191,6 @@ public class NotificationHeaderView extends ViewGroup { 
        updateTouchListener();

    }



    public void setChildCount(int childCount) {

        if (childCount > 0) {

            mChildCount.setText(getContext().getString(

                    com.android.internal.R.string.notification_children_count_bracketed,

                    childCount));

            mChildCount.setVisibility(VISIBLE);

        } else {

            mChildCount.setVisibility(GONE);

        }

    }



    @RemotableViewMethod

    public void setOriginalIconColor(int color) {

        mIconColor = color;

core/res/res/layout/notification_template_header.xml

+0 −10
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ 
        android:layout_height="18dp"

        android:layout_marginEnd="3dp"

        />

    <TextView

        android:id="@+id/number_of_children"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification"

        android:layout_marginEnd="3dp"

        android:layout_marginStart="2dp"

        android:visibility="gone"

        android:singleLine="true"

        />

    <TextView

        android:id="@+id/app_name_text"

        android:layout_width="wrap_content"

core/res/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -548,9 +548,6 @@ 
         [CHAR LIMIT=4] -->

    <string name="status_bar_notification_info_overflow">999+</string>



    <!-- The number of notifications in the notification header. An example would be (2) or (12) -->

    <string name="notification_children_count_bracketed">(<xliff:g id="notificationCount" example="1">%d</xliff:g>)</string>



    <!-- The divider symbol between different parts of the notification header. not translatable [CHAR LIMIT=1] -->

    <string name="notification_header_divider_symbol" translatable="false">•</string>

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -2405,11 +2405,9 @@ 
  <java-symbol type="id" name="notification_material_reply_text_2" />

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



  <java-symbol type="string" name="notification_children_count_bracketed" />

  <java-symbol type="string" name="notification_hidden_text" />

  <java-symbol type="string" name="notification_hidden_by_policy_text" />

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

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

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

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

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