diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-11 22:38:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 22:38:34 -0700 |
| commit | dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d (patch) | |
| tree | 4e42661e7d39fd1cf28c0c9fc7e645cd2a6d5190 | |
| parent | e541b11c637d84d44943ee89ab4a0da9f3061ab7 (diff) | |
| parent | 9c53ef91923931f0d8d079760777e6f4507ae48f (diff) | |
| download | android_packages_apps_Snap-dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d.tar.gz android_packages_apps_Snap-dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d.tar.bz2 android_packages_apps_Snap-dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d.zip | |
am 6111c54d: Fix UI
* commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9':
Fix UI
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 12 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index f13cdd497..918eb5b9c 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -131,12 +131,12 @@ public class PanelController implements OnClickListener { public void setEffectName(String effectName) { mEffectName = effectName; - showParameter(true); - updateText(); + setShowParameter(true); } - public void showParameter(boolean s) { + public void setShowParameter(boolean s) { mShowParameterValue = s; + updateText(); } public void updateText() { @@ -234,7 +234,7 @@ public class PanelController implements OnClickListener { } public void showParameter(boolean s) { - mUtilityPanel.showParameter(s); + mUtilityPanel.setShowParameter(s); } public void setCurrentPanel(View panel) { @@ -410,7 +410,7 @@ public class PanelController implements OnClickListener { mCurrentImage = showImageView(R.id.imageFlip); String ename = mCurrentImage.getContext().getString(R.string.flip); mUtilityPanel.setEffectName(ename); - mUtilityPanel.showParameter(false); + mUtilityPanel.setShowParameter(false); break; } case R.id.vignetteButton: { @@ -424,6 +424,7 @@ public class PanelController implements OnClickListener { ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves); String ename = mCurrentImage.getContext().getString(R.string.curvesRGB); mUtilityPanel.setEffectName(ename); + mUtilityPanel.setShowParameter(false); curves.setUseRed(true); curves.setUseGreen(true); curves.setUseBlue(true); @@ -456,6 +457,7 @@ public class PanelController implements OnClickListener { mCurrentImage = showImageView(R.id.imageShow).setShowControls(false); String ename = mCurrentImage.getContext().getString(R.string.wbalance); mUtilityPanel.setEffectName(ename); + mUtilityPanel.setShowParameter(false); ensureFilter("WBalance"); break; } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java index d0c67f783..90986f912 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java @@ -18,7 +18,7 @@ public class ImageSmallBorder extends ImageSmallFilter { protected final int mSelectedBackgroundColor = Color.WHITE; protected final int mInnerBorderColor = Color.BLACK; protected final int mInnerBorderWidth = 2; - protected final float mImageScaleFactor = 2.5f; + protected final float mImageScaleFactor = 3.5f; public ImageSmallBorder(Context context) { super(context); |