From 2f84ae81c4a44bf6097224599c8d9a722c9a4f14 Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@google.com>
Date: Wed, 8 Jul 2009 16:54:54 +0800
Subject: [PATCH] Revert ContentObserver in ImageGallery.

---
 src/com/android/camera/ImageGallery.java | 36 +++-----------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/com/android/camera/ImageGallery.java b/src/com/android/camera/ImageGallery.java
index 993d4f3..33ab56e 100644
--- a/src/com/android/camera/ImageGallery.java
+++ b/src/com/android/camera/ImageGallery.java
@@ -34,7 +34,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -84,24 +83,6 @@ public class ImageGallery extends Activity implements
     private View mFooterOrganizeView;
 
     private BroadcastReceiver mReceiver = null;
-    private class CameraContentObserver extends ContentObserver {
-        private long mLastDbUpdateTime = 0;
-        public CameraContentObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            long now = System.currentTimeMillis();
-            // To avoid frequent rebake.
-            if (now - mLastDbUpdateTime > 3000) {
-                rebake(false, ImageManager.isMediaScannerScanning(
-                        getContentResolver()));
-                mLastDbUpdateTime = now;
-            }
-        }
-    }
-    private ContentObserver mDbObserver = null;
 
     private final Handler mHandler = new Handler();
     private boolean mLayoutComplete;
@@ -367,11 +348,6 @@ public class ImageGallery extends Activity implements
 
         mLoader.stop();
 
-        if (mDbObserver != null) {
-            getContentResolver().unregisterContentObserver(mDbObserver);
-            mDbObserver = null;
-        }
-
         mGvs.stop();
 
         if (mReceiver != null) {
@@ -398,9 +374,7 @@ public class ImageGallery extends Activity implements
             mMediaScanningDialog = null;
         }
 
-        mAllImages = allImages(!unmounted && !scanning);
-
-        if (scanning && (mAllImages.getCount() == 0)) {
+        if (scanning) {
             mMediaScanningDialog = ProgressDialog.show(
                     this,
                     null,
@@ -409,6 +383,8 @@ public class ImageGallery extends Activity implements
                     true);
         }
 
+        mAllImages = allImages(!unmounted && !scanning);
+
         mGvs.setImageList(mAllImages);
         mGvs.setDrawAdapter(this);
         mGvs.setLoader(mLoader);
@@ -480,12 +456,6 @@ public class ImageGallery extends Activity implements
             }
         };
         registerReceiver(mReceiver, intentFilter);
-
-        mDbObserver = new CameraContentObserver(mHandler);
-        getContentResolver().registerContentObserver(
-                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                true, mDbObserver);
-
         rebake(false, ImageManager.isMediaScannerScanning(
                 getContentResolver()));
     }
-- 
2.11.0