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

Commit a7af749c authored by Christian Göllner's avatar Christian Göllner
Browse files

Split shade: fix QS/Media briefly showing on AOD when locking the screen 

When we lock the screen, QS are hidden by being moved up by the height of
the QS header. This works on portrait, but on split shade QS uses the
entire height of the screen, so this movement amount has to be adjusted.

Fixes: 223770585
Test: Unit tests + Manually
Change-Id: Ie82d75cc677da3567790887eab096d86afd6abd5
parent 2c6eec29

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

+20 −1
Original line number Diff line number Diff line
@@ -751,13 +751,32 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 


    @Override

    public int getQsMinExpansionHeight() {

        if (mInSplitShade) {

            return getQsMinExpansionHeightForSplitShade();

        }

        return mHeader.getHeight();

    }



    /**

     * Returns the min expansion height for split shade.

     *

     * On split shade, QS is always expanded and goes from the top of the screen to the bottom of

     * the QS container.

     */

    private int getQsMinExpansionHeightForSplitShade() {

        getView().getLocationOnScreen(mTemp);

        int top = mTemp[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

        // top margin.

        return originalTop + getView().getHeight();

    }



    @Override

    public void hideImmediately() {

        getView().animate().cancel();

        getView().setY(-mHeader.getHeight());

        getView().setY(-getQsMinExpansionHeight());

    }



    private final ViewTreeObserver.OnPreDrawListener mStartHeaderSlidingIn

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+76 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;
@@ -103,8 +104,8 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
    @Mock private QSPanel.QSTileLayout mQsTileLayout;

    @Mock private QSPanel.QSTileLayout mQQsTileLayout;

    @Mock private QSAnimator mQSAnimator;

    private View mQsFragmentView;

    @Mock private StatusBarStateController mStatusBarStateController;

    private View mQsFragmentView;



    public QSFragmentTest() {

        super(QSFragment.class);
@@ -238,6 +239,71 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
        assertThat(mQsFragmentView.getAlpha()).isEqualTo(1);

    }



    @Test

    public void getQsMinExpansionHeight_notInSplitShade_returnsHeaderHeight() {

        QSFragment fragment = resumeAndGetFragment();

        disableSplitShade();

        when(mHeader.getHeight()).thenReturn(1234);



        int height = fragment.getQsMinExpansionHeight();



        assertThat(height).isEqualTo(mHeader.getHeight());

    }



    @Test

    public void getQsMinExpansionHeight_inSplitShade_returnsAbsoluteBottomOfQSContainer() {

        int top = 1234;

        int height = 9876;

        QSFragment fragment = resumeAndGetFragment();

        enableSplitShade();

        setLocationOnScreen(mQsFragmentView, top);

        when(mQsFragmentView.getHeight()).thenReturn(height);



        int expectedHeight = top + height;

        assertThat(fragment.getQsMinExpansionHeight()).isEqualTo(expectedHeight);

    }



    @Test

    public void getQsMinExpansionHeight_inSplitShade_returnsAbsoluteBottomExcludingTranslation() {

        int top = 1234;

        int height = 9876;

        float translationY = -600f;

        QSFragment fragment = resumeAndGetFragment();

        enableSplitShade();

        setLocationOnScreen(mQsFragmentView, (int) (top + translationY));

        when(mQsFragmentView.getHeight()).thenReturn(height);

        when(mQsFragmentView.getTranslationY()).thenReturn(translationY);



        int expectedHeight = top + height;

        assertThat(fragment.getQsMinExpansionHeight()).isEqualTo(expectedHeight);

    }



    @Test

    public void hideImmediately_notInSplitShade_movesViewUpByHeaderHeight() {

        QSFragment fragment = resumeAndGetFragment();

        disableSplitShade();

        when(mHeader.getHeight()).thenReturn(555);



        fragment.hideImmediately();



        assertThat(mQsFragmentView.getY()).isEqualTo(-mHeader.getHeight());

    }



    @Test

    public void hideImmediately_inSplitShade_movesViewUpByQSAbsoluteBottom() {

        QSFragment fragment = resumeAndGetFragment();

        enableSplitShade();

        int top = 1234;

        int height = 9876;

        setLocationOnScreen(mQsFragmentView, top);

        when(mQsFragmentView.getHeight()).thenReturn(height);



        fragment.hideImmediately();



        int qsAbsoluteBottom = top + height;

        assertThat(mQsFragmentView.getY()).isEqualTo(-qsAbsoluteBottom);

    }



    @Override

    protected Fragment instantiate(Context context, String className, Bundle arguments) {

        MockitoAnnotations.initMocks(this);
@@ -332,4 +398,13 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
    private void setSplitShadeEnabled(boolean enabled) {

        getFragment().setInSplitShade(enabled);

    }



    private void setLocationOnScreen(View view, int top) {

        doAnswer(invocation -> {

            int[] locationOnScreen = invocation.getArgument(/* index= */ 0);

            locationOnScreen[0] = 0;

            locationOnScreen[1] = top;

            return null;

        }).when(view).getLocationOnScreen(any(int[].class));

    }

}