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

Commit b0c457a1 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of d1aa7ae6 to master."

parents 3ab0c4c4 1ed208f8

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

+7 −2
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ public class VolumeDialog { 
    private boolean mPendingRecheckAll;

    private long mCollapseTime;

    private boolean mHovering = false;

    private int mLastActiveStream;



    public VolumeDialog(Context context, int windowType, VolumeDialogController controller,

            ZenModeController zenModeController, Callback callback) {
@@ -283,10 +284,14 @@ public class VolumeDialog { 
            @Override

            public void onLayoutChange(View v, int left, int top, int right, int bottom,

                    int oldLeft, int oldTop, int oldRight, int oldBottom) {

                final boolean moved = oldLeft != left || oldTop != top;

                final boolean moved = mLastActiveStream != mActiveStream ||

                        oldLeft != left || oldTop != top;

                if (D.BUG) Log.d(TAG, "onLayoutChange moved=" + moved

                        + " old=" + new Rect(oldLeft, oldTop, oldRight, oldBottom).toShortString()

                        + " new=" + new Rect(left,top,right,bottom).toShortString());

                        + "," + mLastActiveStream

                        + " new=" + new Rect(left,top,right,bottom).toShortString()

                        + "," + mActiveStream);

                mLastActiveStream = mActiveStream;

                if (moved) {

                    for (int i = 0; i < mDialogContentView.getChildCount(); i++) {

                        final View c = mDialogContentView.getChildAt(i);