summaryrefslogtreecommitdiffstats
path: root/res/layout/data_usage_chart.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-09-25 18:22:48 -0700
committerJeff Sharkey <jsharkey@android.com>2011-09-25 18:41:13 -0700
commit461842a8c0000ebc1351ec7fe30b0f820b769ccf (patch)
tree426614b67d2a3b83e1eb8beadc2323c9e4a1102b /res/layout/data_usage_chart.xml
parent2407efcf42baf1646094d80035997ff169d3eff4 (diff)
downloadpackages_apps_Settings-461842a8c0000ebc1351ec7fe30b0f820b769ccf.zip
packages_apps_Settings-461842a8c0000ebc1351ec7fe30b0f820b769ccf.tar.gz
packages_apps_Settings-461842a8c0000ebc1351ec7fe30b0f820b769ccf.tar.bz2
Data usage strings, sweep touches, fixes.
Change strings around limiting background data. Move limit/warning sweeps above inspection sweeps, and teach about additional neighbors on different axis. Guard against DialogFragment.show(), fix pie chart to draw edges, and remove data usage from battery UI. Bug: 5341374, 5337650, 5337385, 5319465, 5236335 Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
Diffstat (limited to 'res/layout/data_usage_chart.xml')
-rw-r--r--res/layout/data_usage_chart.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 38f1c11..f9d4642 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -59,6 +59,22 @@
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"
android:layout_height="wrap_content"
@@ -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>