Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
diff --git a/res/drawable-hdpi/ic_menu_photosphere.png b/res/drawable-hdpi/ic_menu_photosphere.png
new file mode 100644
index 0000000..27043ef
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_photosphere.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photoeditor_border.png b/res/drawable-hdpi/ic_photoeditor_border.png
new file mode 100644
index 0000000..5fb0d51
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_border.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photoeditor_color.png b/res/drawable-hdpi/ic_photoeditor_color.png
new file mode 100644
index 0000000..13972c2
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_color.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photoeditor_effects.png b/res/drawable-hdpi/ic_photoeditor_effects.png
new file mode 100644
index 0000000..8ec892b
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_effects.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photoeditor_fix.png b/res/drawable-hdpi/ic_photoeditor_fix.png
new file mode 100644
index 0000000..18b11c7
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_fix.png
Binary files differ
diff --git a/res/drawable-hdpi/placeholder_camera.9.png b/res/drawable-hdpi/placeholder_camera.9.png
new file mode 100644
index 0000000..f3af709
--- /dev/null
+++ b/res/drawable-hdpi/placeholder_camera.9.png
Binary files differ
diff --git a/res/drawable-hdpi/placeholder_locked.9.png b/res/drawable-hdpi/placeholder_locked.9.png
new file mode 100644
index 0000000..794b5e9
--- /dev/null
+++ b/res/drawable-hdpi/placeholder_locked.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_photosphere.png b/res/drawable-mdpi/ic_menu_photosphere.png
new file mode 100644
index 0000000..4ba0969
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_photosphere.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photoeditor_border.png b/res/drawable-mdpi/ic_photoeditor_border.png
new file mode 100644
index 0000000..2f19021
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_border.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photoeditor_color.png b/res/drawable-mdpi/ic_photoeditor_color.png
new file mode 100644
index 0000000..baec740
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_color.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photoeditor_effects.png b/res/drawable-mdpi/ic_photoeditor_effects.png
new file mode 100644
index 0000000..4547040
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_effects.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photoeditor_fix.png b/res/drawable-mdpi/ic_photoeditor_fix.png
new file mode 100644
index 0000000..c54a200
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_fix.png
Binary files differ
diff --git a/res/drawable-mdpi/placeholder_camera.9.png b/res/drawable-mdpi/placeholder_camera.9.png
new file mode 100644
index 0000000..0a0daa0
--- /dev/null
+++ b/res/drawable-mdpi/placeholder_camera.9.png
Binary files differ
diff --git a/res/drawable-mdpi/placeholder_locked.9.png b/res/drawable-mdpi/placeholder_locked.9.png
new file mode 100644
index 0000000..bb312eb
--- /dev/null
+++ b/res/drawable-mdpi/placeholder_locked.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_photosphere.png b/res/drawable-xhdpi/ic_menu_photosphere.png
new file mode 100644
index 0000000..19f9b29
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_photosphere.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photoeditor_border.png b/res/drawable-xhdpi/ic_photoeditor_border.png
new file mode 100644
index 0000000..df459d2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_border.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photoeditor_color.png b/res/drawable-xhdpi/ic_photoeditor_color.png
new file mode 100644
index 0000000..626d91b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_color.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photoeditor_effects.png b/res/drawable-xhdpi/ic_photoeditor_effects.png
new file mode 100644
index 0000000..0896f80
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_effects.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photoeditor_fix.png b/res/drawable-xhdpi/ic_photoeditor_fix.png
new file mode 100644
index 0000000..9116375
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_fix.png
Binary files differ
diff --git a/res/drawable-xhdpi/placeholder_camera.9.png b/res/drawable-xhdpi/placeholder_camera.9.png
new file mode 100644
index 0000000..a1132ad
--- /dev/null
+++ b/res/drawable-xhdpi/placeholder_camera.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/placeholder_locked.9.png b/res/drawable-xhdpi/placeholder_locked.9.png
new file mode 100644
index 0000000..578050f
--- /dev/null
+++ b/res/drawable-xhdpi/placeholder_locked.9.png
Binary files differ
diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml
new file mode 100644
index 0000000..0c772ad
--- /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 a8fca2d..5b80cf2 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 10f5b63..705748c 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>
