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

Commit 1ecbced5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Fix guts are not bound properly.\" into nyc-dev am: 9ea39160" into nyc-mr1-dev

parents 38d78976 f03046aa

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+5 −4
Original line number Diff line number Diff line
@@ -1083,8 +1083,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
            pkgicon = pmUser.getDefaultActivityIcon();

        }



        ((ImageView) row.findViewById(R.id.app_icon)).setImageDrawable(pkgicon);

        ((TextView) row.findViewById(R.id.pkgname)).setText(appname);

        ((ImageView) guts.findViewById(R.id.app_icon)).setImageDrawable(pkgicon);

        ((TextView) guts.findViewById(R.id.pkgname)).setText(appname);



        final View settingsButton = guts.findViewById(R.id.more_settings);

        if (appUid >= 0) {
@@ -1100,8 +1100,9 @@ public abstract class BaseStatusBar extends SystemUI implements 
            settingsButton.setVisibility(View.GONE);

        }



        guts.bindImportance(pmUser, sbn, row, mNotificationData.getImportance(sbn.getKey()));

        row.findViewById(R.id.done).setOnClickListener(new View.OnClickListener() {

        guts.bindImportance(pmUser, sbn, mNotificationData.getImportance(sbn.getKey()));



        guts.findViewById(R.id.done).setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                // If the user has security enabled, show challenge if the setting is changed.

packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java

+3 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab 
    }



    void bindImportance(final PackageManager pm, final StatusBarNotification sbn,

            final ExpandableNotificationRow row, final int importance) {

            final int importance) {

        mINotificationManager = INotificationManager.Stub.asInterface(

                ServiceManager.getService(Context.NOTIFICATION_SERVICE));

        mStartingUserImportance = NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
@@ -191,8 +191,8 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab 
            // unlikely.

        }



        final View importanceSlider = row.findViewById(R.id.importance_slider);

        final View importanceButtons = row.findViewById(R.id.importance_buttons);

        final View importanceSlider = findViewById(R.id.importance_slider);

        final View importanceButtons = findViewById(R.id.importance_buttons);

        if (mShowSlider) {

            bindSlider(importanceSlider, systemApp);

            importanceSlider.setVisibility(View.VISIBLE);