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

Commit 3dccbdd9 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am e34a5a5e: Fix when we cannot load an image 

* commit 'e34a5a5e':
  Fix when we cannot load an image
parents 3f89f750 e34a5a5e

res/values/filtershow_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
    <!--  Title for the image editor activity [CHAR LIMIT=NONE]-->

    <string name="title_activity_filter_show">FilterShowActivity</string>



    <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->

    <string name="cannot_load_image">Cannot load the image!</string>



    <!--  actionbar menu -->



    <!-- Text for the actionbar confirmation button [CHAR LIMIT=20] -->

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+10 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 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.filtershow.cache.ImageLoader;
@@ -145,7 +146,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
            }

        });



        mImageLoader = new ImageLoader(getApplicationContext());

        mImageLoader = new ImageLoader(this, getApplicationContext());



        LinearLayout listFilters = (LinearLayout) findViewById(R.id.listFilters);

        LinearLayout listBorders = (LinearLayout) findViewById(R.id.listBorders);
@@ -729,6 +730,14 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
            finish();

        }

    }



    public void cannotLoadImage() {

        CharSequence text = getString(R.string.cannot_load_image);

        Toast toast = Toast.makeText(this, text, Toast.LENGTH_SHORT);

        toast.show();

        finish();

    }



    // //////////////////////////////////////////////////////////////////////////////



    public float getPixelsFromDip(float value) {

src/com/android/gallery3d/filtershow/cache/ImageLoader.java

+8 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ public class ImageLoader { 
    private int mOrientation = 0;

    private HistoryAdapter mAdapter = null;



    private FilterShowActivity mActivity = null;



    private static final int ORI_NORMAL     = ExifInterface.ORIENTATION_NORMAL;

    private static final int ORI_ROTATE_90  = ExifInterface.ORIENTATION_ROTATE_90;

    private static final int ORI_ROTATE_180 = ExifInterface.ORIENTATION_ROTATE_180;
@@ -63,7 +65,8 @@ public class ImageLoader { 


    private Rect mOriginalBounds = null;



    public ImageLoader(Context context) {

    public ImageLoader(FilterShowActivity activity, Context context) {

        mActivity = activity;

        mContext = context;

        mCache = new DelayedPresetCache(this, 30);

        mHiresCache = new DelayedPresetCache(this, 2);
@@ -74,6 +77,10 @@ public class ImageLoader { 
        mOrientation = getOrientation(uri);



        mOriginalBitmapSmall = loadScaledBitmap(uri, 160);

        if (mOriginalBitmapSmall == null) {

            // Couldn't read the bitmap, let's exit

            mActivity.cannotLoadImage();

        }

        mOriginalBitmapLarge = loadScaledBitmap(uri, size);

        updateBitmaps();

    }