diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 2 | ||||
| -rw-r--r-- | res/layout/filtershow_control_action_slider.xml | 11 | ||||
| -rw-r--r-- | res/layout/filtershow_control_style_chooser.xml | 5 | ||||
| -rw-r--r-- | res/layout/filtershow_editor_panel.xml | 19 |
4 files changed, 21 insertions, 16 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 644bd5a54..c3c593b4a 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -93,7 +93,7 @@ android:inflatedId="@+id/editorPanel" android:layout="@layout/filtershow_editor_panel" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:visibility="visible" /> </LinearLayout> diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml index 7caf96dca..734d7500b 100644 --- a/res/layout/filtershow_control_action_slider.xml +++ b/res/layout/filtershow_control_action_slider.xml @@ -18,23 +18,26 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness" android:layout_width="match_parent" - android:layout_height="150dp" + android:layout_height="match_parent" android:orientation="horizontal" > <ImageButton android:id="@+id/actionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" android:scaleType="centerInside" + android:layout_weight="0" android:background="@drawable/filtershow_button_background" android:src="@drawable/filtershow_addpoint" android:paddingBottom="8dp" /> <SeekBar android:id="@+id/controlValueSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" style="@style/FilterShowSlider" /> </LinearLayout> diff --git a/res/layout/filtershow_control_style_chooser.xml b/res/layout/filtershow_control_style_chooser.xml index 4353b0b1f..a5bc984df 100644 --- a/res/layout/filtershow_control_style_chooser.xml +++ b/res/layout/filtershow_control_style_chooser.xml @@ -18,19 +18,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness" android:layout_width="match_parent" - android:layout_height="150dp" + android:layout_height="match_parent" android:orientation="horizontal" > <HorizontalScrollView android:id="@+id/scrollList" android:layout_width="match_parent" - android:layout_height="@dimen/thumbnail_size" + android:layout_height="match_parent" android:scrollbars="none" > <LinearLayout android:id="@+id/listStyles" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/thumbnail_margin" android:orientation="horizontal" > </LinearLayout> </HorizontalScrollView> diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index 2afd3b286..e4bcfc805 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -18,15 +18,16 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/top" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_weight="0" + android:baselineAligned="false" android:orientation="vertical" android:visibility="visible" > <LinearLayout android:id="@+id/controlArea" android:layout_width="match_parent" - android:layout_height="64dp" + android:layout_height="0dp" android:layout_weight="1" android:orientation="horizontal" android:visibility="visible" > @@ -35,6 +36,7 @@ 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" /> @@ -42,9 +44,10 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="94dip" - android:layout_weight="1" - android:background="@color/filtershow_background" + 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" > @@ -54,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_gravity="left|center_vertical" - android:background="@drawable/filtershow_button_background" + android:background="@android:color/transparent" android:layout_weight=".1" android:gravity="center" android:src="@drawable/ic_menu_cancel_holo_light" @@ -78,7 +81,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_gravity="center" - android:background="@drawable/filtershow_button_background" + android:background="@android:color/transparent" android:gravity="center" android:text="@string/apply_effect" android:textSize="18dip" @@ -96,7 +99,7 @@ android:layout_height="fill_parent" android:layout_gravity="right|center_vertical" android:layout_weight=".1" - android:background="@drawable/filtershow_button_background" + android:background="@android:color/transparent" android:gravity="center" android:src="@drawable/ic_menu_done_holo_light" android:textSize="18dip" /> |