Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix QS lock screen animation" into oc-dev

Browse Source 
am: aa2286e417

Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f
This commit is contained in:
Jason Monk
2017-06-26 20:12:21 +00:00
committed by android-build-merger
parent 8714d472bf aa2286e417
commit be163c055e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
View File

@@ -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);

5
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -256,7 +256,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);
@@ -265,7 +266,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);