summaryrefslogtreecommitdiffstats
path: root/res/layout/data_usage_chart.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-09-13 19:56:45 -0700
committerJeff Sharkey <jsharkey@android.com>2011-09-13 20:24:14 -0700
commita53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2 (patch)
treeee3addfdd86cd4fde72ceeb67d290140c64f4b7a /res/layout/data_usage_chart.xml
parentec10578884e3c23b3585bccde76e9c12978dda05 (diff)
downloadpackages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.zip
packages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.tar.gz
packages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.tar.bz2
Data usage: precise editing, restrict help, D-pad.
Introduce dialogs for precise editing of network policy warning/limit values, triggered by click on sweep labels. Show up to 999MB before rounding to GB, and round to nearest 5MB value when dragging. Partial D-pad navigation around chart controls. Fix jumping when relayout during drag, and fix sweep overlap bug. When restricting data without limited networks, show dialog help to guide user towards network limit. When reloading chart data, try restoring to nearest cycle. Bug: 5289641, 5111701, 5226078 Change-Id: Ic59dee6496c480a64dc56f8534acf4d81b50bca7
Diffstat (limited to 'res/layout/data_usage_chart.xml')
-rw-r--r--res/layout/data_usage_chart.xml34
1 files changed, 18 insertions, 16 deletions
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index a1a7ec4..38f1c11 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -59,25 +59,10 @@
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"
+ android:nextFocusUp="@+id/sweep_limit"
settings:sweepDrawable="@drawable/data_sweep_warning"
settings:followAxis="vertical"
settings:neighborMargin="5dip"
@@ -89,6 +74,7 @@
android:id="@+id/sweep_limit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:nextFocusDown="@+id/sweep_warning"
settings:sweepDrawable="@drawable/data_sweep_limit"
settings:followAxis="vertical"
settings:neighborMargin="5dip"
@@ -96,4 +82,20 @@
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>