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

Commit 3ce57747 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Don't show X for notifications that can't be cleared"

parents 710e049a a4a6503d

packages/SystemUI/res/drawable-mdpi/status_bar_veto_normal.png

+440 B (1.11 KiB)
Loading image diff...

packages/SystemUI/res/drawable-mdpi/status_bar_veto_pressed.png

−53 B (1.11 KiB)
Loading image diff...

packages/SystemUI/res/layout-xlarge/status_bar_latest_event.xml

+4 −2
Original line number Diff line number Diff line
@@ -8,12 +8,14 @@ 
    <ImageButton

        android:id="@+id/veto"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

        android:layout_alignParentRight="true"

        android:src="@drawable/status_bar_veto"

        android:scaleType="center"

        android:background="@null"

        android:padding="2dip"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        />



    <com.android.systemui.statusbar.LatestItemView android:id="@+id/content"

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java

+16 −12
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ public class TabletStatusBarService extends StatusBarService { 
        LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);

        View row = inflater.inflate(R.layout.status_bar_latest_event, parent, false);

        View vetoButton = row.findViewById(R.id.veto);

        if (entry.notification.isClearable()) {

            final String _pkg = sbn.pkg;

            final String _tag = sbn.tag;

            final int _id = sbn.id;
@@ -746,6 +747,9 @@ public class TabletStatusBarService extends StatusBarService { 
    //                    animateCollapse();

                    }

                });

        } else {

            vetoButton.setVisibility(View.INVISIBLE);

        }



        // bind the click event to the content area

        ViewGroup content = (ViewGroup)row.findViewById(R.id.content);