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

Commit 8db381c0 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp 

* changes:
  Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am: 425023fc
  QS: Fixup footer + animations am: df36aed8
parents 1549c28f 56c50d82

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

+4 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.util.Log; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.android.systemui.R;

import com.android.systemui.qs.QSPanel.QSTileLayout;

import com.android.systemui.qs.QSPanel.TileRecord;
@@ -207,6 +208,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
            }

            if (DEBUG) Log.d(TAG, "Size: " + mNumPages);

            mPageIndicator.setNumPages(mNumPages);

            mDecorGroup.setVisibility(mNumPages > 1 ? View.VISIBLE : View.GONE);

            setAdapter(mAdapter);

            mAdapter.notifyDataSetChanged();

            setCurrentItem(0, false);
@@ -238,7 +240,8 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
                maxHeight = height;

            }

        }

        setMeasuredDimension(getMeasuredWidth(), maxHeight + mDecorGroup.getMeasuredHeight());

        setMeasuredDimension(getMeasuredWidth(), maxHeight

                + (mDecorGroup.getVisibility() != View.GONE ? mDecorGroup.getMeasuredHeight() : 0));

    }



    private final Runnable mDistribute = new Runnable() {

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

+3 −1
Original line number Diff line number Diff line
@@ -230,7 +230,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
            // Fade in the tiles/labels as we reach the final position.

            mFirstPageDelayedAnimator = new TouchAnimator.Builder()

                    .setStartDelay(EXPANDED_TILE_DELAY)

                    .addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1).build();

                    .addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1)

                    .addFloat(mQsPanel.getFooter().getView(), "alpha", 0, 1).build();

            mAllViews.add(mQsPanel.getFooter().getView());

            Path path = new Path();

            path.moveTo(0, 0);

            path.cubicTo(0, 0, 0, 1, 1, 1);

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

+4 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.res.Resources; 
import android.os.Handler;

import android.os.Message;

import android.util.AttributeSet;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;
@@ -505,6 +504,10 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 
        return null;

    }



    public QSFooter getFooter() {

        return mFooter;

    }



    private class H extends Handler {

        private static final int SHOW_DETAIL = 1;

        private static final int SET_TILE_VISIBILITY = 2;