diff options
author | Jeff Sharkey <jsharkey@android.com> | 2011-09-13 19:56:45 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2011-09-13 20:24:14 -0700 |
commit | a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2 (patch) | |
tree | ee3addfdd86cd4fde72ceeb67d290140c64f4b7a /res/layout | |
parent | ec10578884e3c23b3585bccde76e9c12978dda05 (diff) | |
download | packages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.zip packages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.tar.gz packages_apps_Settings-a53188fe5aa09918dd7b5a9ff79ba050a2bfc4c2.tar.bz2 |
Data usage: precise editing, restrict help, D-pad.
Introduce dialogs for precise editing of network policy warning/limit
values, triggered by click on sweep labels. Show up to 999MB before
rounding to GB, and round to nearest 5MB value when dragging. Partial
D-pad navigation around chart controls. Fix jumping when relayout
during drag, and fix sweep overlap bug.
When restricting data without limited networks, show dialog help to
guide user towards network limit. When reloading chart data, try
restoring to nearest cycle.
Bug: 5289641, 5111701, 5226078
Change-Id: Ic59dee6496c480a64dc56f8534acf4d81b50bca7
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/data_usage_bytes_editor.xml | 40 | ||||
-rw-r--r-- | res/layout/data_usage_chart.xml | 34 |
2 files changed, 58 insertions, 16 deletions
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml new file mode 100644 index 0000000..6207391b --- /dev/null +++ b/res/layout/data_usage_bytes_editor.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:gravity="center" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <NumberPicker + android:id="@+id/bytes" + android:layout_width="48dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:focusable="true" + android:focusableInTouchMode="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@*android:string/megabyteShort" /> + +</LinearLayout> diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index a1a7ec4..38f1c11 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -59,25 +59,10 @@ settings:fillColorSecondary="#60ba7f3e" /> <com.android.settings.widget.ChartSweepView - android:id="@+id/sweep_left" - android:layout_width="wrap_content" - android:layout_height="match_parent" - settings:sweepDrawable="@drawable/data_sweep_left" - settings:followAxis="horizontal" - settings:neighborMargin="5dip" /> - - <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:neighborMargin="5dip" /> - - <com.android.settings.widget.ChartSweepView android:id="@+id/sweep_warning" android:layout_width="match_parent" android:layout_height="wrap_content" + android:nextFocusUp="@+id/sweep_limit" settings:sweepDrawable="@drawable/data_sweep_warning" settings:followAxis="vertical" settings:neighborMargin="5dip" @@ -89,6 +74,7 @@ android:id="@+id/sweep_limit" android:layout_width="match_parent" android:layout_height="wrap_content" + android:nextFocusDown="@+id/sweep_warning" settings:sweepDrawable="@drawable/data_sweep_limit" settings:followAxis="vertical" settings:neighborMargin="5dip" @@ -96,4 +82,20 @@ settings:labelTemplate="@string/data_usage_sweep_limit" settings:labelColor="#c01a2c" /> + <com.android.settings.widget.ChartSweepView + android:id="@+id/sweep_left" + android:layout_width="wrap_content" + android:layout_height="match_parent" + settings:sweepDrawable="@drawable/data_sweep_left" + settings:followAxis="horizontal" + settings:neighborMargin="5dip" /> + + <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:neighborMargin="5dip" /> + </com.android.settings.widget.ChartDataUsageView> |