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

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

Merge "Remove QS scrolling."

parents 918e02f1 15781d60

packages/SystemUI/res/layout/qs_footer_impl.xml

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ 
    android:clipChildren="false"

    android:clipToPadding="false">



    <View

        android:id="@+id/qs_footer_background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/qs_background_primary" />



    <View

        android:id="@+id/qs_footer_divider"

        android:layout_width="match_parent"

packages/SystemUI/res/layout/qs_panel.xml

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
        android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/qs_footer_height"

        android:elevation="4dp"

    />

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

+3 −0
Original line number Diff line number Diff line
@@ -249,9 +249,11 @@ 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.getPageIndicator(), "alpha", 0, 1)

                    .addFloat(tileLayout, "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;
@@ -269,6 +271,7 @@ 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)

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

+0 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    private View mActionsContainer;

    private View mDragHandle;

    private final int mDragHandleExpandOffset;

    private View mBackground;



    public QSFooterImpl(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -100,7 +99,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mBackground = findViewById(R.id.qs_footer_background);

        mDivider = findViewById(R.id.qs_footer_divider);

        mEdit = findViewById(android.R.id.edit);

        mEdit.setOnClickListener(view ->
@@ -170,7 +168,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    @Nullable

    private TouchAnimator createFooterAnimator() {

        return new TouchAnimator.Builder()

                .addFloat(mBackground, "alpha", 0, 0.90f)

                .addFloat(mDivider, "alpha", 0, 1)

                .addFloat(mCarrierText, "alpha", 0, 1)

                .addFloat(mActionsContainer, "alpha", 0, 1)

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class QSFragment extends Fragment implements QS { 


    @Override

    public boolean onInterceptTouchEvent(MotionEvent event) {

        return isCustomizing() || mQSPanel.onInterceptTouchEvent(event);

        return isCustomizing();

    }



    @Override