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

Commit 49349717 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix QS Issues" into nyc-dev

parents 2cecbb24 66eaf31a

packages/SystemUI/res/layout/qs_panel.xml

+1 −3
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/res/values-sw600dp/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -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">

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

+5 −2
Original line number Diff line number Diff line
@@ -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);

    }

}

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

+5 −3
Original line number Diff line number Diff line
@@ -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() {

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {