diff options
author | Nicolas Roard <nicolasroard@google.com> | 2012-10-26 18:14:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-26 18:14:48 -0700 |
commit | 1fb466467dc28bccd0613e868ea309800127115c (patch) | |
tree | 32e469028bb238be3aed1ba850359ee421269925 | |
parent | 64c89d738dae9b6b05b116861c40cf36fada477c (diff) | |
parent | e3a16c0f6f6f24681a5b5d7fe4cd923ca0731463 (diff) | |
download | android_packages_apps_Snap-1fb466467dc28bccd0613e868ea309800127115c.tar.gz android_packages_apps_Snap-1fb466467dc28bccd0613e868ea309800127115c.tar.bz2 android_packages_apps_Snap-1fb466467dc28bccd0613e868ea309800127115c.zip |
am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
* commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c':
change thumbnail and reset behaviour
-rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 30 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java | 24 |
2 files changed, 43 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 02acaeab1..1ed45eda2 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -145,6 +145,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, private static final int SEEK_BAR_MAX = 600; private LoadBitmapTask mLoadBitmapTask; + private ImageSmallFilter mNullFxFilter; + private ImageSmallFilter mNullBorderFilter; @Override public void onCreate(Bundle savedInstanceState) { @@ -663,17 +665,17 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, ImagePreset preset = new ImagePreset(getString(R.string.history_original)); // empty preset.setImageLoader(mImageLoader); - ImageSmallFilter filter = new ImageSmallFilter(this); + mNullFxFilter = new ImageSmallFilter(this); - filter.setSelected(true); - mCurrentImageSmallFilter = filter; + mNullFxFilter.setSelected(true); + mCurrentImageSmallFilter = mNullFxFilter; - filter.setImageFilter(new ImageFilterFx(null, getString(R.string.none))); + mNullFxFilter.setImageFilter(new ImageFilterFx(null, getString(R.string.none))); - filter.setController(this); - filter.setImageLoader(mImageLoader); - listFilters.addView(filter); - ImageSmallFilter previousFilter = filter; + mNullFxFilter.setController(this); + mNullFxFilter.setImageLoader(mImageLoader); + listFilters.addView(mNullFxFilter); + ImageSmallFilter previousFilter = mNullFxFilter; BitmapFactory.Options o = new BitmapFactory.Options(); o.inScaled = false; @@ -682,11 +684,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, Bitmap b = BitmapFactory.decodeResource(getResources(), drawid[i], o); fxArray[p++] = new ImageFilterFx(b, getString(fxNameid[i])); } - + ImageSmallFilter filter; for (int i = 0; i < p; i++) { filter = new ImageSmallFilter(this); filter.setImageFilter(fxArray[i]); filter.setController(this); + filter.setNulfilter(mNullFxFilter); filter.setImageLoader(mImageLoader); listFilters.addView(filter); previousFilter = filter; @@ -717,6 +720,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, ImageSmallFilter previousFilter = null; for (int i = 0; i < p; i++) { ImageSmallBorder filter = new ImageSmallBorder(this); + if (i == 0) { // save the first to reset it + mNullBorderFilter = filter; + } else { + filter.setNulfilter(mNullBorderFilter); + } borders[i].setName(getString(R.string.borders)); filter.setImageFilter(borders[i]); filter.setController(this); @@ -852,6 +860,9 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, } private void resetHistory() { + mNullFxFilter.onClick(mNullFxFilter); + mNullBorderFilter.onClick(mNullBorderFilter); + HistoryAdapter adapter = mImageShow.getHistory(); adapter.reset(); ImagePreset original = new ImagePreset(adapter.getItem(0)); @@ -865,6 +876,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, return new View.OnClickListener() { @Override public void onClick(View v) { + resetHistory(); } }; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java index 71a69c3f8..6a79e18a1 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java @@ -45,6 +45,7 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener protected static int mBackgroundColor = Color.BLUE; protected final int mSelectedBackgroundColor = Color.WHITE; protected final int mTextColor = Color.WHITE; + private ImageSmallFilter mNullFilter; public static void setMargin(int value) { mMargin = value; @@ -100,13 +101,32 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener setMeasuredDimension(parentHeight - h, parentHeight); } + /** + * Setting the nullFilter implies that the behavior of the button is toggle + * + * @param nullFilter + */ + public void setNulfilter(ImageSmallFilter nullFilter) { + mNullFilter = nullFilter; + } + @Override public void onClick(View v) { if (mController != null) { if (mImageFilter != null) { - mController.useImageFilter(this, mImageFilter, mSetBorder); + if (mIsSelected && mNullFilter != null) { + mNullFilter.onClick(v); + } + else { + mController.useImageFilter(this, mImageFilter, mSetBorder); + } } else if (mImagePreset != null) { - mController.useImagePreset(this, mImagePreset); + if (mIsSelected && mNullFilter != null) { + mNullFilter.onClick(v); + } + else { + mController.useImagePreset(this, mImagePreset); + } } } } |