diff options
Diffstat (limited to 'res/layout/filtershow_state_panel_new.xml')
| -rw-r--r-- | res/layout/filtershow_state_panel_new.xml | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml index 771122192..ea891a309 100644 --- a/res/layout/filtershow_state_panel_new.xml +++ b/res/layout/filtershow_state_panel_new.xml @@ -1,47 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> - <!-- - <com.example.StatePanel.VerticalStatePanelTrack - android:id="@+id/listStates" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="8dip" - android:background="@android:color/holo_red_dark" /> - --> - - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="none"> - - <com.android.gallery3d.filtershow.state.StatePanelTrack - android:id="@+id/listStates" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="8dip" - android:animateLayoutChanges="true" /> - - </ScrollView> - - <!-- <HorizontalScrollView android:layout_width="match_parent" - android:layout_height="128dip" + android:layout_height="wrap_content" android:scrollbars="none"> - <com.example.StatePanel.StatePanelTrack + <com.android.gallery3d.filtershow.state.StatePanelTrack android:id="@+id/listStates" + android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="128dip" + android:layout_height="48dip" + custom:elemEndSize="128dip" + custom:elemSize="128dip" + android:layout_margin="8dip" android:animateLayoutChanges="true" /> </HorizontalScrollView> - --> + </LinearLayout> |