SnapdragonGallery: Update UI for TruePortrait effects

Make UI adjustments based on feedback from UX team
for TruePortrait effects.

CRs-Fixed: 1066553
Change-Id: If5cf78af60daf81a4abf76e8d85534322760ccc8

5 files changed, 25 insertions, 52 deletions

diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java
index 75982d851..731c07999 100644
--- a/src/com/android/gallery3d/filtershow/category/Action.java
+++ b/src/com/android/gallery3d/filtershow/category/Action.java
@@ -123,15 +123,6 @@ public class Action implements RenderingRequestCaller {
             return;
         }
 
-        if(mRepresentation.getOverlayOnly()) {
-            mImageFrame = imageFrame;
-            int w = mImageFrame.width();
-            int h = mImageFrame.height();
-            mImage = MasterImage.getImage().getBitmapCache().getBitmap(w, h, BitmapCache.ICON);
-            drawOverlay(true);
-            return;
-        }
-
         Bitmap temp = MasterImage.getImage().getTemporaryThumbnailBitmap();
         if (temp != null) {
             mImage = temp;
@@ -176,17 +167,21 @@ public class Action implements RenderingRequestCaller {
 
         float dx = (destination.getWidth() - source.getWidth() * scaleFactor) / 2.0f;
         float dy = (destination.getHeight() - source.getHeight() * scaleFactor) / 2.0f;
-        if (mImageFrame.height() > mImageFrame.width()) {
-            // if portrait
-            dy -= mTextSize;
-        }
         m.setScale(scaleFactor, scaleFactor);
         m.postTranslate(dx, dy);
         Canvas canvas = new Canvas(destination);
         canvas.drawBitmap(source, m, new Paint(Paint.FILTER_BITMAP_FLAG));
     }
 
-    private void drawOverlay(boolean scale) {
+    @Override
+    public void available(RenderingRequest request) {
+        clearBitmap();
+        mImage = request.getBitmap();
+        if (mImage == null) {
+            mImageFrame = null;
+            return;
+        }
+
         if (mRepresentation.getOverlayId() != 0 && mOverlayBitmap == null) {
             mOverlayBitmap = BitmapFactory.decodeResource(
                     mContext.getResources(),
@@ -200,21 +195,9 @@ public class Action implements RenderingRequestCaller {
             } else {
                 Canvas canvas = new Canvas(mImage);
                 canvas.drawARGB(128, 0, 0, 0);
-                drawCenteredImage(mOverlayBitmap, mImage, scale);
+                drawCenteredImage(mOverlayBitmap, mImage, false);
             }
         }
-    }
-
-    @Override
-    public void available(RenderingRequest request) {
-        clearBitmap();
-        mImage = request.getBitmap();
-        if (mImage == null) {
-            mImageFrame = null;
-            return;
-        }
-
-        drawOverlay(false);
 
         if (mAdapter != null) {
             mAdapter.notifyDataSetChanged();
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
index 7c5842f7f..75f84efd2 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorTruePortraitMask.java
@@ -193,9 +193,9 @@ public class EditorTruePortraitMask extends Editor  {
     private void showToast() {
         Toast toast;
         if(isBackgroundMode()) {
-            toast = Toast.makeText(mContext, R.string.trueportrait_edit_background_toast, Toast.LENGTH_SHORT);
+            toast = Toast.makeText(mContext, R.string.trueportrait_edit_background_toast, Toast.LENGTH_LONG);
         } else {
-            toast = Toast.makeText(mContext, R.string.trueportrait_edit_foreground_toast, Toast.LENGTH_SHORT);
+            toast = Toast.makeText(mContext, R.string.trueportrait_edit_foreground_toast, Toast.LENGTH_LONG);
         }
 
         toast.show();
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
index f070bfc30..b885dc831 100755..100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTruePortrait.java
@@ -66,7 +66,7 @@ public class ImageFilterTruePortrait extends ImageFilter {
 
     @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, int quality) {
-        if (getParameters() == null) {
+        if (getParameters() == null || quality == FilterEnvironment.QUALITY_ICON) {
             return bitmap;
         }
 
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageTruePortraitMask.java b/src/com/android/gallery3d/filtershow/imageshow/ImageTruePortraitMask.java
index 052035714..43193acab 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageTruePortraitMask.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageTruePortraitMask.java
@@ -97,21 +97,25 @@ public class ImageTruePortraitMask extends ImageShow {
 
     private void setup() {
         mMaskPaintForeground.setAntiAlias(true);
-        mMaskPaintForeground.setColor(Color.RED);
-        mMaskPaintForeground.setColorFilter(new LightingColorFilter(Color.RED, 1));
-        mMaskPaintForeground.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SCREEN));
+        mMaskPaintForeground.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
+        mMaskPaintForeground.setColorFilter(new ColorMatrixColorFilter(new float[] {
+                // Set color to GREEN
+                0,0,0,0,0,
+                0,0,0,0,191,
+                0,0,0,0,0,
+                0,0,0,.5f,0
+        }));
 
         mMaskPaintBackground.setAntiAlias(true);
-        mMaskPaintBackground.setColor(Color.GREEN);
+        mMaskPaintBackground.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
         mMaskPaintBackground.setColorFilter(new ColorMatrixColorFilter(new float[] {
-                // Set color to GREEN and inverse ALPHA channel
+                // Set color to RED and inverse ALPHA channel
                 // of original mask to get background
+                0,0,0,0,191,
                 0,0,0,0,0,
-                0,0,0,0,255,
                 0,0,0,0,0,
-                0,0,0,-1,255
+                0,0,0,-.5f,127
         }));
-        mMaskPaintBackground.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SCREEN));
 
         mMaskEditPaint.setAntiAlias(true);
         mMaskEditPaint.setStyle(Style.STROKE);
diff --git a/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java b/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
index 03972638c..16cf27d16 100644
--- a/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
+++ b/src/com/android/gallery3d/filtershow/tools/TruePortraitNativeEngine.java
@@ -183,20 +183,6 @@ public class TruePortraitNativeEngine {
         for(StrokeData sd:edits) {
             drawEdit(canvas, sd);
         }
-
-        // DEBUG
-        for(int i = 0; i<mPreviewSize.y; i++) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("[ ");
-            for(int j = 0; j<mPreviewSize.x; j++) {
-                int pixel = mUpdateBm.getPixel(j, i);
-                sb.append(Color.alpha(pixel));
-                sb.append(" ");
-            }
-            sb.append("]");
-            Log.e(TAG, sb.toString());
-        }
-        //
         return nativeUpdatePreviewMask(mUpdateBm);
     }