diff options
-rw-r--r-- | res/drawable/photoeditor_arrow_back.png | bin | 602 -> 0 bytes | |||
-rw-r--r-- | res/layout/photoeditor_actionbar.xml | 52 | ||||
-rw-r--r-- | res/layout/photoeditor_main.xml | 33 | ||||
-rwxr-xr-x | res/values-sw320dp-land/photoeditor_dimens.xml | 20 | ||||
-rwxr-xr-x | res/values-sw320dp-port/photoeditor_dimens.xml | 20 | ||||
-rwxr-xr-x | res/values-sw320dp/photoeditor_dimens.xml | 19 | ||||
-rwxr-xr-x | res/values-sw600dp/photoeditor_dimens.xml | 21 | ||||
-rwxr-xr-x | res/values-sw800dp/photoeditor_dimens.xml | 21 | ||||
-rw-r--r-- | res/values/photoeditor_strings.xml | 2 | ||||
-rw-r--r-- | res/values/photoeditor_styles.xml | 49 |
10 files changed, 138 insertions, 99 deletions
diff --git a/res/drawable/photoeditor_arrow_back.png b/res/drawable/photoeditor_arrow_back.png Binary files differdeleted file mode 100644 index 897a1c11a..000000000 --- a/res/drawable/photoeditor_arrow_back.png +++ /dev/null diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml new file mode 100644 index 000000000..82ed41ffc --- /dev/null +++ b/res/layout/photoeditor_actionbar.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.gallery3d.photoeditor.ActionBar + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/action_bar" + style="@style/TopActionBar"> + + <LinearLayout style="@style/ActionBarLinearLayout"> + + <LinearLayout + android:id="@+id/action_bar_back" + style="@style/ActionBarBackLinearLayout"> + <ImageView style="@style/ActionBarArrow"/> + <ImageView style="@style/ActionBarIcon"/> + </LinearLayout> + + <TextView + android:id="@+id/action_bar_title" + style="@style/ActionBarTitle" + android:text="@string/edit"/> + </LinearLayout> + + <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true"> + + <ImageButton + android:id="@+id/undo_button" + style="@style/ImageActionButton" + android:src="@drawable/photoeditor_undo"/> + <ImageButton + android:id="@+id/redo_button" + style="@style/ImageActionButton" + android:src="@drawable/photoeditor_redo"/> + <Button + android:id="@+id/save_button" + style="@style/TextActionButton" + android:text="@string/save"/> + </LinearLayout> +</com.android.gallery3d.photoeditor.ActionBar> diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml index ed4841ab3..49597ed02 100644 --- a/res/layout/photoeditor_main.xml +++ b/res/layout/photoeditor_main.xml @@ -52,37 +52,6 @@ </LinearLayout> </com.android.gallery3d.photoeditor.EffectsBar> - <com.android.gallery3d.photoeditor.ActionBar android:id="@+id/action_bar" style="@style/TopActionBar"> + <include layout="@layout/photoeditor_actionbar"/> - <LinearLayout style="@style/ActionBarLinearLayout"> - - <LinearLayout - android:id="@+id/action_bar_back" - style="@style/ActionBarBackLinearLayout"> - <ImageView style="@style/ActionBarArrow"/> - <ImageView style="@style/ActionBarIcon"/> - </LinearLayout> - - <TextView - android:id="@+id/action_bar_title" - style="@style/ActionBarText" - android:text="@string/edit"/> - </LinearLayout> - - <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true"> - - <ImageButton - android:id="@+id/undo_button" - style="@style/ImageActionButton" - android:src="@drawable/photoeditor_undo"/> - <ImageButton - android:id="@+id/redo_button" - style="@style/ImageActionButton" - android:src="@drawable/photoeditor_redo"/> - <Button - android:id="@+id/save_button" - style="@style/TextActionButton" - android:text="@string/save"/> - </LinearLayout> - </com.android.gallery3d.photoeditor.ActionBar> </com.android.gallery3d.photoeditor.Toolbar> diff --git a/res/values-sw320dp-land/photoeditor_dimens.xml b/res/values-sw320dp-land/photoeditor_dimens.xml new file mode 100755 index 000000000..844c928b2 --- /dev/null +++ b/res/values-sw320dp-land/photoeditor_dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <dimen name="action_bar_icon_padding_vertical">4dp</dimen> + <dimen name="action_button_padding_vertical">4dp</dimen> +</resources> diff --git a/res/values-sw320dp-port/photoeditor_dimens.xml b/res/values-sw320dp-port/photoeditor_dimens.xml new file mode 100755 index 000000000..85779d664 --- /dev/null +++ b/res/values-sw320dp-port/photoeditor_dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <dimen name="action_bar_icon_padding_vertical">8dp</dimen> + <dimen name="action_button_padding_vertical">8dp</dimen> +</resources> diff --git a/res/values-sw320dp/photoeditor_dimens.xml b/res/values-sw320dp/photoeditor_dimens.xml index c0f523fcc..5d894a6ce 100755 --- a/res/values-sw320dp/photoeditor_dimens.xml +++ b/res/values-sw320dp/photoeditor_dimens.xml @@ -18,22 +18,13 @@ <dimen name="effect_label_text_size">11sp</dimen> <dimen name="effect_label_width">98dp</dimen> <dimen name="effect_icon_size">72dp</dimen> - <dimen name="effect_padding_left_right">2dp</dimen> + <dimen name="effect_padding_horizontal">2dp</dimen> <dimen name="effects_container_padding">12dp</dimen> - <dimen name="action_bar_height">40dp</dimen> - <dimen name="action_bar_text_size">17sp</dimen> - <dimen name="action_bar_arrow_padding_top">12dp</dimen> - <dimen name="action_bar_arrow_padding_bottom">12dp</dimen> - <dimen name="action_bar_arrow_padding_left">3dp</dimen> - <dimen name="action_bar_arrow_padding_right">0dp</dimen> - <dimen name="action_bar_icon_padding_top">4dp</dimen> - <dimen name="action_bar_icon_padding_bottom">4dp</dimen> + <dimen name="action_bar_arrow_margin_left">3dp</dimen> + <dimen name="action_bar_arrow_margin_right">-3dp</dimen> <dimen name="action_bar_icon_padding_left">0dp</dimen> - <dimen name="action_bar_icon_padding_right">6dp</dimen> - <dimen name="action_button_padding_top">5dp</dimen> - <dimen name="action_button_padding_bottom">5dp</dimen> - <dimen name="action_button_padding_left">15dp</dimen> - <dimen name="action_button_padding_right">15dp</dimen> + <dimen name="action_bar_icon_padding_right">5dp</dimen> + <dimen name="action_button_padding_horizontal">13dp</dimen> <dimen name="effect_tool_panel_padding">12dp</dimen> <dimen name="seekbar_width">290dp</dimen> <dimen name="seekbar_height">29dp</dimen> diff --git a/res/values-sw600dp/photoeditor_dimens.xml b/res/values-sw600dp/photoeditor_dimens.xml index 413347d31..2b9cf6f9f 100755 --- a/res/values-sw600dp/photoeditor_dimens.xml +++ b/res/values-sw600dp/photoeditor_dimens.xml @@ -18,22 +18,15 @@ <dimen name="effect_label_text_size">14sp</dimen> <dimen name="effect_label_width">120dp</dimen> <dimen name="effect_icon_size">90dp</dimen> - <dimen name="effect_padding_left_right">2dp</dimen> + <dimen name="effect_padding_horizontal">2dp</dimen> <dimen name="effects_container_padding">12dp</dimen> - <dimen name="action_bar_height">56dp</dimen> - <dimen name="action_bar_text_size">18sp</dimen> - <dimen name="action_bar_arrow_padding_top">20dp</dimen> - <dimen name="action_bar_arrow_padding_bottom">20dp</dimen> - <dimen name="action_bar_arrow_padding_left">4dp</dimen> - <dimen name="action_bar_arrow_padding_right">0dp</dimen> - <dimen name="action_bar_icon_padding_top">7dp</dimen> - <dimen name="action_bar_icon_padding_bottom">7dp</dimen> + <dimen name="action_bar_arrow_margin_left">3dp</dimen> + <dimen name="action_bar_arrow_margin_right">-3dp</dimen> + <dimen name="action_bar_icon_padding_vertical">4dp</dimen> <dimen name="action_bar_icon_padding_left">0dp</dimen> - <dimen name="action_bar_icon_padding_right">8dp</dimen> - <dimen name="action_button_padding_top">9dp</dimen> - <dimen name="action_button_padding_bottom">9dp</dimen> - <dimen name="action_button_padding_left">22dp</dimen> - <dimen name="action_button_padding_right">22dp</dimen> + <dimen name="action_bar_icon_padding_right">5dp</dimen> + <dimen name="action_button_padding_vertical">8dp</dimen> + <dimen name="action_button_padding_horizontal">22dp</dimen> <dimen name="effect_tool_panel_padding">16dp</dimen> <dimen name="seekbar_width">560dp</dimen> <dimen name="seekbar_height">33dp</dimen> diff --git a/res/values-sw800dp/photoeditor_dimens.xml b/res/values-sw800dp/photoeditor_dimens.xml index 3b054ceb4..9dab9225a 100755 --- a/res/values-sw800dp/photoeditor_dimens.xml +++ b/res/values-sw800dp/photoeditor_dimens.xml @@ -18,22 +18,15 @@ <dimen name="effect_label_text_size">15sp</dimen> <dimen name="effect_label_width">138dp</dimen> <dimen name="effect_icon_size">100dp</dimen> - <dimen name="effect_padding_left_right">3dp</dimen> + <dimen name="effect_padding_horizontal">3dp</dimen> <dimen name="effects_container_padding">18dp</dimen> - <dimen name="action_bar_height">56dp</dimen> - <dimen name="action_bar_text_size">19sp</dimen> - <dimen name="action_bar_arrow_padding_top">20dp</dimen> - <dimen name="action_bar_arrow_padding_bottom">20dp</dimen> - <dimen name="action_bar_arrow_padding_left">4dp</dimen> - <dimen name="action_bar_arrow_padding_right">0dp</dimen> - <dimen name="action_bar_icon_padding_top">7dp</dimen> - <dimen name="action_bar_icon_padding_bottom">7dp</dimen> + <dimen name="action_bar_arrow_margin_left">3dp</dimen> + <dimen name="action_bar_arrow_margin_right">-3dp</dimen> + <dimen name="action_bar_icon_padding_vertical">4dp</dimen> <dimen name="action_bar_icon_padding_left">0dp</dimen> - <dimen name="action_bar_icon_padding_right">11dp</dimen> - <dimen name="action_button_padding_top">9dp</dimen> - <dimen name="action_button_padding_bottom">9dp</dimen> - <dimen name="action_button_padding_left">28dp</dimen> - <dimen name="action_button_padding_right">28dp</dimen> + <dimen name="action_bar_icon_padding_right">5dp</dimen> + <dimen name="action_button_padding_vertical">8dp</dimen> + <dimen name="action_button_padding_horizontal">28dp</dimen> <dimen name="effect_tool_panel_padding">18dp</dimen> <dimen name="seekbar_width">560dp</dimen> <dimen name="seekbar_height">35dp</dimen> diff --git a/res/values/photoeditor_strings.xml b/res/values/photoeditor_strings.xml index 4a5d34669..b282a45b7 100644 --- a/res/values/photoeditor_strings.xml +++ b/res/values/photoeditor_strings.xml @@ -40,7 +40,7 @@ <string name="no">No</string> <!-- Text button in the action bar for the user to save edited photo. [CHAR LIMIT=8] --> - <string name="save">Save</string> + <string name="save">SAVE</string> <!-- Name for the photo effect that auto fixes exposure. [CHAR LIMIT=15] --> <string name="autofix">Auto-fix</string> diff --git a/res/values/photoeditor_styles.xml b/res/values/photoeditor_styles.xml index 42b91d19a..fe5ad1a54 100644 --- a/res/values/photoeditor_styles.xml +++ b/res/values/photoeditor_styles.xml @@ -37,8 +37,8 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_gravity">center_vertical</item> - <item name="android:paddingLeft">@dimen/effect_padding_left_right</item> - <item name="android:paddingRight">@dimen/effect_padding_left_right</item> + <item name="android:paddingLeft">@dimen/effect_padding_horizontal</item> + <item name="android:paddingRight">@dimen/effect_padding_horizontal</item> <item name="android:orientation">vertical</item> </style> <style name="EffectsContainer"> @@ -62,12 +62,11 @@ </style> <style name="ActionBar"> <item name="android:layout_width">fill_parent</item> - <item name="android:layout_height">@dimen/action_bar_height</item> + <item name="android:layout_height">?android:attr/actionBarSize</item> </style> <style name="ActionBarLinearLayout"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">fill_parent</item> - <item name="android:layout_centerVertical">true</item> <item name="android:orientation">horizontal</item> </style> <style name="ActionBarBackLinearLayout" parent="@style/ActionBarLinearLayout"> @@ -82,37 +81,39 @@ <item name="android:scaleType">centerInside</item> <item name="android:adjustViewBounds">true</item> </style> - <style name="ActionBarArrow" parent="@style/ActionBarImageView"> - <item name="android:paddingTop">@dimen/action_bar_arrow_padding_top</item> - <item name="android:paddingBottom">@dimen/action_bar_arrow_padding_bottom</item> - <item name="android:paddingLeft">@dimen/action_bar_arrow_padding_left</item> - <item name="android:paddingRight">@dimen/action_bar_arrow_padding_right</item> - <item name="android:src">@drawable/photoeditor_arrow_back</item> + <style name="ActionBarArrow"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:layout_marginLeft">@dimen/action_bar_arrow_margin_left</item> + <item name="android:layout_marginRight">@dimen/action_bar_arrow_margin_right</item> + <item name="android:src">?android:attr/homeAsUpIndicator</item> </style> <style name="ActionBarIcon" parent="@style/ActionBarImageView"> - <item name="android:paddingTop">@dimen/action_bar_icon_padding_top</item> - <item name="android:paddingBottom">@dimen/action_bar_icon_padding_bottom</item> + <item name="android:paddingTop">@dimen/action_bar_icon_padding_vertical</item> + <item name="android:paddingBottom">@dimen/action_bar_icon_padding_vertical</item> <item name="android:paddingLeft">@dimen/action_bar_icon_padding_left</item> <item name="android:paddingRight">@dimen/action_bar_icon_padding_right</item> <item name="android:src">@mipmap/ic_launcher_gallery</item> </style> - <style name="ActionBarText"> + <style name="ActionBarTitle" parent="android:TextAppearance.Holo.Widget.ActionBar.Title"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center</item> - <item name="android:textSize">@dimen/action_bar_text_size</item> - <item name="android:textColor">#FFFFFF</item> + <item name="android:layout_height">fill_parent</item> + <item name="android:gravity">center</item> </style> <style name="ImageActionButton" parent="@style/ActionBarImageView"> - <item name="android:paddingTop">@dimen/action_button_padding_top</item> - <item name="android:paddingBottom">@dimen/action_button_padding_bottom</item> - <item name="android:paddingLeft">@dimen/action_button_padding_left</item> - <item name="android:paddingRight">@dimen/action_button_padding_right</item> + <item name="android:paddingTop">@dimen/action_button_padding_vertical</item> + <item name="android:paddingBottom">@dimen/action_button_padding_vertical</item> + <item name="android:paddingLeft">@dimen/action_button_padding_horizontal</item> + <item name="android:paddingRight">@dimen/action_button_padding_horizontal</item> <item name="android:background">?android:attr/selectableItemBackground</item> </style> - <style name="TextActionButton" parent="@style/ActionBarText"> - <item name="android:paddingLeft">@dimen/action_button_padding_left</item> - <item name="android:paddingRight">@dimen/action_button_padding_right</item> + <style name="TextActionButton" parent="android:TextAppearance.Holo.Widget.ActionBar.Menu"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">fill_parent</item> + <item name="android:gravity">center</item> + <item name="android:paddingLeft">@dimen/action_button_padding_horizontal</item> + <item name="android:paddingRight">@dimen/action_button_padding_horizontal</item> <item name="android:background">?android:attr/selectableItemBackground</item> </style> <style name="EffectsMenuActionButton" parent="@style/ImageActionButton"> |