diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/photoeditor_color_seekbar.xml | 7 | ||||
-rw-r--r-- | res/layout/photoeditor_effect_tool_panel.xml | 5 | ||||
-rw-r--r-- | res/layout/photoeditor_scale_seekbar.xml | 7 | ||||
-rwxr-xr-x | res/values-sw320dp/photoeditor_dimens.xml | 10 | ||||
-rwxr-xr-x | res/values-sw600dp/photoeditor_dimens.xml | 10 | ||||
-rwxr-xr-x | res/values-sw800dp/photoeditor_dimens.xml | 10 | ||||
-rw-r--r-- | res/values/photoeditor_styles.xml | 14 |
7 files changed, 37 insertions, 26 deletions
diff --git a/res/layout/photoeditor_color_seekbar.xml b/res/layout/photoeditor_color_seekbar.xml index fb9386992..ca8509de1 100644 --- a/res/layout/photoeditor_color_seekbar.xml +++ b/res/layout/photoeditor_color_seekbar.xml @@ -16,9 +16,4 @@ <com.android.gallery3d.photoeditor.actions.ColorSeekBar xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/seekbar_width" - android:layout_height="@dimen/seekbar_height" - android:layout_marginBottom="@dimen/seekbar_margin_bottom" - android:minHeight="@dimen/seekbar_height" - android:maxHeight="@dimen/seekbar_height" - android:progressDrawable="@android:color/transparent"/> + style="@style/SeekBar"/> diff --git a/res/layout/photoeditor_effect_tool_panel.xml b/res/layout/photoeditor_effect_tool_panel.xml index 7fd92571c..4ffd52d90 100644 --- a/res/layout/photoeditor_effect_tool_panel.xml +++ b/res/layout/photoeditor_effect_tool_panel.xml @@ -18,12 +18,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:padding="@dimen/effect_tool_panel_padding" + android:paddingTop="@dimen/effect_tool_panel_padding_top" + android:paddingBottom="@dimen/effect_tool_panel_padding_bottom" android:background="@color/translucent_black" android:gravity="center_horizontal" android:orientation="vertical"> <TextView android:id="@+id/effect_label" - style="@style/EffectLabel"/> + style="@style/EffectLabelInToolPanel"/> </LinearLayout> diff --git a/res/layout/photoeditor_scale_seekbar.xml b/res/layout/photoeditor_scale_seekbar.xml index d8df19fb0..15fc2346b 100644 --- a/res/layout/photoeditor_scale_seekbar.xml +++ b/res/layout/photoeditor_scale_seekbar.xml @@ -16,9 +16,4 @@ <com.android.gallery3d.photoeditor.actions.ScaleSeekBar xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/seekbar_width" - android:layout_height="@dimen/seekbar_height" - android:layout_marginBottom="@dimen/seekbar_margin_bottom" - android:minHeight="@dimen/seekbar_height" - android:maxHeight="@dimen/seekbar_height" - android:progressDrawable="@android:color/transparent"/> + style="@style/SeekBar"/> diff --git a/res/values-sw320dp/photoeditor_dimens.xml b/res/values-sw320dp/photoeditor_dimens.xml index ff76e2557..a7d6a24b1 100755 --- a/res/values-sw320dp/photoeditor_dimens.xml +++ b/res/values-sw320dp/photoeditor_dimens.xml @@ -27,9 +27,11 @@ <dimen name="action_bar_icon_padding_right">5dp</dimen> <dimen name="action_button_padding_horizontal">13dp</dimen> <dimen name="effects_menu_container_width">320dp</dimen> - <dimen name="effect_tool_panel_padding">10dp</dimen> - <dimen name="seekbar_width">290dp</dimen> - <dimen name="seekbar_height">27dp</dimen> - <dimen name="seekbar_margin_bottom">3dp</dimen> + <dimen name="effect_tool_panel_padding_top">3dp</dimen> + <dimen name="effect_tool_panel_padding_bottom">8dp</dimen> + <dimen name="seekbar_width">350dp</dimen> + <dimen name="seekbar_height">43dp</dimen> + <dimen name="seekbar_padding_horizontal">30dp</dimen> + <dimen name="seekbar_padding_vertical">8dp</dimen> <dimen name="crop_indicator_size">35dp</dimen> </resources> diff --git a/res/values-sw600dp/photoeditor_dimens.xml b/res/values-sw600dp/photoeditor_dimens.xml index 29d7f5336..b861150c9 100755 --- a/res/values-sw600dp/photoeditor_dimens.xml +++ b/res/values-sw600dp/photoeditor_dimens.xml @@ -29,9 +29,11 @@ <dimen name="action_button_padding_vertical">8dp</dimen> <dimen name="action_button_padding_horizontal">22dp</dimen> <dimen name="effects_menu_container_width">400dp</dimen> - <dimen name="effect_tool_panel_padding">13dp</dimen> - <dimen name="seekbar_width">560dp</dimen> - <dimen name="seekbar_height">35dp</dimen> - <dimen name="seekbar_margin_bottom">4dp</dimen> + <dimen name="effect_tool_panel_padding_top">4dp</dimen> + <dimen name="effect_tool_panel_padding_bottom">11dp</dimen> + <dimen name="seekbar_width">640dp</dimen> + <dimen name="seekbar_height">57dp</dimen> + <dimen name="seekbar_padding_horizontal">40dp</dimen> + <dimen name="seekbar_padding_vertical">11dp</dimen> <dimen name="crop_indicator_size">43dp</dimen> </resources> diff --git a/res/values-sw800dp/photoeditor_dimens.xml b/res/values-sw800dp/photoeditor_dimens.xml index e869acf55..804a8cae7 100755 --- a/res/values-sw800dp/photoeditor_dimens.xml +++ b/res/values-sw800dp/photoeditor_dimens.xml @@ -29,9 +29,11 @@ <dimen name="action_button_padding_vertical">8dp</dimen> <dimen name="action_button_padding_horizontal">28dp</dimen> <dimen name="effects_menu_container_width">400dp</dimen> - <dimen name="effect_tool_panel_padding">15dp</dimen> - <dimen name="seekbar_width">560dp</dimen> - <dimen name="seekbar_height">35dp</dimen> - <dimen name="seekbar_margin_bottom">5dp</dimen> + <dimen name="effect_tool_panel_padding_top">5dp</dimen> + <dimen name="effect_tool_panel_padding_bottom">13dp</dimen> + <dimen name="seekbar_width">640dp</dimen> + <dimen name="seekbar_height">61dp</dimen> + <dimen name="seekbar_padding_horizontal">40dp</dimen> + <dimen name="seekbar_padding_vertical">13dp</dimen> <dimen name="crop_indicator_size">48dp</dimen> </resources> diff --git a/res/values/photoeditor_styles.xml b/res/values/photoeditor_styles.xml index 7bd7fd098..c02296df4 100644 --- a/res/values/photoeditor_styles.xml +++ b/res/values/photoeditor_styles.xml @@ -54,6 +54,20 @@ <item name="android:layout_alignParentBottom">true</item> <item name="android:orientation">vertical</item> </style> + <style name="EffectLabelInToolPanel" parent="@style/EffectLabel"> + <item name="android:layout_marginTop">0dp</item> + </style> + <style name="SeekBar"> + <item name="android:layout_width">@dimen/seekbar_width</item> + <item name="android:layout_height">@dimen/seekbar_height</item> + <item name="android:paddingTop">@dimen/seekbar_padding_vertical</item> + <item name="android:paddingBottom">@dimen/seekbar_padding_vertical</item> + <item name="android:paddingLeft">@dimen/seekbar_padding_horizontal</item> + <item name="android:paddingRight">@dimen/seekbar_padding_horizontal</item> + <item name="android:minHeight">@dimen/seekbar_height</item> + <item name="android:maxHeight">@dimen/seekbar_height</item> + <item name="android:background">@android:color/transparent</item> + </style> <style name="ActionBarInner"> <item name="android:layout_width">fill_parent</item> <item name="android:layout_height">?android:attr/actionBarSize</item> |