diff options
Diffstat (limited to 'res/layout/filtershow_editor_panel.xml')
| -rw-r--r-- | res/layout/filtershow_editor_panel.xml | 159 |
1 files changed, 84 insertions, 75 deletions
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index 6822d987b..c559319d4 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -18,92 +18,101 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/top" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="0" - android:baselineAligned="false" + android:layout_height="wrap_content" android:orientation="vertical" android:visibility="visible" > <LinearLayout - android:id="@+id/controlArea" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="horizontal" - android:visibility="visible" > - - <SeekBar - android:id="@+id/primarySeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - style="@style/FilterShowSlider" /> + android:layout_height="wrap_content" + android:orientation="vertical"> - </LinearLayout> + <LinearLayout + android:id="@+id/controlArea" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:visibility="visible"> + + <SeekBar + android:id="@+id/primarySeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + style="@style/FilterShowSlider"/> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="56dip" - android:layout_weight="0" - android:layout_gravity="bottom" - android:background="@color/background_main_toolbar" - android:orientation="horizontal" - android:baselineAligned="false" - android:visibility="visible" > - - <ImageButton - android:id="@+id/cancelFilter" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="left|center_vertical" - android:background="@android:color/transparent" - android:layout_weight=".1" - android:gravity="center" - android:src="@drawable/ic_menu_cancel_holo_light" - android:textSize="18dip" /> - - <ImageView - android:layout_width="2dp" - android:layout_height="fill_parent" - android:src="@drawable/filtershow_vertical_bar" /> + </LinearLayout> <LinearLayout - android:id="@+id/panelAccessoryViewList" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="horizontal" - android:visibility="visible" > - - <com.android.gallery3d.filtershow.editors.SwapButton - android:id="@+id/applyEffect" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:background="@android:color/transparent" - android:gravity="center" - android:text="@string/apply_effect" - android:textSize="18dip" - android:drawableRight="@drawable/filtershow_menu_marker"/> - + android:layout_width="match_parent" + android:layout_height="56dip" + android:background="@color/background_main_toolbar" + android:orientation="horizontal" + android:baselineAligned="false" + android:visibility="visible"> + + <ImageButton + android:id="@+id/cancelFilter" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="left|center_vertical" + android:background="@android:color/transparent" + android:layout_weight=".1" + android:gravity="center" + android:src="@drawable/ic_menu_cancel_holo_light" + android:textSize="18dip"/> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_bar"/> + + <LinearLayout + android:id="@+id/panelAccessoryViewList" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="horizontal" + android:visibility="visible"> + + <com.android.gallery3d.filtershow.editors.SwapButton + android:id="@+id/applyEffect" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:background="@android:color/transparent" + android:gravity="center" + android:text="@string/apply_effect" + android:textSize="18dip" + android:drawableRight="@drawable/filtershow_menu_marker"/> + + </LinearLayout> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_bar"/> + + <ImageButton + android:id="@+id/applyFilter" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="right|center_vertical" + android:layout_weight=".1" + android:background="@android:color/transparent" + android:gravity="center" + android:src="@drawable/ic_menu_done_holo_light" + android:textSize="18dip"/> </LinearLayout> - <ImageView - android:layout_width="2dp" - android:layout_height="fill_parent" - android:src="@drawable/filtershow_vertical_bar" /> - - <ImageButton - android:id="@+id/applyFilter" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="right|center_vertical" - android:layout_weight=".1" - android:background="@android:color/transparent" - android:gravity="center" - android:src="@drawable/ic_menu_done_holo_light" - android:textSize="18dip" /> + <FrameLayout android:id="@+id/state_panel_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="visible" + android:layout_gravity="top" + android:layout_weight="1" /> + </LinearLayout> </LinearLayout> |