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

Commit e65524a6 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by android-build-merger
Browse files

Merge "sysui: refactoring qs for extensibility" into nyc-dev 

am: a01582ac

* commit 'a01582ac':
  sysui: refactoring qs for extensibility

Change-Id: I94b148c241053ea6bc7c350a651ba8293c7e3bc5
parents 52546b01 a01582ac

packages/SystemUI/res/layout/qs_tile_label.xml

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
            android:gravity="center_horizontal"

            android:minLines="2"

            android:padding="0dp"

            android:fontFamily="sans-serif-condensed"

            android:textStyle="normal"

            android:textSize="@dimen/qs_tile_text_size"

            android:textAppearance="@style/TextAppearance.QS.TileLabel"

            android:clickable="false" />

     <ImageView android:id="@+id/restricted_padlock"

            android:layout_width="@dimen/qs_tile_text_size"

packages/SystemUI/res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ 
        <item name="android:textColor">@color/data_usage_secondary</item>

    </style>



    <style name="TextAppearance.QS.TileLabel">

        <item name="android:textSize">@dimen/qs_tile_text_size</item>

        <item name="android:fontFamily">sans-serif-condensed</item>

    </style>



    <style name="BaseBrightnessDialogContainer">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

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

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
        for (QSTile<?> tile : tiles) {

            QSTileBaseView tileView = mQsPanel.getTileView(tile);

            final TextView label = ((QSTileView) tileView).getLabel();

            final View tileIcon = tileView.getIcon();

            final View tileIcon = tileView.getIcon().getIconView();

            if (count < mNumQuickTiles && mAllowFancy) {

                // Quick tiles.

                QSTileBaseView quickTileView = mQuickQsPanel.getTileView(tile);

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

+9 −5
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ import java.util.Objects; 


public class QSIconView extends ViewGroup {



    private final View mIcon;

    private final int mIconSizePx;

    private final int mTilePaddingBelowIconPx;

    protected final View mIcon;

    protected final int mIconSizePx;

    protected final int mTilePaddingBelowIconPx;

    private boolean mAnimationEnabled = true;



    public QSIconView(Context context) {
@@ -50,6 +50,10 @@ public class QSIconView extends ViewGroup { 
        mAnimationEnabled = false;

    }



    public View getIconView() {

        return mIcon;

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int w = MeasureSpec.getSize(widthMeasureSpec);
@@ -109,11 +113,11 @@ public class QSIconView extends ViewGroup { 
        return icon;

    }



    protected static int exactly(int size) {

    protected final int exactly(int size) {

        return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);

    }



    protected static void layout(View child, int left, int top) {

    protected final void layout(View child, int left, int top) {

        child.layout(left, top, left + child.getMeasuredWidth(), top + child.getMeasuredHeight());

    }

}

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

+9 −14
Original line number Diff line number Diff line
@@ -85,20 +85,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 
                R.layout.quick_settings_brightness_dialog, this, false);

        addView(mBrightnessView);



        mTileLayout = (QSTileLayout) LayoutInflater.from(mContext).inflate(

                R.layout.qs_paged_tile_layout, this, false);

        addView((View) mTileLayout);

        findViewById(android.R.id.edit).setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(final View v) {

                mHost.startRunnableDismissingKeyguard(new Runnable() {

                    @Override

                    public void run() {

                        showEdit(v);

                    }

                });

            }

        });

        setupTileLayout();



        mFooter = new QSFooter(this, context);

        addView(mFooter.getView());
@@ -111,6 +98,14 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 


    }



    protected void setupTileLayout() {

        mTileLayout = (QSTileLayout) LayoutInflater.from(mContext).inflate(

                R.layout.qs_paged_tile_layout, this, false);

        addView((View) mTileLayout);

        findViewById(android.R.id.edit).setOnClickListener(view ->

                mHost.startRunnableDismissingKeyguard(() -> showEdit(view)));

    }



    public boolean isShowingCustomize() {

        return mCustomizePanel != null && mCustomizePanel.isCustomizing();

    }