diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 6b1d8d13f..87ebe60a4 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -116,6 +116,10 @@ import com.android.camera.util.PhotoSphereHelper; import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; import com.android.camera.util.UsageStatistics; import org.codeaurora.snapcam.R; +import com.bumptech.glide.Glide; +import com.bumptech.glide.GlideBuilder; +import com.bumptech.glide.MemoryCategory; +import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor; import java.io.File; import java.io.IOException; @@ -1539,8 +1543,7 @@ public class CameraActivity extends Activity FilmStripView.ImageData.SIZE_FULL); // Put a CameraPreviewData at the first position. mWrappedDataAdapter = new FixedFirstDataAdapter( - new CameraDataAdapter(new ColorDrawable( - getResources().getColor(R.color.photo_placeholder))), + new CameraDataAdapter(R.color.photo_placeholder), mCameraPreviewData); mFilmStripView.setViewGap( @@ -1610,13 +1613,17 @@ public class CameraActivity extends Activity display.getSize(size); int width = size.x; int height = size.y; - int lower = Math.min(width, height); - int offset = lower * 7 / 100; SETTING_LIST_WIDTH_1 = lower / 2 + offset; SETTING_LIST_WIDTH_2 = lower / 2 - offset; registerSDcardMountedReceiver(); + + if (!Glide.isSetup()) { + Glide.setup(new GlideBuilder(getApplicationContext()) + .setResizeService(new FifoPriorityThreadPoolExecutor(2))); + Glide.get(getApplicationContext()).setMemoryCategory(MemoryCategory.HIGH); + } } private void setRotationAnimation() { |