From 0aaf8fb8b86cbf6353937c12f377ad524661c553 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Sun, 30 Sep 2012 12:57:45 -0700
Subject: [PATCH] Update FX/pano button appearance, placement, animation

Bug: 7213162
Bug: 7233446
Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
---
 res/drawable/photopage_bottom_button_background.xml |  5 +++++
 res/layout/photopage_bottom_controls.xml            | 21 +++++++++++++++++----
 res/values/colors.xml                               |  2 ++
 .../gallery3d/app/PhotoPageBottomControls.java      |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 res/drawable/photopage_bottom_button_background.xml

diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml
new file mode 100644
index 000000000..0c772ad21
--- /dev/null
+++ b/res/drawable/photopage_bottom_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/>
+    <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/>
+</selector>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index a8fca2d72..5b80cf2da 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/photopage_bottom_controls"
+        android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -9,14 +10,26 @@
         android:visibility="gone">
         <ImageButton
                 android:id="@+id/photopage_bottom_control_edit"
-                android:src="@drawable/photoeditor_artistic"
+                android:src="@drawable/ic_photoeditor_effects"
+                android:background="@drawable/photopage_bottom_button_background"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
                 android:visibility="gone"/>
         <ImageButton
                 android:id="@+id/photopage_bottom_control_panorama"
-                android:src="@android:drawable/ic_dialog_map"
+                android:src="@drawable/ic_menu_photosphere"
+                android:background="@drawable/photopage_bottom_button_background"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
                 android:visibility="gone"/>
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 10f5b6303..705748c2b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -38,4 +38,6 @@
     <color name="bitmap_screennail_placeholder">#333</color>
 
     <color name="slideshow_background">#1A1A1A</color>
+
+    <color name="button_dark_transparent_background">#6000</color>
 </resources>
diff --git a/src/com/android/gallery3d/app/PhotoPageBottomControls.java b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
index 8ba4818db..40588e128 100644
--- a/src/com/android/gallery3d/app/PhotoPageBottomControls.java
+++ b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
@@ -51,8 +51,8 @@ public class PhotoPageBottomControls implements OnClickListener {
 
     private static final int CONTROL_ANIM_DURATION_MS = 150;
     private static Animation getControlAnimForVisibility(boolean visible) {
-        Animation anim = visible ? new ScaleAnimation(0, 1, 1, 1)
-                : new ScaleAnimation(1, 0, 1, 1);
+        Animation anim = visible ? new AlphaAnimation(0f, 1f)
+                : new AlphaAnimation(1f, 0f);
         anim.setDuration(CONTROL_ANIM_DURATION_MS);
         return anim;
     }
-- 
2.11.0