From d39c6e4083f1212519d5dc14f64132a10f2b7c7a Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 4 Aug 2011 21:17:23 -0700 Subject: Data usage app icons and details, chart labels. Add app icons into both summary list and details pane. Also show list of all applications merged under a UID. Draw dates on chart axis, and avoid flashing policy sweeps when switching networks in detail mode. Bug: 5087283, 5038812 Change-Id: I1dcd03ca85b517f8726452af8a46b4be9b3d20f1 --- AndroidManifest.xml | 3 +- res/layout/data_usage_app_title.xml | 22 ++++ res/layout/data_usage_chart.xml | 2 +- res/layout/data_usage_detail.xml | 21 ++-- res/layout/data_usage_header.xml | 2 + res/layout/data_usage_item.xml | 10 +- res/values/strings.xml | 2 +- src/com/android/settings/DataUsageSummary.java | 120 ++++++++++++++------- src/com/android/settings/widget/ChartGridView.java | 56 +++++++++- .../android/settings/widget/ChartSweepView.java | 1 - .../settings/widget/DataUsageChartView.java | 1 + 11 files changed, 183 insertions(+), 57 deletions(-) create mode 100644 res/layout/data_usage_app_title.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b2391a..a99eb66 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1185,7 +1185,8 @@ + android:label="@string/data_usage_summary_title" + android:uiOptions="none"> diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml new file mode 100644 index 0000000..baaa685 --- /dev/null +++ b/res/layout/data_usage_app_title.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 3ae8a03..c1f6c27 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -30,7 +30,7 @@ settings:primaryDrawable="@drawable/data_grid_primary" settings:secondaryDrawable="@drawable/data_grid_secondary" settings:borderDrawable="@drawable/data_grid_border" - settings:labelColor="#24aae1" /> + settings:labelColor="#667bb5" /> - + - + android:layout_height="match_parent" + android:layout_marginLeft="16dip" + android:layout_marginTop="8dip" + android:orientation="vertical" />