diff options
3 files changed, 10 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index a30b03b9a411..6b507645e4d0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -230,12 +230,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha firstPageBuilder.addFloat(brightness, "translationY", heightDiff, 0); mBrightnessAnimator = new TouchAnimator.Builder() .addFloat(brightness, "alpha", 0, 1) - .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1) - .addFloat(mQsPanel.getDivider(), "alpha", 0, 1) .setStartDelay(.5f) .build(); - mAllViews.add(mQsPanel.getPageIndicator()); - mAllViews.add(mQsPanel.getDivider()); mAllViews.add(brightness); } else { mBrightnessAnimator = null; @@ -247,7 +243,11 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha mFirstPageDelayedAnimator = new TouchAnimator.Builder() .setStartDelay(EXPANDED_TILE_DELAY) .addFloat(tileLayout, "alpha", 0, 1) + .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1) + .addFloat(mQsPanel.getDivider(), "alpha", 0, 1) .addFloat(mQsPanel.getFooter().getView(), "alpha", 0, 1).build(); + mAllViews.add(mQsPanel.getPageIndicator()); + mAllViews.add(mQsPanel.getDivider()); mAllViews.add(mQsPanel.getFooter().getView()); float px = 0; float py = 1; @@ -264,6 +264,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha } mNonfirstPageAnimator = new TouchAnimator.Builder() .addFloat(mQuickQsPanel, "alpha", 1, 0) + .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1) + .addFloat(mQsPanel.getDivider(), "alpha", 0, 1) .setListener(mNonFirstPageListener) .setEndDelay(.5f) .build(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index a84138d85a8b..716816ddb1a0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -162,11 +162,10 @@ public class QSFooter extends LinearLayout implements final Builder builder = new Builder() .addFloat(mSettingsContainer, "translationX", -(remaining - defSpace), 0) .addFloat(mSettingsButton, "rotation", -120, 0) - .addFloat(mAlarmStatus, "alpha", 0, 1) - .addFloat(mAlarmStatus, "translationX", 0, -mDate.getWidth()) - .addFloat(mAlarmStatusCollapsed, "translationX", 0, -mDate.getWidth()); + .addFloat(mAlarmStatus, "alpha", 0, 1); if (mAlarmShowing) { - builder.addFloat(mDate, "alpha", 1, 0); + builder.addFloat(mDate, "alpha", 1, 0) + .addFloat(mDateTimeGroup, "translationX", 0, -mDate.getWidth()); } mAnimator = builder.build(); setExpansion(mExpansionAmount); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 63563b2e31ed..1f49c1ac19f8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -221,7 +221,7 @@ public class QSFragment extends Fragment implements QS { } // Set bounds on the QS panel so it doesn't run over the header. - mQsBounds.top = (int) (mHeader.getBottom() * (1 - expansion)); + mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion)); mQsBounds.right = mQSPanel.getWidth(); mQsBounds.bottom = mQSPanel.getHeight(); mQSPanel.setClipBounds(mQsBounds); |