summaryrefslogtreecommitdiffstats
path: root/res/layout/data_usage_chart.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-27 17:09:43 -0700
committerJeff Sharkey <jsharkey@android.com>2011-08-28 16:34:25 -0700
commit55d18a57e45e11f657346cbaa7fd454f92775229 (patch)
tree9731a8e5f29684fb2ac779aaf1e8e25f29d1af6f /res/layout/data_usage_chart.xml
parentd66b61908d8532af4cfecbf0185b452c2833a3b0 (diff)
downloadpackages_apps_Settings-55d18a57e45e11f657346cbaa7fd454f92775229.zip
packages_apps_Settings-55d18a57e45e11f657346cbaa7fd454f92775229.tar.gz
packages_apps_Settings-55d18a57e45e11f657346cbaa7fd454f92775229.tar.bz2
Data usage UI fixes; sweeps, combined history.
Fix sweep z-order so that limit are always above inspection range, and draw shadows behind sweep labels. Narrower margins for sweeps with labels; push labels to keep from overlapping. Generous touch targets on sweeps, and delegate touches to neighboring sweep if nearer. Refresh sweep layout during axis zoom, and don't allow zoom below default minimum. Let inspection sweeps move beyond valid data ranges. Draw less-frequent tick marks when working with large axis ranges. Remove Wi-Fi policies but continue showing historical data. Write NetworkPolicy if modified during read, and snapshot when async write requested. Handle combined UID histories for "Android OS." Bug: 5191421, 5092579, 5225988, 5221101, 5221065, 5221005, 5150906, 5058025 Change-Id: Id51652e8a10bb90e1345f7a8af01bd70cb8ac677
Diffstat (limited to 'res/layout/data_usage_chart.xml')
-rw-r--r--res/layout/data_usage_chart.xml40
1 files changed, 20 insertions, 20 deletions
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 7f63f3f..2e0cbdd 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.settings.widget.DataUsageChartView
+<com.android.settings.widget.ChartDataUsageView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:id="@+id/chart"
@@ -56,12 +56,28 @@
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"
settings:sweepDrawable="@drawable/data_sweep_warning"
settings:followAxis="vertical"
- settings:neighborMargin="40dip"
+ settings:neighborMargin="5dip"
settings:labelSize="60dip"
settings:labelTemplate="@string/data_usage_sweep_warning"
settings:labelColor="#f7931d" />
@@ -72,25 +88,9 @@
android:layout_height="wrap_content"
settings:sweepDrawable="@drawable/data_sweep_limit"
settings:followAxis="vertical"
- settings:neighborMargin="40dip"
+ settings:neighborMargin="5dip"
settings:labelSize="60dip"
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.DataUsageChartView>
+</com.android.settings.widget.ChartDataUsageView>