diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-07-09 01:02:56 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-07-09 01:02:56 -0700 |
| commit | ec3be8a4a5efa0e98aeefbf22bb876d09f08a023 (patch) | |
| tree | 21e1886d25752947bf5a388c63239b879058386d /res/layout | |
| parent | 890e352d5f897b533c216f56e7604cdd2fd67eda (diff) | |
| download | packages_apps_settings-ec3be8a4a5efa0e98aeefbf22bb876d09f08a023.zip packages_apps_settings-ec3be8a4a5efa0e98aeefbf22bb876d09f08a023.tar.gz packages_apps_settings-ec3be8a4a5efa0e98aeefbf22bb876d09f08a023.tar.bz2 | |
Draw vertical data usage sweep labels.
Using template string, ask axis to build label for sweeps. Also
clean up margins exposed to parent view, since we offset when label
is larger than sweep drawable.
Bug: 4598460
Change-Id: If71bc8ec8c952023325c80b9bc00b63c23609c7a
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/data_usage_chart.xml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 199a38e..a942bb3 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -55,31 +55,33 @@ android:layout_width="wrap_content" android:layout_height="match_parent" settings:sweepDrawable="@drawable/data_sweep_left" - settings:followAxis="horizontal" - settings:showLabel="false" /> + settings:followAxis="horizontal" /> <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:showLabel="false" /> + settings:followAxis="horizontal" /> <com.android.settings.widget.ChartSweepView - android:id="@+id/sweep_limit" + android:id="@+id/sweep_warning" android:layout_width="match_parent" android:layout_height="wrap_content" - settings:sweepDrawable="@drawable/data_sweep_limit" + settings:sweepDrawable="@drawable/data_sweep_warning" settings:followAxis="vertical" - settings:showLabel="true" /> + settings:labelSize="60dip" + settings:labelTemplate="@string/data_usage_sweep_warning" + settings:labelColor="#f7931d" /> <com.android.settings.widget.ChartSweepView - android:id="@+id/sweep_warning" + android:id="@+id/sweep_limit" android:layout_width="match_parent" android:layout_height="wrap_content" - settings:sweepDrawable="@drawable/data_sweep_warning" + settings:sweepDrawable="@drawable/data_sweep_limit" settings:followAxis="vertical" - settings:showLabel="true" /> + settings:labelSize="60dip" + settings:labelTemplate="@string/data_usage_sweep_limit" + settings:labelColor="#c01a2c" /> </com.android.settings.widget.DataUsageChartView> |