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

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

Merge "Fixes in QS customization" into nyc-dev

parents 1ce163fe 04fd2496

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -77,11 +77,10 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene 
        TypedValue value = new TypedValue();

        TypedValue value = new TypedValue();

        mContext.getTheme().resolveAttribute(android.R.attr.homeAsUpIndicator, value, true);

        mContext.getTheme().resolveAttribute(android.R.attr.homeAsUpIndicator, value, true);

        mToolbar.setNavigationIcon(

        mToolbar.setNavigationIcon(

                getResources().getDrawable(R.drawable.ic_close_white, mContext.getTheme()));

                getResources().getDrawable(value.resourceId, mContext.getTheme()));

        mToolbar.setNavigationOnClickListener(new OnClickListener() {

        mToolbar.setNavigationOnClickListener(new OnClickListener() {

            @Override

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                save();

                hide((int) v.getX() + v.getWidth() / 2, (int) v.getY() + v.getHeight() / 2);

                hide((int) v.getX() + v.getWidth() / 2, (int) v.getY() + v.getHeight() / 2);

            }

            }

        });

        });
@@ -115,6 +114,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene 
    public void hide(int x, int y) {

    public void hide(int x, int y) {

        if (isShown) {

        if (isShown) {

            isShown = false;

            isShown = false;

            save();

            mClipper.animateCircularClip(x, y, false, mCollapseAnimationListener);

            mClipper.animateCircularClip(x, y, false, mCollapseAnimationListener);

        }

        }

    }

    }

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+1 −8
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import android.support.v7.widget.helper.ItemTouchHelper; 
import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View;

import android.view.View.OnTouchListener;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

import com.android.systemui.R;

import com.android.systemui.R;
@@ -159,13 +158,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 




        TileInfo info = mTiles.get(position);

        TileInfo info = mTiles.get(position);

        holder.mTileView.onStateChanged(info.state);

        holder.mTileView.onStateChanged(info.state);

        holder.mTileView.setOnTouchListener(new OnTouchListener() {

            @Override

            public boolean onTouch(View v, MotionEvent event) {

                mItemTouchHelper.startDrag(holder);

                return true;

            }

        });

    }

    }





    public SpanSizeLookup getSizeLookup() {

    public SpanSizeLookup getSizeLookup() {
@@ -179,6 +171,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 
            super(itemView);

            super(itemView);

            if (itemView instanceof FrameLayout) {

            if (itemView instanceof FrameLayout) {

                mTileView = (QSTileView) ((FrameLayout) itemView).getChildAt(0);

                mTileView = (QSTileView) ((FrameLayout) itemView).getChildAt(0);

                mTileView.setBackground(null);

            }

            }

        }

        }