Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index f516a39..53971b8 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -17,4 +17,8 @@
<resources>
<!-- Specify the screen orientation -->
<bool name="only_use_portrait">true</bool>
+
+ <!-- Text size for the state panel -->
+ <dimen name="state_panel_text_size">16dip</dimen>
+
</resources>
\ No newline at end of file
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 701fabb..c95a15a 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -24,7 +24,7 @@
private static final boolean DEBUG = false;
private String mName;
private int mPriority = TYPE_NORMAL;
- private Class mFilterClass;
+ private Class<?> mFilterClass;
private boolean mSupportsPartialRendering = false;
private int mTextId = 0;
private int mEditorId = BasicEditor.ID;
@@ -157,11 +157,11 @@
return false;
}
- public Class getFilterClass() {
+ public Class<?> getFilterClass() {
return mFilterClass;
}
- public void setFilterClass(Class filterClass) {
+ public void setFilterClass(Class<?> filterClass) {
mFilterClass = filterClass;
}