diff options
| -rw-r--r-- | res/layout/filtershow_activity.xml | 6 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 9606d9129..e811ec742 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -99,12 +99,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.imageshow.ImageDraw - android:id="@+id/imageDraw" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> - <ProgressBar android:id="@+id/loading" style="@android:style/Widget.Holo.ProgressBar.Large" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cb38007e4..f7734bb59 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -88,4 +88,5 @@ <dimen name="face_circle_stroke">2dip</dimen> <dimen name="zoom_font_size">14pt</dimen> <dimen name="shutter_offset">-22dp</dimen> + <dimen name="margin_systemui_offset">6dip</dimen> </resources> diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index ae5a03414..1400fd4de 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -22,7 +22,6 @@ import android.util.Log; import com.android.gallery3d.filtershow.ImageStateAdapter; import com.android.gallery3d.filtershow.cache.ImageLoader; -import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; @@ -428,6 +427,12 @@ public class ImagePreset { if (mGeoData.hasModifications()) { return false; } + if (mBorder != null && !mBorder.supportsPartialRendering()) { + return false; + } + if (ImageLoader.getZoomOrientation() != 0) { + return false; + } for (int i = 0; i < mFilters.size(); i++) { FilterRepresentation representation = null; synchronized (mFilters) { |