diff options
author | Bart Sears <bsears@google.com> | 2012-12-18 12:58:15 -0800 |
---|---|---|
committer | Bart Sears <bsears@google.com> | 2012-12-18 12:58:15 -0800 |
commit | 97cb71043e8dc15948c7dc663504966ff988c4d1 (patch) | |
tree | 809e319f07846567e26fa487723c5ee230c0f819 /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
parent | 04359d5ddb1c69da3671ca285553d51b846c4fe2 (diff) | |
parent | 2b5021d525229c759f0b57b8a607520d081a3084 (diff) | |
download | android_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.tar.gz android_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.tar.bz2 android_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.zip |
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce
Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 079e5b18c..4198da020 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -254,6 +254,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mGeometryButton = (ImageButton) findViewById(R.id.geometryButton); mColorsButton = (ImageButton) findViewById(R.id.colorsButton); + mBottomPanelButtons.add(mFxButton); + mBottomPanelButtons.add(mBorderButton); + mBottomPanelButtons.add(mGeometryButton); + mBottomPanelButtons.add(mColorsButton); + mImageShow.setImageLoader(mImageLoader); mImageCurves.setImageLoader(mImageLoader); mImageCurves.setMaster(mImageShow); @@ -823,6 +828,22 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, } } + public void disableFilterButtons() { + for (ImageButton b : mBottomPanelButtons) { + b.setEnabled(false); + b.setClickable(false); + b.setAlpha(0.4f); + } + } + + public void enableFilterButtons() { + for (ImageButton b : mBottomPanelButtons) { + b.setEnabled(true); + b.setClickable(true); + b.setAlpha(1.0f); + } + } + // ////////////////////////////////////////////////////////////////////////////// // imageState panel... @@ -904,7 +925,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, invalidateOptionsMenu(); } - private void resetHistory() { + void resetHistory() { mNullFxFilter.onClick(mNullFxFilter); mNullBorderFilter.onClick(mNullBorderFilter); |