Fix UI

bug:7328726

- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons

Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7

4 files changed, 14 insertions, 6 deletions

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 0e157328d..fd1fb9171 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -360,6 +360,11 @@
             </HorizontalScrollView>
         </FrameLayout>
 
+        <View
+            android:background="@color/toolbar_separation_line"
+            android:layout_height="1dip"
+            android:layout_width="match_parent" />
+
         <com.android.gallery3d.filtershow.CenteredLinearLayout
               xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
               android:id="@+id/mainPanel"
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index 2d097edaf..b8a18222f 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -21,4 +21,5 @@
     <color name="text_toolbar">#FFFFFF</color>
     <color name="background_toolbar">#363949</color>
     <color name="background_main_toolbar">#1e2028</color>
+    <color name="toolbar_separation_line">#333333</color>
 </resources>
\ No newline at end of file
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);