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/layout/data_usage_header.xml | |
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/layout/data_usage_header.xml')
-rw-r--r-- | res/layout/data_usage_header.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index 3f4ca5b..547d85d 100644 --- a/res/layout/data_usage_header.xml +++ b/res/layout/data_usage_header.xml @@ -19,13 +19,18 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <LinearLayout - android:id="@+id/network_switches" + <FrameLayout + android:id="@+id/network_switches_container" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:showDividers="middle|end" - android:divider="?android:attr/listDivider" /> + android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/network_switches" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:showDividers="middle|end" + android:divider="?android:attr/listDivider" /> + </FrameLayout> <LinearLayout android:layout_width="match_parent" |