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

Commit 0004d02e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ic81d8745,I8065885e 

* changes:
  QS Animation tweaks
  Fix spacing for loading in QS
parents 3e176f66 c34e2496

packages/SystemUI/res/layout/qs_detail.xml

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
        android:alpha="0"

        android:background="@color/qs_detail_progress_track"

        android:src="@drawable/indeterminate_anim"

        android:scaleType="fitXY"

        android:translationY="16dp"

        />



    <com.android.systemui.qs.NonInterceptingScrollView

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

+6 −4
Original line number Diff line number Diff line
@@ -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();

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

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

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

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