Merge "New count down beeps." into gb-ub-photos-bryce
diff --git a/res/drawable-hdpi/capture_thumbnail_shadow.9.png b/res/drawable-hdpi/capture_thumbnail_shadow.9.png
new file mode 100644
index 0000000..f7a664e
--- /dev/null
+++ b/res/drawable-hdpi/capture_thumbnail_shadow.9.png
Binary files differ
diff --git a/res/drawable-mdpi/capture_thumbnail_shadow.9.png b/res/drawable-mdpi/capture_thumbnail_shadow.9.png
new file mode 100644
index 0000000..db0473d
--- /dev/null
+++ b/res/drawable-mdpi/capture_thumbnail_shadow.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/capture_thumbnail_shadow.9.png b/res/drawable-xhdpi/capture_thumbnail_shadow.9.png
new file mode 100644
index 0000000..3d771f7
--- /dev/null
+++ b/res/drawable-xhdpi/capture_thumbnail_shadow.9.png
Binary files differ
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a1e2370..7cc4be4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -98,6 +98,7 @@
<dimen name="navigation_bar_height">48dip</dimen>
<dimen name="navigation_bar_width">42dip</dimen>
<dimen name="capture_size">48dip</dimen>
+ <dimen name="capture_border">8dip</dimen>
<dimen name="capture_margin_right">16dip</dimen>
<dimen name="capture_margin_top">16dip</dimen>
<dimen name="camera_controls_size">0dip</dimen>
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index 28ccf7d..4d0651e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
@@ -16,19 +16,22 @@
package com.android.gallery3d.filtershow.filters;
-import com.android.gallery3d.app.Log;
+
+import android.util.Log;
+
import com.android.gallery3d.filtershow.controller.Control;
import com.android.gallery3d.filtershow.controller.FilterView;
import com.android.gallery3d.filtershow.controller.Parameter;
import com.android.gallery3d.filtershow.controller.ParameterInteger;
public class FilterBasicRepresentation extends FilterRepresentation implements ParameterInteger {
- private static final String LOGTAG = "FilterBasicRepresentation";
+ private static final String LOGTAG = "FilterBasicRep";
private int mMinimum;
private int mValue;
private int mMaximum;
private int mDefaultValue;
private int mPreviewValue;
+ private boolean mLogVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
public FilterBasicRepresentation(String name, int minimum, int value, int maximum) {
super(name);
@@ -48,7 +51,9 @@
representation.setMinimum(getMinimum());
representation.setMaximum(getMaximum());
representation.setValue(getValue());
- Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">");
+ if (mLogVerbose) {
+ Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">");
+ }
return representation;
}
