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

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

Merge "sysui: refactor for extensibility."

parents 9a9fae1d 72a6387c

packages/SystemUI/res/layout/qs_detail_item.xml

+4 −3
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ 


    <ImageView

        android:id="@android:id/icon"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_marginEnd="20dp" />

        android:layout_width="@dimen/qs_detail_item_icon_size"

        android:layout_height="@dimen/qs_detail_item_icon_size"

        android:layout_marginStart="@dimen/qs_detail_item_icon_marginStart"

        android:layout_marginEnd="@dimen/qs_detail_item_icon_marginEnd" />



    <LinearLayout

        android:layout_width="0dp"

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ 
    <dimen name="qs_expand_margin">0dp</dimen>

    <dimen name="qs_battery_padding">2dp</dimen>

    <dimen name="qs_detail_items_padding_top">4dp</dimen>

    <dimen name="qs_detail_item_icon_size">24dp</dimen>

    <dimen name="qs_detail_item_icon_marginStart">0dp</dimen>

    <dimen name="qs_detail_item_icon_marginEnd">20dp</dimen>



    <!-- Desired qs icon overlay size. -->

    <dimen name="qs_detail_icon_overlay_size">24dp</dimen>



    <dimen name="segmented_button_spacing">0dp</dimen>

    <dimen name="borderless_button_radius">2dp</dimen>

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

+4 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public class QSDetailItems extends FrameLayout { 
    private static final String TAG = "QSDetailItems";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private final int mQsDetailIconOverlaySize;

    private final Context mContext;

    private final H mHandler = new H();

    private final Adapter mAdapter = new Adapter();
@@ -60,6 +61,8 @@ public class QSDetailItems extends FrameLayout { 
        super(context, attrs);

        mContext = context;

        mTag = TAG;

        mQsDetailIconOverlaySize = (int) getResources().getDimension(

                R.dimen.qs_detail_icon_overlay_size);

    }



    public static QSDetailItems convertOrInflate(Context context, View convert, ViewGroup parent) {
@@ -182,8 +185,7 @@ public class QSDetailItems extends FrameLayout { 
            iv.setImageResource(item.icon);

            iv.getOverlay().clear();

            if (item.overlay != null) {

                item.overlay.setBounds(0, 0, item.overlay.getIntrinsicWidth(),

                        item.overlay.getIntrinsicHeight());

                item.overlay.setBounds(0, 0, mQsDetailIconOverlaySize, mQsDetailIconOverlaySize);

                iv.getOverlay().add(item.overlay);

            }

            final TextView title = (TextView) view.findViewById(android.R.id.title);