diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml index 25fd8886511..303a5b71a6c 100644 --- a/res/layout/preference_memoryusage.xml +++ b/res/layout/preference_memoryusage.xml @@ -16,6 +16,7 @@ - \ No newline at end of file + settings:minTickWidth="6dip" + settings:emptyColor="@color/memory_avail"> + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 57d0f45ff77..7cff69c2e3d 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -46,5 +46,7 @@ + + diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java index 2f174fb7379..7d023010efd 100644 --- a/src/com/android/settings/deviceinfo/PercentageBarChart.java +++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java @@ -36,6 +36,8 @@ public class PercentageBarChart extends View { private Collection mEntries; + private int mMinTickWidth = 1; + public static class Entry { public final float percentage; public final Paint paint; @@ -49,21 +51,9 @@ public class PercentageBarChart extends View { public PercentageBarChart(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart, 0, 0); - - int emptyColor = Color.BLACK; - - int n = a.getIndexCount(); - for (int i = 0; i < n; i++) { - int attr = a.getIndex(i); - - switch (attr) { - case R.styleable.PercentageBarChart_emptyColor: - emptyColor = a.getColor(attr, 0); - break; - } - } - + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart); + mMinTickWidth = a.getDimensionPixelSize(R.styleable.PercentageBarChart_minTickWidth, 1); + int emptyColor = a.getColor(R.styleable.PercentageBarChart_emptyColor, Color.BLACK); a.recycle(); mEmptyPaint.setColor(emptyColor); @@ -89,7 +79,7 @@ public class PercentageBarChart extends View { if (e.percentage == 0f) { entryWidth = 0; } else { - entryWidth = Math.max(1, (int) (width * e.percentage)); + entryWidth = Math.max(mMinTickWidth, (int) (width * e.percentage)); } final int nextX = lastX + entryWidth;