Merge "Data usage strings, sweep touches, fixes."

This commit is contained in:
Jeff Sharkey
2011-09-26 15:31:57 -07:00
committed by Android (Google) Code Review
7 changed files with 174 additions and 98 deletions

View File

@@ -58,6 +58,22 @@
settings:fillColor="#c0ba7f3e"
settings:fillColorSecondary="#60ba7f3e" />
<com.android.settings.widget.ChartSweepView
android:id="@+id/sweep_left"
android:layout_width="wrap_content"
android:layout_height="match_parent"
settings:sweepDrawable="@drawable/data_sweep_left"
settings:followAxis="horizontal"
settings:neighborMargin="5dip" />
<com.android.settings.widget.ChartSweepView
android:id="@+id/sweep_right"
android:layout_width="wrap_content"
android:layout_height="match_parent"
settings:sweepDrawable="@drawable/data_sweep_right"
settings:followAxis="horizontal"
settings:neighborMargin="5dip" />
<com.android.settings.widget.ChartSweepView
android:id="@+id/sweep_warning"
android:layout_width="match_parent"
@@ -82,20 +98,4 @@
settings:labelTemplate="@string/data_usage_sweep_limit"
settings:labelColor="#c01a2c" />
<com.android.settings.widget.ChartSweepView
android:id="@+id/sweep_left"
android:layout_width="wrap_content"
android:layout_height="match_parent"
settings:sweepDrawable="@drawable/data_sweep_left"
settings:followAxis="horizontal"
settings:neighborMargin="5dip" />
<com.android.settings.widget.ChartSweepView
android:id="@+id/sweep_right"
android:layout_width="wrap_content"
android:layout_height="match_parent"
settings:sweepDrawable="@drawable/data_sweep_right"
settings:followAxis="horizontal"
settings:neighborMargin="5dip" />
</com.android.settings.widget.ChartDataUsageView>