Merge "Fix local adjust" into gb-ub-photos-bryce

14 files changed, 13 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_localadjust_add.png b/res/drawable-hdpi/ic_localadjust_add.png
new file mode 100644
index 000000000..4e0dc2b7b
--- /dev/null
+++ b/res/drawable-hdpi/ic_localadjust_add.png
diff --git a/res/drawable-hdpi/ic_localadjust_delete.png b/res/drawable-hdpi/ic_localadjust_delete.png
new file mode 100644
index 000000000..521541f49
--- /dev/null
+++ b/res/drawable-hdpi/ic_localadjust_delete.png
diff --git a/res/drawable-hdpi/localadjust_defocused.png b/res/drawable-hdpi/localadjust_defocused.png
new file mode 100644
index 000000000..20677a034
--- /dev/null
+++ b/res/drawable-hdpi/localadjust_defocused.png
diff --git a/res/drawable-hdpi/localadjust_focused.png b/res/drawable-hdpi/localadjust_focused.png
new file mode 100644
index 000000000..5f6b856c5
--- /dev/null
+++ b/res/drawable-hdpi/localadjust_focused.png
diff --git a/res/drawable-mdpi/ic_localadjust_add.png b/res/drawable-mdpi/ic_localadjust_add.png
new file mode 100644
index 000000000..94657346e
--- /dev/null
+++ b/res/drawable-mdpi/ic_localadjust_add.png
diff --git a/res/drawable-mdpi/ic_localadjust_delete.png b/res/drawable-mdpi/ic_localadjust_delete.png
new file mode 100644
index 000000000..b6221e608
--- /dev/null
+++ b/res/drawable-mdpi/ic_localadjust_delete.png
diff --git a/res/drawable-mdpi/localadjust_defocused.png b/res/drawable-mdpi/localadjust_defocused.png
new file mode 100644
index 000000000..7abcbba06
--- /dev/null
+++ b/res/drawable-mdpi/localadjust_defocused.png
diff --git a/res/drawable-mdpi/localadjust_focused.png b/res/drawable-mdpi/localadjust_focused.png
new file mode 100644
index 000000000..d2a992542
--- /dev/null
+++ b/res/drawable-mdpi/localadjust_focused.png
diff --git a/res/drawable-xhdpi/ic_localadjust_add.png b/res/drawable-xhdpi/ic_localadjust_add.png
new file mode 100644
index 000000000..ca7b654b3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_localadjust_add.png
diff --git a/res/drawable-xhdpi/ic_localadjust_delete.png b/res/drawable-xhdpi/ic_localadjust_delete.png
new file mode 100644
index 000000000..9dfb392c8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_localadjust_delete.png
diff --git a/res/drawable-xhdpi/localadjust_defocused.png b/res/drawable-xhdpi/localadjust_defocused.png
new file mode 100644
index 000000000..8ece12294
--- /dev/null
+++ b/res/drawable-xhdpi/localadjust_defocused.png
diff --git a/res/drawable-xhdpi/localadjust_focused.png b/res/drawable-xhdpi/localadjust_focused.png
new file mode 100644
index 000000000..76aef60bb
--- /dev/null
+++ b/res/drawable-xhdpi/localadjust_focused.png
diff --git a/res/drawable/filtershow_addpoint.png b/res/drawable/filtershow_addpoint.png
index 483d8eebe..5abfc7464 100644
--- a/res/drawable/filtershow_addpoint.png
+++ b/res/drawable/filtershow_addpoint.png
diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml
index 734d7500b..a3ef3ed5d 100644
--- a/res/layout/filtershow_control_action_slider.xml
+++ b/res/layout/filtershow_control_action_slider.xml
@@ -22,7 +22,7 @@
     android:orientation="horizontal" >
 
     <ImageButton
-        android:id="@+id/actionButton"
+        android:id="@+id/leftActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left|center_vertical"
@@ -39,5 +39,17 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         style="@style/FilterShowSlider" />
+
+    <ImageButton
+        android:id="@+id/rightActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:scaleType="centerInside"
+        android:layout_weight="0"
+        android:background="@drawable/filtershow_button_background"
+        android:src="@drawable/ic_menu_trash_holo_light"
+        android:paddingBottom="8dp"  />
+
 </LinearLayout>