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

Commit 01a4beb1 authored by nicolasroard's avatar nicolasroard
Browse files

Fix history original image 

Change 1st and 2nd panel background color

Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
parent 948a4e6e

res/drawable/filtershow_state_button_background

0 → 100644
+0 −0

Empty file added.

res/layout/filtershow_activity.xml

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
                android:id="@+id/fxList"

                android:layout_width="match_parent"

                android:layout_height="@dimen/thumbnail_size"

                android:background="@color/background_main_toolbar"

                android:scrollbars="none" >



                <LinearLayout
@@ -116,6 +117,7 @@ 
                android:id="@+id/bordersList"

                android:layout_width="match_parent"

                android:layout_height="@dimen/thumbnail_size"

                android:background="@color/background_main_toolbar"

                android:visibility="gone"

                android:scrollbars="none" >

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

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
            }

            pipeline.turnOnPipeline(true);

            MasterImage.getImage().setOriginalGeometry(largeBitmap);

            MasterImage.getImage().getHistory().setOriginalBitmap(mImageLoader.getOriginalBitmapSmall());

            mLoadBitmapTask = null;



            if (mAction == CROP_ACTION) {

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

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> { 
    private MenuItem mRedoMenuItem = null;

    private MenuItem mResetMenuItem = null;



    private Bitmap mOriginalBitmap = null;



    public HistoryAdapter(Context context, int resource, int textViewResourceId) {

        super(context, resource, textViewResourceId);

        FilterShowActivity activity = (FilterShowActivity) context;
@@ -199,6 +201,9 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> { 
            }

            ImageView preview = (ImageView) view.findViewById(R.id.preview);

            Bitmap bmp = item.getPreviewImage();

            if (position == getCount()-1 && mOriginalBitmap != null) {

                bmp = mOriginalBitmap;

            }

            if (bmp != null) {

                preview.setImageBitmap(bmp);

            } else {
@@ -214,4 +219,8 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> { 
        return view;

    }





    public void setOriginalBitmap(Bitmap originalBitmap) {

        mOriginalBitmap = originalBitmap;

    }

}