PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Iterate on data usage chart UI.

Browse Source 
Switched to inflating chart views from XML, using attributes for
configuration.  Start using drawable assets for chart components
instead of manually painting.  Include hand-cut assets, and animate
between states when touched to invoke.

Clamp sweeps to valid chart ranges and prepare for sweep labels.

Bug: 4768483, 4598460
Change-Id: Ic660c35bec826eb5e3f6a1dde3cc04d8c437ef2b
This commit is contained in:
Jeff Sharkey
2011-06-23 00:39:38 -07:00
parent aef3981e86
commit 52c3f4461b
27 changed files with 608 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/com/android/settings/widget/ChartView.java
View File

@@ -16,13 +16,11 @@
package com.android.settings.widget;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static com.google.common.base.Preconditions.checkNotNull;
import android.content.Context;
import android.graphics.Rect;
import android.util.Log;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.widget.FrameLayout;
@@ -38,21 +36,31 @@ public class ChartView extends FrameLayout {
// TODO: extend something that supports two-dimensional scrolling
final ChartAxis mHoriz;
final ChartAxis mVert;
ChartAxis mHoriz;
ChartAxis mVert;
private Rect mContent = new Rect();
public ChartView(Context context, ChartAxis horiz, ChartAxis vert) {
super(context);
public ChartView(Context context) {
this(context, null, 0);
}
mHoriz = checkNotNull(horiz, "missing horiz");
mVert = checkNotNull(vert, "missing vert");
public ChartView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public ChartView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
setClipToPadding(false);
setClipChildren(false);
}
void init(ChartAxis horiz, ChartAxis vert) {
mHoriz = checkNotNull(horiz, "missing horiz");
mVert = checkNotNull(vert, "missing vert");
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
mContent.set(getPaddingLeft(), getPaddingTop(), r - l - getPaddingRight(),
@@ -66,6 +74,7 @@ public class ChartView extends FrameLayout {
final Rect parentRect = new Rect();
final Rect childRect = new Rect();
final Rect extraMargins = new Rect();
for (int i = 0; i < getChildCount(); i++) {
final View child = getChildAt(i);
@@ -82,23 +91,22 @@ public class ChartView extends FrameLayout {
} else if (child instanceof ChartSweepView) {
// sweep is always placed along specific dimension
final ChartSweepView sweep = (ChartSweepView) child;
final ChartAxis axis = sweep.getAxis();
final float point = sweep.getPoint();
sweep.getExtraMargins(extraMargins);
if (axis == mHoriz) {
if (sweep.getFollowAxis() == ChartSweepView.HORIZONTAL) {
parentRect.left = parentRect.right = (int) point + getPaddingLeft();
parentRect.bottom += child.getMeasuredWidth();
parentRect.top -= extraMargins.top;
parentRect.bottom += extraMargins.bottom;
Gravity.apply(params.gravity, child.getMeasuredWidth(), parentRect.height(),
parentRect, childRect);
} else if (axis == mVert) {
} else {
parentRect.top = parentRect.bottom = (int) point + getPaddingTop();
parentRect.right += child.getMeasuredHeight();
parentRect.left -= extraMargins.left;
parentRect.right += extraMargins.right;
Gravity.apply(params.gravity, parentRect.width(), child.getMeasuredHeight(),
parentRect, childRect);
} else {
throw new IllegalStateException("unexpected axis");
}
}
@@ -106,16 +114,4 @@ public class ChartView extends FrameLayout {
}
}
public static LayoutParams buildChartParams() {
final LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
params.gravity = Gravity.LEFT | Gravity.BOTTOM;
return params;
}
public static LayoutParams buildSweepParams() {
final LayoutParams params = new LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
params.gravity = Gravity.CENTER;
return params;
}
}