diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-06-24 17:30:27 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-06-24 23:11:51 -0700 |
| commit | 2af35fb44d385d7a04ea1b421c426a0350f0e896 (patch) | |
| tree | 4acce87be36aa48385c209c5975bff757fd18f13 /res/drawable | |
| parent | f54f435f1f3215b39798c671fc64344d1867de4e (diff) | |
| download | packages_apps_settings-2af35fb44d385d7a04ea1b421c426a0350f0e896.zip packages_apps_settings-2af35fb44d385d7a04ea1b421c426a0350f0e896.tar.gz packages_apps_settings-2af35fb44d385d7a04ea1b421c426a0350f0e896.tar.bz2 | |
Fix animation bugs, stop disabled sweep touches.
Change sweep drawables to crossfade correctly between states, and
work around 4946591 by nesting container one level deeper. Also wait
until first layout pass is finished before applying LayoutTransition.
Prevent touches from reaching sweeps when chart is disabled. Also
bring back log scale for data.
Change-Id: I2194714ab075fd32525681119f30427c1b96fc50
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/data_sweep_left.xml | 1 | ||||
| -rw-r--r-- | res/drawable/data_sweep_limit.xml | 1 | ||||
| -rw-r--r-- | res/drawable/data_sweep_right.xml | 1 | ||||
| -rw-r--r-- | res/drawable/data_sweep_warning.xml | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/res/drawable/data_sweep_left.xml b/res/drawable/data_sweep_left.xml index cb801a0..3532cbc 100644 --- a/res/drawable/data_sweep_left.xml +++ b/res/drawable/data_sweep_left.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_left_activated" /> diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml index 378b0aa..cfdbfbb 100644 --- a/res/drawable/data_sweep_limit.xml +++ b/res/drawable/data_sweep_limit.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_limit_activated" /> diff --git a/res/drawable/data_sweep_right.xml b/res/drawable/data_sweep_right.xml index a75a1b2..cbe2a85 100644 --- a/res/drawable/data_sweep_right.xml +++ b/res/drawable/data_sweep_right.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_right_activated" /> diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml index 001d0c5..8fbe8e7 100644 --- a/res/drawable/data_sweep_warning.xml +++ b/res/drawable/data_sweep_warning.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_warning_activated" /> |