summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml7
-rwxr-xr-xres/values/dimens.xml4
-rw-r--r--res/values/strings.xml8
3 files changed, 16 insertions, 3 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6c63d13..684811c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -50,6 +50,13 @@
<attr name="minTickWidth" format="dimension" />
</declare-styleable>
+ <declare-styleable name="ChartView">
+ <!-- optimal width of the chart -->
+ <attr name="optimalWidth" format="dimension" />
+ <!-- how to weight extra space beyond optimal width -->
+ <attr name="optimalWidthWeight" format="float" />
+ </declare-styleable>
+
<declare-styleable name="ChartSweepView">
<attr name="sweepDrawable" format="reference" />
<attr name="followAxis">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5394743..4b576eb 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,7 +17,6 @@
<resources>
<dimen name="device_memory_usage_button_width">16dip</dimen>
<dimen name="device_memory_usage_button_height">32dip</dimen>
- <dimen name="data_usage_chart_height">220dip</dimen>
<dimen name="action_bar_switch_padding">16dip</dimen>
<dimen name="app_icon_size">56dip</dimen>
@@ -28,4 +27,7 @@
<dimen name="content_margin_left">16dip</dimen>
<dimen name="description_margin_top">26dip</dimen>
<dimen name="description_margin_sides">40dip</dimen>
+
+ <dimen name="data_usage_chart_height">220dip</dimen>
+ <dimen name="data_usage_chart_optimalWidth">440dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a91e6df..658e6fd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3392,7 +3392,7 @@ found in the list of installed applications.</string>
<!-- Title for checkbox menu option to restrict background data usage. [CHAR LIMIT=32] -->
<string name="data_usage_menu_restrict_background">Restrict background data</string>
<!-- Title for checkbox menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=32] -->
- <string name="data_usage_menu_split_4g">Split 4G usage</string>
+ <string name="data_usage_menu_split_4g">Separate 4G usage</string>
<!-- Title for checkbox menu option to show Wi-Fi data usage. [CHAR LIMIT=32] -->
<string name="data_usage_menu_show_wifi">Show Wi-Fi usage</string>
<!-- Title for checkbox menu option to show Ethernet data usage. [CHAR LIMIT=32] -->
@@ -3403,6 +3403,10 @@ found in the list of installed applications.</string>
<string name="data_usage_pick_cycle_day">Day of month to reset data usage cycle:</string>
<!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
<string name="data_usage_empty">No applications used data during this period.</string>
+ <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+ <string name="data_usage_label_foreground">Foreground</string>
+ <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+ <string name="data_usage_label_background">Background</string>
<!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_mobile_limit">Disable mobile data at limit</string>
@@ -3471,7 +3475,7 @@ found in the list of installed applications.</string>
<!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
<string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
<!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
- <string name="data_usage_total_during_range">Data usage: <xliff:g id="total" example="128KB">%1$s</xliff:g> on <xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g></string>
+ <string name="data_usage_total_during_range"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: <xliff:g id="total" example="128KB">%1$s</xliff:g> used</string>
<!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
<string name="cryptkeeper_emergency_call">Emergency call</string>