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

Commit 373a4f44 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Make large_icon in notification catch touches."

parents fead8f97 847fd751

packages/SystemUI/res/layout/status_bar_notification_row.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:scaleType="center"

        android:clickable="true"

        />



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

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+15 −6
Original line number Diff line number Diff line
@@ -662,9 +662,12 @@ public class PhoneStatusBar extends StatusBar { 
                // update the contentIntent

                final PendingIntent contentIntent = notification.notification.contentIntent;

                if (contentIntent != null) {

                    oldEntry.content.setOnClickListener(new NotificationClicker(contentIntent,

                                notification.pkg, notification.tag, notification.id));

                    final View.OnClickListener listener = new NotificationClicker(contentIntent,

                            notification.pkg, notification.tag, notification.id);

                    oldEntry.largeIcon.setOnClickListener(listener);

                    oldEntry.content.setOnClickListener(listener);

                } else {

                    oldEntry.largeIcon.setOnClickListener(null);

                    oldEntry.content.setOnClickListener(null);

                }

                // Update the icon.
@@ -779,9 +782,12 @@ public class PhoneStatusBar extends StatusBar { 
        content.setOnFocusChangeListener(mFocusChangeListener);

        PendingIntent contentIntent = n.contentIntent;

        if (contentIntent != null) {

            content.setOnClickListener(new NotificationClicker(contentIntent, notification.pkg,

                        notification.tag, notification.id));

            final View.OnClickListener listener = new NotificationClicker(contentIntent,

                    notification.pkg, notification.tag, notification.id);

            largeIcon.setOnClickListener(listener);

            content.setOnClickListener(listener);

        } else {

            largeIcon.setOnClickListener(null);

            content.setOnClickListener(null);

        }
@@ -979,9 +985,12 @@ public class PhoneStatusBar extends StatusBar { 
//        content.setOnFocusChangeListener(mFocusChangeListener);

        PendingIntent contentIntent = sbn.notification.contentIntent;

        if (contentIntent != null) {

            content.setOnClickListener(new NotificationClicker(contentIntent,

                        sbn.pkg, sbn.tag, sbn.id));

            final View.OnClickListener listener = new NotificationClicker(contentIntent,

                    sbn.pkg, sbn.tag, sbn.id);

            largeIcon.setOnClickListener(listener);

            content.setOnClickListener(listener);

        } else {

            largeIcon.setOnClickListener(null);

            content.setOnClickListener(null);

        }

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

+10 −4
Original line number Diff line number Diff line
@@ -838,9 +838,12 @@ public class TabletStatusBar extends StatusBar implements 
                // update the contentIntent

                final PendingIntent contentIntent = notification.notification.contentIntent;

                if (contentIntent != null) {

                    oldEntry.content.setOnClickListener(new NotificationClicker(contentIntent,

                                notification.pkg, notification.tag, notification.id));

                    final View.OnClickListener listener = new NotificationClicker(contentIntent,

                            notification.pkg, notification.tag, notification.id);

                    oldEntry.largeIcon.setOnClickListener(listener);

                    oldEntry.content.setOnClickListener(listener);

                } else {

                    oldEntry.largeIcon.setOnClickListener(null);

                    oldEntry.content.setOnClickListener(null);

                }

                // Update the icon.
@@ -1766,9 +1769,12 @@ public class TabletStatusBar extends StatusBar implements 
//        content.setOnFocusChangeListener(mFocusChangeListener);

        PendingIntent contentIntent = sbn.notification.contentIntent;

        if (contentIntent != null) {

            content.setOnClickListener(new NotificationClicker(contentIntent,

                        sbn.pkg, sbn.tag, sbn.id));

            final View.OnClickListener listener = new NotificationClicker(

                    contentIntent, sbn.pkg, sbn.tag, sbn.id);

            largeIcon.setOnClickListener(listener);

            content.setOnClickListener(listener);

        } else {

            largeIcon.setOnClickListener(null);

            content.setOnClickListener(null);

        }