diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/filtershow_activity.xml | 126 | ||||
-rw-r--r-- | res/layout/filtershow_default_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_tiny_planet_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_vignette_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_zoom_editor.xml | 16 |
5 files changed, 92 insertions, 98 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index c723aaba5..2833e0b90 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -74,47 +74,105 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@color/background_main_toolbar" custom:max_width="600dip" android:orientation="vertical"> - <FrameLayout - android:id="@+id/secondRowPanel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:id="@+id/filterButtonsList" - android:layout_width="fill_parent" - android:layout_height="@dimen/thumbnail_size" - android:background="@color/background_main_toolbar" - android:orientation="horizontal" - android:visibility="gone" > - - <FrameLayout + <FrameLayout + android:id="@+id/secondRowPanel" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="wrap_content" > <LinearLayout - android:id="@+id/panelAccessoryViewList" - android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:id="@+id/filterButtonsList" + android:layout_width="fill_parent" + android:layout_height="@dimen/thumbnail_size" android:orientation="horizontal" - android:visibility="visible" /> - - <Button - android:id="@+id/applyEffect" - android:layout_width="wrap_content" - android:layout_height="94dip" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@android:color/transparent" - android:gravity="center" - android:text="@string/apply_effect" - android:textSize="18dip" /> - </FrameLayout> - - </LinearLayout> + android:visibility="gone" > + + <LinearLayout + android:id="@+id/top" + 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> + </LinearLayout> <HorizontalScrollView android:id="@+id/fxList" diff --git a/res/layout/filtershow_default_editor.xml b/res/layout/filtershow_default_editor.xml index 9f25529e1..b261ea35f 100644 --- a/res/layout/filtershow_default_editor.xml +++ b/res/layout/filtershow_default_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_tiny_planet_editor.xml b/res/layout/filtershow_tiny_planet_editor.xml index a99e406a9..61e0cf565 100644 --- a/res/layout/filtershow_tiny_planet_editor.xml +++ b/res/layout/filtershow_tiny_planet_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_vignette_editor.xml b/res/layout/filtershow_vignette_editor.xml index 6e5755928..72a615fb4 100644 --- a/res/layout/filtershow_vignette_editor.xml +++ b/res/layout/filtershow_vignette_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_zoom_editor.xml b/res/layout/filtershow_zoom_editor.xml index 3ef6f6bf7..9813a283d 100644 --- a/res/layout/filtershow_zoom_editor.xml +++ b/res/layout/filtershow_zoom_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout> |