summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-18 17:53:44 -0700
committernicolasroard <nicolasroard@google.com>2012-10-18 23:36:56 -0700
commit701526a962647cff3bd8b5360c10fd79636926cc (patch)
tree09c4e68c6c84de7ac8c8a04e0ea872113373209f
parente32571ad419e5cf38c0568fd60a0cc640837819c (diff)
downloadandroid_packages_apps_Snap-701526a962647cff3bd8b5360c10fd79636926cc.zip
android_packages_apps_Snap-701526a962647cff3bd8b5360c10fd79636926cc.tar.gz
android_packages_apps_Snap-701526a962647cff3bd8b5360c10fd79636926cc.tar.bz2
Improves Curves & Crop UI
bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
-rw-r--r--res/layout/filtershow_activity.xml63
-rw-r--r--res/menu/filtershow_menu_crop.xml24
-rw-r--r--res/menu/filtershow_menu_curves.xml10
3 files changed, 64 insertions, 33 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index c62e714..e07cb1c 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -193,34 +193,41 @@
android:orientation="horizontal"
android:visibility="gone" >
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/aspect"
- style="@style/FilterShowBottomButton"
- android:layout_gravity="left"
- android:layout_weight="0"
- android:visibility="gone"
- android:src="@drawable/filtershow_button_geometry_straighten"
- android:text="@string/aspect" />
-
- <ImageButton
- android:id="@+id/pickCurvesChannel"
- android:layout_width="64dip"
- android:layout_height="64dip"
- android:layout_gravity="center_vertical|left"
- android:scaleType="centerInside"
- android:text="@string/curvesRGB"
- android:src="@drawable/filtershow_button_show_original" />
-
- <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
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+ <com.android.gallery3d.filtershow.ui.FramedTextButton
+ android:id="@+id/aspect"
+ android:layout_width="64dip"
+ android:layout_height="64dip"
+ android:layout_gravity="center_vertical|left"
+ android:background="@android:color/transparent"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ android:text="@string/aspectOriginal_effect" />
+
+ <com.android.gallery3d.filtershow.ui.FramedTextButton
+ android:id="@+id/pickCurvesChannel"
+ android:layout_width="64dip"
+ android:layout_height="64dip"
+ android:layout_gravity="center_vertical|left"
+ android:background="@android:color/transparent"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ android:text="@string/curves_channel_rgb" />
+
+ <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>
<HorizontalScrollView
diff --git a/res/menu/filtershow_menu_crop.xml b/res/menu/filtershow_menu_crop.xml
new file mode 100644
index 0000000..dc85d6f
--- /dev/null
+++ b/res/menu/filtershow_menu_crop.xml
@@ -0,0 +1,24 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <group android:id="@+id/crop_popupmenu" >
+ <item
+ android:id="@+id/crop_menu_1to1"
+ android:title="@string/aspect1to1_effect"/>
+ <item
+ android:id="@+id/crop_menu_4to6"
+ android:title="@string/aspect4to6_effect"/>
+ <item
+ android:id="@+id/crop_menu_5to7"
+ android:title="@string/aspect5to7_effect"/>
+ <item
+ android:id="@+id/crop_menu_9to16"
+ android:title="@string/aspect9to16_effect"/>
+ <item
+ android:id="@+id/crop_menu_none"
+ android:title="@string/aspectNone_effect"/>
+ <item
+ android:id="@+id/crop_menu_original"
+ android:title="@string/aspectOriginal_effect"/>
+ </group>
+
+</menu> \ No newline at end of file
diff --git a/res/menu/filtershow_menu_curves.xml b/res/menu/filtershow_menu_curves.xml
index fe19021..326df45 100644
--- a/res/menu/filtershow_menu_curves.xml
+++ b/res/menu/filtershow_menu_curves.xml
@@ -1,17 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <group android:id="@+id/group_popupmenu" >
+ <group android:id="@+id/curves_popupmenu" >
<item
- android:id="@+id/menu1"
+ android:id="@+id/curve_menu_rgb"
android:title="@string/curves_channel_rgb"/>
<item
- android:id="@+id/menu2"
+ android:id="@+id/curve_menu_red"
android:title="@string/curves_channel_red"/>
<item
- android:id="@+id/menu3"
+ android:id="@+id/curve_menu_green"
android:title="@string/curves_channel_green"/>
<item
- android:id="@+id/menu4"
+ android:id="@+id/curve_menu_blue"
android:title="@string/curves_channel_blue"/>
</group>