diff options
| author | John Hoford <hoford@google.com> | 2013-03-11 15:08:26 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-03-11 15:32:03 -0700 |
| commit | 6f3ff5b486e30221361afd066510a7374962fd09 (patch) | |
| tree | df81e5078c2b8979145ba66cd93a0209c59624a9 /res/layout/filtershow_activity.xml | |
| parent | 6a07dfbe03c8396cc43840a1630ea480a2cff663 (diff) | |
| download | android_packages_apps_Gallery2-6f3ff5b486e30221361afd066510a7374962fd09.tar.gz android_packages_apps_Gallery2-6f3ff5b486e30221361afd066510a7374962fd09.tar.bz2 android_packages_apps_Gallery2-6f3ff5b486e30221361afd066510a7374962fd09.zip | |
split filter show into multiple files
Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
Diffstat (limited to 'res/layout/filtershow_activity.xml')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 135 |
1 files changed, 10 insertions, 125 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 2833e0b90..69e4c08a9 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -89,89 +89,12 @@ android:orientation="horizontal" android:visibility="gone" > - <LinearLayout - android:id="@+id/top" + <ViewStub android:id="@+id/editorPanelStub" + android:inflatedId="@+id/editorPanel" + android:layout="@layout/filtershow_editor_panel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:visibility="visible" > - - <LinearLayout - android:id="@+id/controlArea" - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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_weight="1" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="@color/filtershow_background" - android:orientation="horizontal" - android:visibility="visible" > - - <ImageButton - android:id="@+id/cancelFilter" - android:layout_width="wrap_content" - android:layout_height="94dip" - android:layout_gravity="left" - android:layout_weight=".1" - android:background="@android:color/transparent" - 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_line" /> - - <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" > - - <Button - 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" /> - </LinearLayout> - - <ImageView - android:layout_width="2dp" - android:layout_height="fill_parent" - android:src="@drawable/filtershow_vertical_line" /> - - <ImageButton - android:id="@+id/applyFilter" - android:layout_width="wrap_content" - android:layout_height="94dip" - android:layout_gravity="right" - android:layout_weight=".1" - android:background="@android:color/transparent" - android:gravity="center" - android:src="@drawable/ic_menu_done_holo_light" - android:textSize="18dip" /> - </LinearLayout> - </LinearLayout> + android:visibility="visible" /> </LinearLayout> <HorizontalScrollView @@ -255,50 +178,12 @@ custom:max_width="400dip" android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="48dip" - android:background="@color/background_main_toolbar" > - - <ImageButton - android:id="@+id/fxButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@drawable/filtershow_button_background" - android:scaleType="centerInside" - android:src="@drawable/ic_photoeditor_effects" /> - - <ImageButton - android:id="@+id/borderButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@drawable/filtershow_button_background" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/ic_photoeditor_border" /> - - <ImageButton - android:id="@+id/geometryButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@drawable/filtershow_button_background" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/ic_photoeditor_fix" /> - - <ImageButton - android:id="@+id/colorsButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@drawable/filtershow_button_background" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/ic_photoeditor_color" /> - </LinearLayout> + <ViewStub android:id="@+id/stateCategoryStub" + android:inflatedId="@+id/imageCategoryPanel" + android:layout="@layout/filtershow_category_panel" + android:layout_width="match_parent" + android:layout_height="48dip" + android:visibility="visible" /> </com.android.gallery3d.filtershow.CenteredLinearLayout> |