diff options
| author | ztenghui <ztenghui@google.com> | 2013-05-09 09:27:04 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-05-09 09:27:04 -0700 |
| commit | e579e4f752af8005680a4b80780ba65a7fdfa9e8 (patch) | |
| tree | cc6dd6f1a8f52a10d197336c49176977096c2ee4 /src/com/android/gallery3d/filtershow/filters | |
| parent | bf1dc5019c3040e2380a1695f4a5ac8ac6aafd26 (diff) | |
| parent | b5530eae0732be37a7685e646c5dd9726dc73caf (diff) | |
| download | android_packages_apps_Snap-e579e4f752af8005680a4b80780ba65a7fdfa9e8.tar.gz android_packages_apps_Snap-e579e4f752af8005680a4b80780ba65a7fdfa9e8.tar.bz2 android_packages_apps_Snap-e579e4f752af8005680a4b80780ba65a7fdfa9e8.zip | |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad
Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java index d45ed56f2..368e5c029 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java @@ -16,14 +16,16 @@ 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; @@ -31,6 +33,7 @@ public class FilterBasicRepresentation extends FilterRepresentation implements P private int mPreviewValue; public static final String SERIAL_NAME = "Name"; public static final String SERIAL_VALUE = "Value"; + private boolean mLogVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE); public FilterBasicRepresentation(String name, int minimum, int value, int maximum) { super(name); @@ -50,7 +53,9 @@ public class FilterBasicRepresentation extends FilterRepresentation implements P 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; } |