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

Commit cb340da5 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix QS lock screen animation" into oc-dev am: aa2286e4 

am: a86cc709

Change-Id: I120be1f1bda0b853fa308d996465ed9e9abfd441
parents b3c27864 a86cc709

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 




        QSTileLayout tileLayout = mQsPanel.getTileLayout();

        QSTileLayout tileLayout = mQsPanel.getTileLayout();

        mAllViews.add((View) tileLayout);

        mAllViews.add((View) tileLayout);

        int heightDiff = mQsPanel.getBottom() - mQs.getHeader().getBottom()

        int height = mQs.getView() != null ? mQs.getView().getMeasuredHeight() : 0;

        int heightDiff = height - mQs.getHeader().getBottom()

                + mQs.getHeader().getPaddingBottom();

                + mQs.getHeader().getPaddingBottom();

        firstPageBuilder.addFloat(tileLayout, "translationY", heightDiff, 0);

        firstPageBuilder.addFloat(tileLayout, "translationY", heightDiff, 0);

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -253,7 +253,8 @@ public class QSFragment extends Fragment implements QS { 
        }

        }

        mHeader.setExpansion(mKeyguardShowing ? 1 : expansion);

        mHeader.setExpansion(mKeyguardShowing ? 1 : expansion);

        mFooter.setExpansion(mKeyguardShowing ? 1 : expansion);

        mFooter.setExpansion(mKeyguardShowing ? 1 : expansion);

        int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom();

        int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom()

                + mFooter.getHeight();

        mQSPanel.setTranslationY(translationScaleY * heightDiff);

        mQSPanel.setTranslationY(translationScaleY * heightDiff);

        mQSDetail.setFullyExpanded(expansion == 1);

        mQSDetail.setFullyExpanded(expansion == 1);
@@ -262,7 +263,7 @@ public class QSFragment extends Fragment implements QS { 
        }

        }





        // Set bounds on the QS panel so it doesn't run over the header.

        // Set bounds on the QS panel so it doesn't run over the header.

        mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion));

        mQsBounds.top = (int) -mQSPanel.getTranslationY();

        mQsBounds.right = mQSPanel.getWidth();

        mQsBounds.right = mQSPanel.getWidth();

        mQsBounds.bottom = mQSPanel.getHeight();

        mQsBounds.bottom = mQSPanel.getHeight();

        mQSPanel.setClipBounds(mQsBounds);

        mQSPanel.setClipBounds(mQsBounds);