Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20a4a448 authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

Gallery2: Refactorize Pools class 



Move Pools to other package to avoid the conflict name with the
frameworks base one, which has a different implementation.

Change-Id: Idbe79773232a957a1ef230326a142e126eebb8b4
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 3d0f6487

src/com/android/photos/data/BitmapDecoder.java

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ import android.graphics.Bitmap; 
import android.graphics.Bitmap.Config;

import android.graphics.BitmapFactory;

import android.util.Log;

import android.util.Pools.Pool;

import android.util.Pools.SynchronizedPool;



import com.android.gallery3d.common.Utils;

import com.android.photos.data.BitmapPools.Pool;

import com.android.photos.data.BitmapPools.SynchronizedPool;



import java.io.BufferedInputStream;

import java.io.File;

src/android/util/Pools.java→src/com/android/photos/data/BitmapPools.java

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util;

package com.android.photos.data;



/**

 * Helper class for crating pools of objects. An example use looks like this:
@@ -40,7 +40,7 @@ package android.util; 
 *

 * @hide

 */

public final class Pools {

public final class BitmapPools {



    /**

     * Interface for managing a pool of objects.
@@ -65,7 +65,7 @@ public final class Pools { 
        public boolean release(T instance);

    }



    private Pools() {

    private BitmapPools() {

        /* do nothing - hiding constructor */

    }

src/com/android/photos/data/GalleryBitmapPool.java

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.photos.data; 


import android.graphics.Bitmap;

import android.graphics.Point;

import android.util.Pools.Pool;

import android.util.Pools.SynchronizedPool;



import com.android.photos.data.BitmapPools.Pool;

import com.android.photos.data.BitmapPools.SynchronizedPool;

import com.android.photos.data.SparseArrayBitmapPool.Node;



public class GalleryBitmapPool {

src/com/android/photos/data/MediaCacheUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.graphics.Bitmap; 
import android.graphics.Bitmap.CompressFormat;

import android.graphics.BitmapFactory;

import android.util.Log;

import android.util.Pools.SimplePool;

import android.util.Pools.SynchronizedPool;



import com.android.gallery3d.R;

import com.android.gallery3d.common.BitmapUtils;
@@ -31,6 +29,8 @@ import com.android.gallery3d.data.DecodeUtils; 
import com.android.gallery3d.data.MediaItem;

import com.android.gallery3d.util.ThreadPool.CancelListener;

import com.android.gallery3d.util.ThreadPool.JobContext;

import com.android.photos.data.BitmapPools.SimplePool;

import com.android.photos.data.BitmapPools.SynchronizedPool;

import com.android.photos.data.MediaRetriever.MediaSize;



import java.io.File;

src/com/android/photos/data/SparseArrayBitmapPool.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.photos.data; 
import android.graphics.Bitmap;

import android.util.SparseArray;



import android.util.Pools.Pool;

import com.android.photos.data.BitmapPools.Pool;



public class SparseArrayBitmapPool {