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

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

Merge changes Icb8e2097,I9a2a16f9 into nyc-dev 

* changes:
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
parents 0cbfdd3a 8d1253e9

packages/SystemUI/res/layout/qs_paged_page.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/tile_page"

    android:layout_width="match_parent"

    android:layout_height="wrap_content" />
 
    android:layout_height="wrap_content"

    android:clipChildren="false"

    android:clipToPadding="false" />

packages/SystemUI/res/layout/qs_paged_tile_layout.xml

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
<com.android.systemui.qs.PagedTileLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:clipChildren="false"

    android:clipToPadding="false">



    <FrameLayout

        android:id="@+id/page_decor"

packages/SystemUI/res/layout/qs_panel.xml

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
            android:layout_marginTop="@dimen/status_bar_header_height"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingBottom="8dp" />

            android:paddingBottom="8dp"

            android:clipToPadding="false"

            android:clipChildren="false" />



    <include layout="@layout/quick_status_bar_expanded_header" />

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
    <dimen name="qs_date_alarm_anim_translation">26dp</dimen>

    <dimen name="qs_date_collapsed_text_size">14sp</dimen>

    <dimen name="qs_date_text_size">16sp</dimen>

    <dimen name="qs_header_gear_translation">120dp</dimen>

    <dimen name="qs_header_gear_translation">150dp</dimen>

    <dimen name="qs_page_indicator_size">12dp</dimen>

    <dimen name="qs_tile_icon_size">24dp</dimen>

    <dimen name="qs_tile_text_size">12sp</dimen>

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

+14 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 


    private int mNumPages;

    private View mDecorGroup;

    private PageListener mPageListener;



    public PagedTileLayout(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -36,10 +37,14 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
            public void onPageSelected(int position) {

                if (mPageIndicator == null) return;

                mPageIndicator.setLocation(position);

                if (mPageListener != null) {

                    mPageListener.onPageChanged(position);

                }

            }



            @Override

            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {

            public void onPageScrolled(int position, float positionOffset,

                    int positionOffsetPixels) {

                if (mPageIndicator == null) return;

                mPageIndicator.setLocation(position + positionOffset);

            }
@@ -80,6 +85,10 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        }

    }



    public void setPageListener(PageListener listener) {

        mPageListener = listener;

    }



    private void postDistributeTiles() {

        removeCallbacks(mDistribute);

        post(mDistribute);
@@ -198,4 +207,8 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
            return view == object;

        }

    };



    public interface PageListener {

        void onPageChanged(int page);

    }

}