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

Commit 38a01734 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "VolumeDialogImpl: Respect multiple visible rows in landscape" am:... 

Merge "VolumeDialogImpl: Respect multiple visible rows in landscape" am: ef9dfbfa am: 82130c3a am: 32cd7265

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2047823



Change-Id: I347f9813ccb446a5441e486e359e46dee877713a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95ae4fa8 32cd7265

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

+19 −2
Original line number Original line Diff line number Diff line
@@ -378,11 +378,13 @@ public class VolumeDialogImpl implements VolumeDialog, 




        // The ringer and rows container has extra height at the top to fit the expanded ringer

        // The ringer and rows container has extra height at the top to fit the expanded ringer

        // drawer. This area should not be touchable unless the ringer drawer is open.

        // drawer. This area should not be touchable unless the ringer drawer is open.

        // In landscape the ringer expands to the left and it has to be ensured that if there

        // are multiple rows they are touchable.

        if (view == mTopContainer && !mIsRingerDrawerOpen) {

        if (view == mTopContainer && !mIsRingerDrawerOpen) {

            if (!isLandscape()) {

            if (!isLandscape()) {

                y += getRingerDrawerOpenExtraSize();

                y += getRingerDrawerOpenExtraSize();

            } else {

            } else if (getRingerDrawerOpenExtraSize() > getVisibleRowsExtraSize()) {

                x += getRingerDrawerOpenExtraSize();

                x += (getRingerDrawerOpenExtraSize() - getVisibleRowsExtraSize());

            }

            }

        }

        }
@@ -1968,6 +1970,21 @@ public class VolumeDialogImpl implements VolumeDialog, 
        return (mRingerCount - 1) * mRingerDrawerItemSize;

        return (mRingerCount - 1) * mRingerDrawerItemSize;

    }

    }





    /**

     * Return the size of the additionally visible rows next to the default stream.

     * An additional row is visible for example while receiving a voice call.

     */

    private int getVisibleRowsExtraSize() {

        VolumeRow activeRow = getActiveRow();

        int visibleRows = 0;

        for (final VolumeRow row : mRows) {

            if (shouldBeVisibleH(row, activeRow)) {

                visibleRows++;

            }

        }

        return (visibleRows - 1) * (mDialogWidth + mRingerRowsPadding);

    }



    private void updateBackgroundForDrawerClosedAmount() {

    private void updateBackgroundForDrawerClosedAmount() {

        if (mRingerAndDrawerContainerBackground == null) {

        if (mRingerAndDrawerContainerBackground == null) {

            return;

            return;