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

Commit 815388af authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge changes I1d00d86e,I16d81113 into oc-dev 

am: f9db6d3b

Change-Id: Ie149b783953ec29ca8867261c852c6e429b004bb
parents 1ca91b15 f9db6d3b

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
                return false;

            }

        });

        row.icon = (ImageButton) row.view.findViewById(R.id.volume_row_icon);

        row.icon = row.view.findViewById(R.id.volume_row_icon);

        row.icon.setImageResource(iconRes);

        if (row.stream != AudioSystem.STREAM_ACCESSIBILITY) {

            row.icon.setOnClickListener(new OnClickListener() {
@@ -465,6 +465,8 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
                    row.userAttempt = 0;  // reset the grace period, slider updates immediately

                }

            });

        } else {

            row.icon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

        }

    }

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3611,7 +3611,7 @@ public class NotificationManagerService extends SystemService { 
        final boolean aboveThreshold =

                record.getImportance() >= NotificationManager.IMPORTANCE_DEFAULT;

        final boolean canInterrupt = aboveThreshold && !record.isIntercepted();

        if (DBG || record.isIntercepted())

        if (DBG)

            Slog.v(TAG,

                    "pkg=" + record.sbn.getPackageName() + " canInterrupt=" + canInterrupt +

                            " intercept=" + record.isIntercepted()