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

Commit 75608166 authored by nicolasroard's avatar nicolasroard
Browse files

Add back button handling 

bug:7332980

- fix crash as well.

Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
parent 6111c54d

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

+6 −0
Original line number Diff line number Diff line
@@ -712,6 +712,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
        };

    }



    @Override

    public void onBackPressed() {

        if (mPanelController.onBackPressed()) {

            finish();

        }

    }

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



    public float getPixelsFromDip(float value) {

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

+11 −1
Original line number Diff line number Diff line
@@ -229,6 +229,16 @@ public class PanelController implements OnClickListener { 
        imageShow.setPanelController(this);

    }



    public boolean onBackPressed() {

        if (mUtilityPanel == null || !mUtilityPanel.selected()) {

            return true;

        }

        mCurrentImage.resetParameter();

        showPanel(mCurrentPanel);

        mCurrentImage.select();

        return false;

    }



    public void onNewValue(int value) {

        mUtilityPanel.onNewValue(value);

    }
@@ -422,7 +432,7 @@ public class PanelController implements OnClickListener { 
            }

            case R.id.curvesButtonRGB: {

                ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);

                String ename = mCurrentImage.getContext().getString(R.string.curvesRGB);

                String ename = curves.getContext().getString(R.string.curvesRGB);

                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.setShowParameter(false);

                curves.setUseRed(true);

src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ public class ImageFilterWBalance extends ImageFilter { 
    public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {

        int w = bitmap.getWidth();

        int h = bitmap.getHeight();

        Log.v(TAG,"White Balance Call");

        nativeApplyFilter(bitmap, w, h, -1,-1);

        return bitmap;

    }