Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05b536e6 authored by Santosh Madhava's avatar Santosh Madhava Committed by Android Git Automerger
Browse files

am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 

* commit 'c4f5b712':
  Fix for issue 3370007 Overlay transparency in Java
parents 4d7b1063 c4f5b712

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+0 −1
Original line number Diff line number Diff line
@@ -2105,7 +2105,6 @@ class MediaArtistNativeHelper { 
                //For image get the scaled height. Aspect ratio would remain the same

                mediaItemHeight = ((MediaImageItem)overlay.getMediaItem()).getScaledHeight();

                aspectRatio = overlay.getMediaItem().getAspectRatio();

                effectSettings.framingResize = false; //since the image can be of odd size.

            }

        } else {

            aspectRatio = overlay.getMediaItem().getAspectRatio();

media/java/android/media/videoeditor/OverlayFrame.java

+5 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class OverlayFrame extends Overlay { 
         mOFWidth = width;

     }

    /**

     * Delete the overlay file

     * Delete the overlay files

     */

    void invalidate() {

        if (mFilename != null) {
@@ -244,5 +244,9 @@ public class OverlayFrame extends Overlay { 
            mBitmap.recycle();

            mBitmap = null;

        }

        if (mBitmapFileName != null) {

            new File(mBitmapFileName).delete();

            mBitmapFileName = null;

        }

    }

}