diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-06-23 00:39:38 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-06-23 00:39:47 -0700 |
| commit | 52c3f4461b806e4f1ce48455ee2ba0ac05dfdab4 (patch) | |
| tree | 413297650a61f914f6e212b73af8fb76cacbc3d9 /res/values | |
| parent | aef3981e86909a6a5b4f6ecab972e43fd77582c1 (diff) | |
| download | packages_apps_settings-52c3f4461b806e4f1ce48455ee2ba0ac05dfdab4.zip packages_apps_settings-52c3f4461b806e4f1ce48455ee2ba0ac05dfdab4.tar.gz packages_apps_settings-52c3f4461b806e4f1ce48455ee2ba0ac05dfdab4.tar.bz2 | |
Iterate on data usage chart UI.
Switched to inflating chart views from XML, using attributes for
configuration. Start using drawable assets for chart components
instead of manually painting. Include hand-cut assets, and animate
between states when touched to invoke.
Clamp sweeps to valid chart ranges and prepare for sweep labels.
Bug: 4768483, 4598460
Change-Id: Ic660c35bec826eb5e3f6a1dde3cc04d8c437ef2b
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 22 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 |
2 files changed, 27 insertions, 2 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 7cff69c..06d2650 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -49,4 +49,26 @@ <!-- Minimum tick width for each slice in the bar chart. --> <attr name="minTickWidth" format="dimension" /> </declare-styleable> + + <declare-styleable name="ChartSweepView"> + <attr name="sweepDrawable" format="reference" /> + <attr name="followAxis"> + <enum name="horizontal" value="0" /> + <enum name="vertical" value="1" /> + </attr> + <attr name="showLabel" format="boolean" /> + </declare-styleable> + + <declare-styleable name="ChartGridView"> + <attr name="primaryDrawable" format="reference" /> + <attr name="secondaryDrawable" format="reference" /> + <attr name="borderDrawable" format="reference" /> + <attr name="labelColor" format="color" /> + </declare-styleable> + + <declare-styleable name="ChartNetworkSeriesView"> + <attr name="strokeColor" format="color" /> + <attr name="fillColor" format="color" /> + <attr name="fillColorSecondary" format="color" /> + </declare-styleable> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 986d867..5839934 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3456,7 +3456,7 @@ found in the list of installed applications.</string> <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] --> <string name="data_usage_cycle_editor_subtitle">Date of each month:</string> <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] --> - <string name="data_usage_cycle_editor_positive">set</string> + <string name="data_usage_cycle_editor_positive">Set</string> <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] --> <string name="data_usage_limit_dialog_title">Limiting data usage</string> @@ -3476,6 +3476,9 @@ found in the list of installed applications.</string> <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] --> <string name="data_usage_disabled_dialog">The specified data usage limit has been reached.\n\nAdditional data use may incur carrier charges.</string> <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] --> - <string name="data_usage_disabled_dialog_enable">re-enable data</string> + <string name="data_usage_disabled_dialog_enable">Re-enable data</string> + + <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] --> + <string name="data_usage_sweep_warning"><font size="32"><xliff:g id="number" example="128">%1$s</xliff:g></font> <font size="12"><xliff:g id="unit" example="KB">%2$s</xliff:g></font>\n<font size="12">warning</font></string> </resources> |