<?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"
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>
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;
}