summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-29 07:30:33 -0700
committerJohn Hoford <hoford@google.com>2013-04-29 14:29:25 -0700
commit2ef853833a2d7fed29b3a46e526fb8479422064e (patch)
tree557b9ad681453da0b05b324f20e3926f18d7426e
parent7b7b5dd19859ff88519b51936bdb5d001f1853e2 (diff)
downloadandroid_packages_apps_Snap-2ef853833a2d7fed29b3a46e526fb8479422064e.tar.gz
android_packages_apps_Snap-2ef853833a2d7fed29b3a46e526fb8479422064e.tar.bz2
android_packages_apps_Snap-2ef853833a2d7fed29b3a46e526fb8479422064e.zip
small ui changes based on UX/PM feedback
bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
-rw-r--r--res/drawable-hdpi/filtershow_button_redo.pngbin0 -> 611 bytes
-rw-r--r--res/drawable-hdpi/filtershow_button_undo.pngbin0 -> 436 bytes
-rw-r--r--res/drawable-mdpi/filtershow_button_redo.pngbin0 -> 462 bytes
-rw-r--r--res/drawable-mdpi/filtershow_button_undo.pngbin0 -> 308 bytes
-rw-r--r--res/drawable-xhdpi/filtershow_button_redo.pngbin0 -> 785 bytes
-rw-r--r--res/drawable-xhdpi/filtershow_button_undo.pngbin0 -> 575 bytes
-rw-r--r--res/layout/filtershow_control_title_slider.xml3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java2
9 files changed, 5 insertions, 3 deletions
diff --git a/res/drawable-hdpi/filtershow_button_redo.png b/res/drawable-hdpi/filtershow_button_redo.png
new file mode 100644
index 000000000..43e673c7d
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_button_redo.png
Binary files differ
diff --git a/res/drawable-hdpi/filtershow_button_undo.png b/res/drawable-hdpi/filtershow_button_undo.png
new file mode 100644
index 000000000..6165a98a7
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_button_undo.png
Binary files differ
diff --git a/res/drawable-mdpi/filtershow_button_redo.png b/res/drawable-mdpi/filtershow_button_redo.png
new file mode 100644
index 000000000..6c5595d53
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_button_redo.png
Binary files differ
diff --git a/res/drawable-mdpi/filtershow_button_undo.png b/res/drawable-mdpi/filtershow_button_undo.png
new file mode 100644
index 000000000..97ee13da3
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_button_undo.png
Binary files differ
diff --git a/res/drawable-xhdpi/filtershow_button_redo.png b/res/drawable-xhdpi/filtershow_button_redo.png
new file mode 100644
index 000000000..61eafb998
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_button_redo.png
Binary files differ
diff --git a/res/drawable-xhdpi/filtershow_button_undo.png b/res/drawable-xhdpi/filtershow_button_undo.png
new file mode 100644
index 000000000..48ff5bcda
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_button_undo.png
Binary files differ
diff --git a/res/layout/filtershow_control_title_slider.xml b/res/layout/filtershow_control_title_slider.xml
index ac0815366..584e015fa 100644
--- a/res/layout/filtershow_control_title_slider.xml
+++ b/res/layout/filtershow_control_title_slider.xml
@@ -29,7 +29,8 @@
<TextView
android:id="@+id/controlValue"
android:layout_gravity="right"
- android:layout_marginRight="8dip" />
+ android:layout_marginRight="8dip"
+ android:textStyle="bold" />
<SeekBar
android:id="@+id/controlValueSeekBar"
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index 3ef1e09ed..28ccf7d8f 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
@@ -135,7 +135,8 @@ public class FilterBasicRepresentation extends FilterRepresentation implements P
@Override
public String getStateRepresentation() {
- return "" + getValue();
+ int val = getValue();
+ return ((val > 0) ? "+" : "") + val;
}
@Override
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
index 5257e7793..f67254c63 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -70,7 +70,7 @@ public class FilterImageBorderRepresentation extends FilterRepresentation {
@Override
public int getTextId() {
- return R.string.borders;
+ return R.string.none;
}
public boolean allowsMultipleInstances() {