Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
diff --git a/res/drawable-hdpi/filtershow_button_redo.png b/res/drawable-hdpi/filtershow_button_redo.png
new file mode 100644
index 0000000..43e673c
--- /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 0000000..6165a98
--- /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 0000000..6c5595d
--- /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 0000000..97ee13d
--- /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 0000000..61eafb9
--- /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 0000000..48ff5bc
--- /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 ac08153..584e015 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/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 56680b0..d26a58a 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -730,7 +730,8 @@
}
private void fillFx() {
- FilterFxRepresentation nullFx = new FilterFxRepresentation(getString(R.string.none), 0, R.string.none);
+ FilterFxRepresentation nullFx =
+ new FilterFxRepresentation(getString(R.string.none), 0, R.string.none);
Vector<FilterRepresentation> filtersRepresentations = new Vector<FilterRepresentation>();
FiltersManager.getManager().addLooks(this, filtersRepresentations);
diff --git a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java
index cbaa489..f29442b 100644
--- a/src/com/android/gallery3d/filtershow/controller/TitledSlider.java
+++ b/src/com/android/gallery3d/filtershow/controller/TitledSlider.java
@@ -87,8 +87,8 @@
@Override
public void updateUI() {
- if (mControlName != null) {
- mControlName.setText(mParameter.getParameterName());
+ if (mControlName != null && mParameter.getParameterName() != null) {
+ mControlName.setText(mParameter.getParameterName().toUpperCase());
}
if (mControlValue != null) {
mControlValue.setText(
diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
index 44296e2..af694d8 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -51,6 +51,7 @@
super.reflectCurrentFilter();
if (getLocalRepresentation() != null && getLocalRepresentation() instanceof FilterBasicRepresentation) {
FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
+ updateText();
}
}
diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index b543750..e760ae5 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -60,7 +60,7 @@
public static byte SHOW_VALUE_INT = 1;
public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
- return effectName + " " + parameterValue;
+ return effectName.toUpperCase() + " " + parameterValue;
}
protected Editor(int id) {
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
index 4c071dc..dbc6ca0 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
@@ -40,7 +40,7 @@
public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
String apply = context.getString(R.string.apply_effect);
apply += " " + effectName;
- return apply;
+ return apply.toUpperCase();
}
@Override
diff --git a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
index 02a1c71..c23b90b 100644
--- a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
@@ -93,12 +93,12 @@
if (mShowParameter == SHOW_VALUE_INT & useCompact(context)) {
if (getLocalRepresentation() instanceof FilterBasicRepresentation) {
FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
- apply += " " + effectName + " " + interval.getStateRepresentation();
+ apply += " " + effectName.toUpperCase() + " " + interval.getStateRepresentation();
} else {
- apply += " " + effectName + " " + parameterValue;
+ apply += " " + effectName.toUpperCase() + " " + parameterValue;
}
} else {
- apply += " " + effectName;
+ apply += " " + effectName.toUpperCase();
}
return apply;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index ec9a436..9927a0a 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -99,7 +99,7 @@
filters.add(ImageFilterVibrance.class);
filters.add(ImageFilterSharpen.class);
filters.add(ImageFilterCurves.class);
- filters.add(ImageFilterDraw.class);
+ // filters.add(ImageFilterDraw.class);
filters.add(ImageFilterHue.class);
filters.add(ImageFilterSaturated.class);
filters.add(ImageFilterBwFilter.class);
@@ -169,7 +169,7 @@
public void addTools(Vector<FilterRepresentation> representations) {
//representations.add(getRepresentation(ImageFilterRedEye.class));
- representations.add(getRepresentation(ImageFilterDraw.class));
+ // representations.add(getRepresentation(ImageFilterDraw.class));
}
public void setFilterResources(Resources resources) {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index 3ef1e09..28ccf7d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
@@ -135,7 +135,8 @@
@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 5257e77..f67254c 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -70,7 +70,7 @@
@Override
public int getTextId() {
- return R.string.borders;
+ return R.string.none;
}
public boolean allowsMultipleInstances() {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
index a329677..e334fc9 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
@@ -46,6 +46,7 @@
private float mDownRadiusY;
private Matrix mScrToImg;
+ private boolean mShowReshapeHandles = true;
public final static int HAN_CENTER = 0;
public final static int HAN_NORTH = 7;
public final static int HAN_NE = 8;
@@ -57,7 +58,7 @@
public final static int HAN_NW = 6;
public EclipseControl(Context context) {
- mSliderColor = context.getResources().getColor(R.color.slider_line_color);
+ mSliderColor = Color.WHITE;
}
public void setRadius(float x, float y) {
@@ -215,29 +216,36 @@
canvas.drawOval(rect, paint);
float da = 4;
float arclen = da + da;
- for (int i = 0; i < 361; i += 90) {
- float dx = rx + 10;
- float dy = ry + 10;
- rect.left = cx - dx;
- rect.top = cy - dy;
- rect.right = cx + dx;
- rect.bottom = cy + dy;
- canvas.drawArc(rect, i - da, arclen, false, paint);
- dx = rx - 10;
- dy = ry - 10;
- rect.left = cx - dx;
- rect.top = cy - dy;
- rect.right = cx + dx;
- rect.bottom = cy + dy;
- canvas.drawArc(rect, i - da, arclen, false, paint);
+ if (mShowReshapeHandles) {
+ paint.setStyle(Paint.Style.STROKE);
+
+ for (int i = 0; i < 361; i += 90) {
+ float dx = rx + 10;
+ float dy = ry + 10;
+ rect.left = cx - dx;
+ rect.top = cy - dy;
+ rect.right = cx + dx;
+ rect.bottom = cy + dy;
+ canvas.drawArc(rect, i - da, arclen, false, paint);
+ dx = rx - 10;
+ dy = ry - 10;
+ rect.left = cx - dx;
+ rect.top = cy - dy;
+ rect.right = cx + dx;
+ rect.bottom = cy + dy;
+ canvas.drawArc(rect, i - da, arclen, false, paint);
+ }
}
da *= 2;
+ paint.setStyle(Paint.Style.FILL);
+
for (int i = 45; i < 361; i += 90) {
double angle = Math.PI * i / 180.;
float x = cx + (float) (rx * Math.cos(angle));
float y = cy + (float) (ry * Math.sin(angle));
canvas.drawRect(x - da, y - da, x + da, y + da, paint);
}
+ paint.setStyle(Paint.Style.STROKE);
rect.left = cx - rx;
rect.top = cy - ry;
rect.right = cx + rx;
@@ -270,4 +278,8 @@
public boolean isUndefined() {
return Float.isNaN(mCenterX);
}
+
+ public void setShowReshapeHandles(boolean showReshapeHandles) {
+ this.mShowReshapeHandles = showReshapeHandles;
+ }
}
