Merge "Fix loading screen" into gb-ub-photos-bryce

5 files changed, 39 insertions, 28 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index bf17a6543..5859be0c4 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -46,16 +46,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.AdapterView;
+import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.SeekBar;
-import android.widget.ShareActionProvider;
 import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
-import android.widget.Toast;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.data.LocalAlbum;
@@ -231,6 +224,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mEditorPlaceHolder.setOldViews(mImageViews);
         mEditorPlaceHolder.setImageLoader(mImageLoader);
 
+        mEditorPlaceHolder.hide();
+
         mListFx = findViewById(R.id.fxList);
         mListBorders = findViewById(R.id.bordersList);
         mListGeometry = findViewById(R.id.geometryList);
@@ -366,8 +361,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
     private void startLoadBitmap(Uri uri) {
         final View filters = findViewById(R.id.filtersPanel);
         final View loading = findViewById(R.id.loading);
-        loading.setVisibility(View.VISIBLE);
+        final View imageShow = findViewById(R.id.imageShow);
+        imageShow.setVisibility(View.INVISIBLE);
         filters.setVisibility(View.INVISIBLE);
+        loading.setVisibility(View.VISIBLE);
+
         View tinyPlanetView = findViewById(R.id.tinyplanetButton);
         if (tinyPlanetView != null) {
             tinyPlanetView.setVisibility(View.GONE);
@@ -447,10 +445,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
             if (isCancelled()) {
                 return;
             }
-            final View filters = findViewById(R.id.filtersPanel);
-            final View loading = findViewById(R.id.loading);
-            loading.setVisibility(View.GONE);
-            filters.setVisibility(View.VISIBLE);
             if (values[0]) {
                 mTinyPlanetButton.setVisibility(View.VISIBLE);
             }
@@ -467,6 +461,16 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
                 cannotLoadImage();
             }
 
+            final View loading = findViewById(R.id.loading);
+            loading.setVisibility(View.GONE);
+            final View filters = findViewById(R.id.filtersPanel);
+            filters.setVisibility(View.VISIBLE);
+            float y = filters.getY();
+            filters.setY(y + filters.getHeight());
+            filters.animate().setDuration(600).y(y).withLayer().start();
+            final View imageShow = findViewById(R.id.imageShow);
+            imageShow.setVisibility(View.VISIBLE);
+
             Bitmap largeBitmap = mImageLoader.getOriginalBitmapLarge();
             FilteringPipeline pipeline = FilteringPipeline.getPipeline();
             pipeline.setOriginal(largeBitmap);
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 0f14b9b66..6694e37f6 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -454,7 +454,10 @@ public class PanelController implements OnClickListener {
         boolean doPanelTransition = true;
         if (view instanceof FilterIconButton) {
             ImageFilter f = ((FilterIconButton) view).getImageFilter();
-            doPanelTransition = f.showUtilityPanel();
+            if (f != null) {
+                // FIXME: this check shouldn't be necessary
+                doPanelTransition = f.showUtilityPanel();
+            }
         }
 
         if (mUtilityPanel != null && !mUtilityPanel.selected() && doPanelTransition ) {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index 3578b1d5c..e18f0d034 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -328,7 +328,7 @@ public abstract class ImageGeometry extends ImageShow {
     }
 
     public void saveAndSetPreset() {
-        ImagePreset lastHistoryItem = mMasterImage.getHistory().getLast();
+        ImagePreset lastHistoryItem = MasterImage.getImage().getHistory().getLast();
         if (lastHistoryItem != null && lastHistoryItem.historyName().equalsIgnoreCase(getName())) {
             getImagePreset().setGeometry(mLocalGeometry);
             resetImageCaches(this);
@@ -338,7 +338,7 @@ public abstract class ImageGeometry extends ImageShow {
                 copy.setGeometry(mLocalGeometry);
                 copy.setHistoryName(getName());
                 copy.setIsFx(false);
-                mMasterImage.setPreset(copy, true);
+                MasterImage.getImage().setPreset(copy, true);
             }
         }
         invalidate();
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 8b58240a2..21046b56c 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -50,7 +50,6 @@ public class ImageShow extends View implements OnGestureListener,
         SliderListener,
         OnSeekBarChangeListener {
 
-    protected MasterImage mMasterImage = MasterImage.getImage();
     private static final String LOGTAG = "ImageShow";
 
     protected Paint mPaint = new Paint();
@@ -186,7 +185,7 @@ public class ImageShow extends View implements OnGestureListener,
     @Override
     public void onNewValue(int parameter) {
         if (getImagePreset() != null) {
-            getImagePreset().fillImageStateAdapter(mMasterImage.getState());
+            getImagePreset().fillImageStateAdapter(MasterImage.getImage().getState());
         }
         if (getPanelController() != null) {
             getPanelController().onNewValue(parameter);
@@ -211,7 +210,7 @@ public class ImageShow extends View implements OnGestureListener,
 
         setupGestureDetector(context);
         mActivity = (FilterShowActivity) context;
-        mMasterImage.addObserver(this);
+        MasterImage.getImage().addObserver(this);
     }
 
     public ImageShow(Context context) {
@@ -219,7 +218,7 @@ public class ImageShow extends View implements OnGestureListener,
 
         setupGestureDetector(context);
         mActivity = (FilterShowActivity) context;
-        mMasterImage.addObserver(this);
+        MasterImage.getImage().addObserver(this);
     }
 
     public void setupGestureDetector(Context context) {
@@ -238,7 +237,7 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public ImageFilter getCurrentFilter() {
-        return mMasterImage.getCurrentFilter();
+        return MasterImage.getImage().getCurrentFilter();
     }
 
     public void showToast(String text) {
@@ -275,7 +274,7 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public ImagePreset getImagePreset() {
-        return mMasterImage.getPreset();
+        return MasterImage.getImage().getPreset();
     }
 
     public void drawToast(Canvas canvas) {
@@ -330,19 +329,19 @@ public class ImageShow extends View implements OnGestureListener,
         if (mImageLoader == null) {
             return;
         }
-        mMasterImage.updatePresets(true);
+        MasterImage.getImage().updatePresets(true);
     }
 
     public Bitmap getFiltersOnlyImage() {
-        return mMasterImage.getFiltersOnlyImage();
+        return MasterImage.getImage().getFiltersOnlyImage();
     }
 
     public Bitmap getGeometryOnlyImage() {
-        return mMasterImage.getGeometryOnlyImage();
+        return MasterImage.getImage().getGeometryOnlyImage();
     }
 
     public Bitmap getFilteredImage() {
-        return mMasterImage.getFilteredImage();
+        return MasterImage.getImage().getFilteredImage();
     }
 
     public void drawImage(Canvas canvas, Bitmap image) {
@@ -464,7 +463,7 @@ public class ImageShow extends View implements OnGestureListener,
         mImageLoader = loader;
         if (mImageLoader != null) {
             mImageLoader.addListener(this);
-            mMasterImage.setImageLoader(mImageLoader);
+            MasterImage.getImage().setImageLoader(mImageLoader);
         }
     }
 
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 87acd5ff1..296954cf9 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -55,7 +55,8 @@ public class MasterImage implements RenderingRequestCaller {
     private Vector<ImageShow> mObservers = new Vector<ImageShow>();
     private FilterRepresentation mCurrentFilterRepresentation;
 
-    private MasterImage() { }
+    private MasterImage() {
+    }
 
     public static MasterImage getImage() {
         if (sMasterImage == null) {
@@ -65,6 +66,9 @@ public class MasterImage implements RenderingRequestCaller {
     }
 
     public void addObserver(ImageShow observer) {
+        if (mObservers.contains(observer)) {
+            return;
+        }
         mObservers.add(observer);
     }
 
@@ -117,6 +121,7 @@ public class MasterImage implements RenderingRequestCaller {
         // We need a copy from the history
         mHistory.setCurrentPreset(position);
     }
+
     public HistoryAdapter getHistory() {
         return mHistory;
     }