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

Commit 2576a29c authored by Sascha Haeberling's avatar Sascha Haeberling
Browse files

First cut at a skeleton for the TinyPlanets filter. 

 Bug: 7344426

This is not hooking up the real algorithm yet, but unblocks Doris so she
can add the button while we rewrite the algorithm.

Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
parent 08e6b865

res/layout/filtershow_activity.xml

+5 −0
Original line number Diff line number Diff line
@@ -317,6 +317,11 @@ 
                    android:layout_height="wrap_content"

                    android:layout_marginLeft="@dimen/thumbnail_margin"

                    android:orientation="horizontal" >

                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle

                        android:id="@+id/tinyplanetButton"

                        style="@style/FilterShowBottomButton"

                        android:src="@drawable/filtershow_button_colors_contrast"

                        android:text="@string/tinyplanet" />



                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle

                        android:id="@+id/wbalanceButton"

res/values/filtershow_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
    <string name="aspectNone_effect">None</string>

    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->

    <string name="aspectOriginal_effect">Original</string>

    <!--  Label for the tuny planet effect [CHAR LIMIT=10] -->

    <string name="tinyplanet">Tiny Planet</string>



    <!--  Filters buttons -->

src/com/android/gallery3d/app/PhotoPage.java

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import com.android.gallery3d.data.SnailItem; 
import com.android.gallery3d.data.SnailSource;

import com.android.gallery3d.filtershow.FilterShowActivity;

import com.android.gallery3d.picasasource.PicasaSource;

import com.android.gallery3d.ui.AnimationTime;

import com.android.gallery3d.ui.DetailsHelper;

import com.android.gallery3d.ui.DetailsHelper.CloseListener;

import com.android.gallery3d.ui.DetailsHelper.DetailsSource;
@@ -73,7 +72,6 @@ import com.android.gallery3d.ui.PhotoFallbackEffect; 
import com.android.gallery3d.ui.PhotoView;

import com.android.gallery3d.ui.SelectionManager;

import com.android.gallery3d.ui.SynchronizedHandler;

import com.android.gallery3d.ui.TiledScreenNail;

import com.android.gallery3d.util.GalleryUtils;



public class PhotoPage extends ActivityState implements

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

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterParametricBorder; 
import com.android.gallery3d.filtershow.filters.ImageFilterRS;

import com.android.gallery3d.filtershow.filters.ImageFilterSaturated;

import com.android.gallery3d.filtershow.filters.ImageFilterShadows;

import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;

import com.android.gallery3d.filtershow.filters.ImageFilterVibrance;

import com.android.gallery3d.filtershow.filters.ImageFilterVignette;

import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;
@@ -229,16 +230,19 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
        mPanelController.addPanel(mColorsButton, mListColors, 3);



        int[] recastIDs = {

                R.id.tinyplanetButton,

                R.id.vignetteButton,

                R.id.vibranceButton,

                R.id.contrastButton,

                R.id.saturationButton,

                R.id.shadowRecoveryButton,

                R.id.wbalanceButton,

                R.id.hueButton,

                R.id.exposureButton,

                R.id.shadowRecoveryButton

        };

        ImageFilter[] filters = {

                new ImageFilterTinyPlanet(),

                new ImageFilterVignette(),

                new ImageFilterVibrance(),

                new ImageFilterContrast(),
@@ -304,6 +308,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
            listColors.addView(fView, pos);

        }



        mPanelController.addComponent(mColorsButton, findViewById(R.id.tinyplanetButton));

        mPanelController.addComponent(mColorsButton, findViewById(R.id.curvesButtonRGB));

        mPanelController.addComponent(mColorsButton, findViewById(R.id.sharpenButton));

        mPanelController.addComponent(mColorsButton, findViewById(R.id.vibranceButton));

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

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterRedEye; 
import com.android.gallery3d.filtershow.filters.ImageFilterSaturated;

import com.android.gallery3d.filtershow.filters.ImageFilterShadows;

import com.android.gallery3d.filtershow.filters.ImageFilterSharpen;

import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;

import com.android.gallery3d.filtershow.filters.ImageFilterVibrance;

import com.android.gallery3d.filtershow.filters.ImageFilterVignette;

import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;
@@ -435,6 +436,10 @@ public class PanelController implements OnClickListener { 
    public void ensureFilter(String name) {

        ImagePreset preset = getImagePreset();

        ImageFilter filter = preset.getFilter(name);

        if (filter == null && name.equalsIgnoreCase(

                mCurrentImage.getContext().getString(R.string.tinyplanet))) {

            filter = setImagePreset(new ImageFilterTinyPlanet(), name);

        }

        if (filter == null

                && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.vignette))) {

            filter = setImagePreset(new ImageFilterVignette(), name);
@@ -501,6 +506,13 @@ public class PanelController implements OnClickListener { 
        }

        mUtilityPanel.hideAspectButtons();

        switch (view.getId()) {

            case R.id.tinyplanetButton: {

                mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);

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

                mUtilityPanel.setEffectName(ename);

                ensureFilter(ename);

                break;

            }

            case R.id.straightenButton: {

                mCurrentImage = showImageView(R.id.imageStraighten);

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