From 54d0af57fd2dca14f0c7c34a48942aa6ecdc3f06 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 11 Aug 2011 18:26:57 -0700
Subject: Foreground/background network stats pie chart.

Load foreground/background network stats, showing combined in chart
series, and also separated in pie chart.  Padding to match spec,
updated action bar tabs, and limit width for wide devices.  Also
clear UI options for requesting fragments.  Move to action bar
overflow menu instead of custom icon.  Show detail chart data outside
current inspection range.

Bug: 5106163, 5143670, 5163064, 5162671, 5148713, 5129036, 5096626
Change-Id: I548fef209e1f714f70ee6bf7098dbdb881692df4
---
 res/menu/data_usage.xml | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
index 24b0de4..4e938aa 100644
--- a/res/menu/data_usage.xml
+++ b/res/menu/data_usage.xml
@@ -16,30 +16,23 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_sysbar_quicksettings"
-        android:showAsAction="always">
-        <menu>
-            <item
-                android:id="@+id/data_usage_menu_roaming"
-                android:title="@string/data_usage_menu_roaming"
-                android:checkable="true" />
-            <item
-                android:id="@+id/data_usage_menu_restrict_background"
-                android:title="@string/data_usage_menu_restrict_background"
-                android:checkable="true" />
-            <item
-                android:id="@+id/data_usage_menu_split_4g"
-                android:title="@string/data_usage_menu_split_4g"
-                android:checkable="true" />
-            <item
-                android:id="@+id/data_usage_menu_show_wifi"
-                android:title="@string/data_usage_menu_show_wifi"
-                android:checkable="true" />
-            <item
-                android:id="@+id/data_usage_menu_show_ethernet"
-                android:title="@string/data_usage_menu_show_ethernet"
-                android:checkable="true" />
-        </menu>
-    </item>
+        android:id="@+id/data_usage_menu_roaming"
+        android:title="@string/data_usage_menu_roaming"
+        android:checkable="true" />
+    <item
+        android:id="@+id/data_usage_menu_restrict_background"
+        android:title="@string/data_usage_menu_restrict_background"
+        android:checkable="true" />
+    <item
+        android:id="@+id/data_usage_menu_split_4g"
+        android:title="@string/data_usage_menu_split_4g"
+        android:checkable="true" />
+    <item
+        android:id="@+id/data_usage_menu_show_wifi"
+        android:title="@string/data_usage_menu_show_wifi"
+        android:checkable="true" />
+    <item
+        android:id="@+id/data_usage_menu_show_ethernet"
+        android:title="@string/data_usage_menu_show_ethernet"
+        android:checkable="true" />
 </menu>
-- 
cgit v1.1