Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "sysui: refactor for extensibility."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-18 21:47:40 +00:00
committed by Android (Google) Code Review
parent 9a9fae1d53 72a6387ce4
commit bb711dfeb7
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/layout/qs_detail_item.xml
View File

@@ -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"

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -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>

6
packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
View File

@@ -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);