diff options
6 files changed, 17 insertions, 14 deletions
diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index 3ee2475ec94a..994d3c943671 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -28,9 +28,7 @@ android:layout_marginTop="@dimen/status_bar_header_height" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="8dp" - android:clipToPadding="false" - android:clipChildren="false" /> + android:paddingBottom="8dp" /> <include layout="@layout/quick_status_bar_expanded_header" /> diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw600dp/styles.xml index 4d7d6b5c9f77..791d7615eb80 100644 --- a/packages/SystemUI/res/values-sw600dp/styles.xml +++ b/packages/SystemUI/res/values-sw600dp/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer"> - <item name="android:layout_width">480dp</item> + <item name="android:layout_width">@dimen/standard_notification_panel_width</item> </style> <style name="UserDetailView"> diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index 0915ee1c1745..3b26aa6d09f3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -38,7 +38,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { if (mPageIndicator == null) return; mPageIndicator.setLocation(position); if (mPageListener != null) { - mPageListener.onPageChanged(position); + mPageListener.onPageChanged(position == 0); } } @@ -47,6 +47,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { int positionOffsetPixels) { if (mPageIndicator == null) return; mPageIndicator.setLocation(position + positionOffset); + if (mPageListener != null) { + mPageListener.onPageChanged(position == 0 && positionOffsetPixels == 0); + } } @Override @@ -209,6 +212,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { }; public interface PageListener { - void onPageChanged(int page); + void onPageChanged(boolean isFirst); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index dc645914e183..c31bb33d6a41 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -69,11 +69,13 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha } @Override - public void onPageChanged(int page) { - mOnFirstPage = page == 0; - if (!mOnFirstPage) { + public void onPageChanged(boolean isFirst) { + if (mOnFirstPage == isFirst) return; + if (!isFirst) { + setPosition(1); clearAnimationState(); } + mOnFirstPage = isFirst; } private void updateAnimators() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java index 94d8524188ee..026dd0e74a0a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java @@ -58,7 +58,7 @@ public class TouchAnimator { } if (mListener != null) { if (mLastT == 0 || mLastT == 1) { - if (t != 0) { + if (t != mLastT) { mListener.onAnimationStarted(); } } else if (t == 1) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java index 3bd68a945592..ab347686be81 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java @@ -80,13 +80,13 @@ public class BrightnessMirrorController { // Original is slightly larger than the mirror, so make sure to use the center for the // positioning. - int originalX = mInt2Cache[0] + original.getWidth()/2; - int originalY = mInt2Cache[1]; + int originalX = mInt2Cache[0] + original.getWidth() / 2; + int originalY = mInt2Cache[1] + original.getHeight() / 2; mBrightnessMirror.setTranslationX(0); mBrightnessMirror.setTranslationY(0); mBrightnessMirror.getLocationInWindow(mInt2Cache); - int mirrorX = mInt2Cache[0] + mBrightnessMirror.getWidth()/2; - int mirrorY = mInt2Cache[1]; + int mirrorX = mInt2Cache[0] + mBrightnessMirror.getWidth() / 2; + int mirrorY = mInt2Cache[1] + mBrightnessMirror.getHeight() / 2; mBrightnessMirror.setTranslationX(originalX - mirrorX); mBrightnessMirror.setTranslationY(originalY - mirrorY); } |