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/drawable | |
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/drawable')
-rw-r--r-- | res/drawable/data_sweep_left.xml | 22 | ||||
-rw-r--r-- | res/drawable/data_sweep_limit.xml | 22 | ||||
-rw-r--r-- | res/drawable/data_sweep_right.xml | 22 | ||||
-rw-r--r-- | res/drawable/data_sweep_warning.xml | 22 |
4 files changed, 88 insertions, 0 deletions
diff --git a/res/drawable/data_sweep_left.xml b/res/drawable/data_sweep_left.xml new file mode 100644 index 0000000..739a74e --- /dev/null +++ b/res/drawable/data_sweep_left.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + + <item android:state_activated="true" android:drawable="@drawable/data_sweep_left_activated" /> + <item android:state_activated="false" android:drawable="@drawable/data_sweep_left_default" /> +</selector> diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml new file mode 100644 index 0000000..29ecec8 --- /dev/null +++ b/res/drawable/data_sweep_limit.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + + <item android:state_activated="true" android:drawable="@drawable/data_sweep_limit_activated" /> + <item android:state_activated="false" android:drawable="@drawable/data_sweep_limit_default" /> +</selector> diff --git a/res/drawable/data_sweep_right.xml b/res/drawable/data_sweep_right.xml new file mode 100644 index 0000000..1a11469 --- /dev/null +++ b/res/drawable/data_sweep_right.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + + <item android:state_activated="true" android:drawable="@drawable/data_sweep_right_activated" /> + <item android:state_activated="false" android:drawable="@drawable/data_sweep_right_default" /> +</selector> diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml new file mode 100644 index 0000000..5cafe06 --- /dev/null +++ b/res/drawable/data_sweep_warning.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + + <item android:state_activated="true" android:drawable="@drawable/data_sweep_warning_activated" /> + <item android:state_activated="false" android:drawable="@drawable/data_sweep_warning_default" /> +</selector> |