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

Commit 75572e6a authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix media side clipping on large screen portrait" into tm-dev am: cf55babf am: 1843c265 

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



Change-Id: I894fe8015a0fc4eec124babe13ef21de46a08675
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fba10a8 1843c265

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+8 −7
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    private float mLastPanelFraction;

    private float mSquishinessFraction = 1;

    private boolean mQsDisabled;

    private int[] mTemp = new int[2];

    private int[] mLocationTemp = new int[2];



    private final RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler;

    private final MediaHost mQsMediaHost;
@@ -654,9 +654,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        }

        mQSPanelScrollView.setClipBounds(mQsBounds);



        mQSPanelScrollView.getLocationOnScreen(mTemp);

        int top = mTemp[1];

        mQsMediaHost.getCurrentClipping().set(0, top, getView().getMeasuredWidth(),

        mQSPanelScrollView.getLocationOnScreen(mLocationTemp);

        int left = mLocationTemp[0];

        int top = mLocationTemp[1];

        mQsMediaHost.getCurrentClipping().set(left, top, left + getView().getMeasuredWidth(),

                top + mQSPanelScrollView.getMeasuredHeight()

                        - mQSPanelScrollView.getPaddingBottom());

    }
@@ -801,8 +802,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
     * the QS container.

     */

    private int getQsMinExpansionHeightForSplitShade() {

        getView().getLocationOnScreen(mTemp);

        int top = mTemp[1];

        getView().getLocationOnScreen(mLocationTemp);

        int top = mLocationTemp[1];

        // We want to get the original top position, so we subtract any translation currently set.

        int originalTop = (int) (top - getView().getTranslationY());

        // On split shade the QS view doesn't start at the top of the screen, so we need to add the
@@ -866,7 +867,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        indentingPw.println("mLastPanelFraction: " + mLastPanelFraction);

        indentingPw.println("mSquishinessFraction: " + mSquishinessFraction);

        indentingPw.println("mQsDisabled: " + mQsDisabled);

        indentingPw.println("mTemp: " + Arrays.toString(mTemp));

        indentingPw.println("mTemp: " + Arrays.toString(mLocationTemp));

        indentingPw.println("mShowCollapsedOnKeyguard: " + mShowCollapsedOnKeyguard);

        indentingPw.println("mLastKeyguardAndExpanded: " + mLastKeyguardAndExpanded);

        indentingPw.println("mState: " + StatusBarState.toString(mState));