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

Commit 8279acb9 authored by Romain Guy's avatar Romain Guy
Browse files

Improve screenshot animation performance 

Bug #5525888

Uses only 25% of the original amount of OpenGL API calls
Fillrate usage is now 1x the screen size instead of 5x

Change-Id: Icc7d2793f276fb7ce23c7f652079e54e3d4779d5
parent 3f2730c5

packages/SystemUI/res/layout/global_screenshot.xml

+5 −10
Original line number Diff line number Diff line
@@ -19,23 +19,18 @@ 
    <ImageView android:id="@+id/global_screenshot_background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#FF000000"

        android:src="@android:color/black"

        android:visibility="gone" />

    <FrameLayout

        android:id="@+id/global_screenshot_container"

    <ImageView android:id="@+id/global_screenshot"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:background="@drawable/screenshot_panel"

        android:visibility="gone">

        <ImageView android:id="@+id/global_screenshot"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:visibility="gone"

        android:adjustViewBounds="true" />

    </FrameLayout>

    <ImageView android:id="@+id/global_screenshot_flash"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#FFFFFFFF"

        android:src="@android:color/white"

        android:visibility="gone" />

</FrameLayout>

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+45 −75
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ import android.net.Uri; 
import android.os.AsyncTask;

import android.os.Environment;

import android.os.Process;

import android.os.ServiceManager;

import android.provider.MediaStore;

import android.util.DisplayMetrics;

import android.view.Display;

import android.view.IWindowManager;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.Surface;
@@ -50,9 +48,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.WindowManager;

import android.view.animation.Interpolator;

import android.widget.FrameLayout;

import android.widget.ImageView;



import com.android.systemui.R;



import java.io.File;
@@ -77,7 +73,6 @@ class SaveImageInBackgroundData { 
 */

class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Void,

        SaveImageInBackgroundData> {

    private static final String TAG = "SaveImageInBackgroundTask";

    private static final String SCREENSHOTS_DIR_NAME = "Screenshots";

    private static final String SCREENSHOT_FILE_NAME_TEMPLATE = "Screenshot_%s.png";

    private static final String SCREENSHOT_FILE_PATH_TEMPLATE = "%s/%s/%s";
@@ -85,11 +80,8 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
    private int mNotificationId;

    private NotificationManager mNotificationManager;

    private Notification.Builder mNotificationBuilder;

    private Intent mLaunchIntent;

    private String mImageDir;

    private String mImageFileName;

    private String mImageFilePath;

    private String mImageDate;

    private long mImageTime;



    // WORKAROUND: We want the same notification across screenshots that we update so that we don't
@@ -105,11 +97,11 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 


        // Prepare all the output metadata

        mImageTime = System.currentTimeMillis();

        mImageDate = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date(mImageTime));

        mImageDir = Environment.getExternalStoragePublicDirectory(

        String imageDate = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date(mImageTime));

        String imageDir = Environment.getExternalStoragePublicDirectory(

                Environment.DIRECTORY_PICTURES).getAbsolutePath();

        mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, mImageDate);

        mImageFilePath = String.format(SCREENSHOT_FILE_PATH_TEMPLATE, mImageDir,

        mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, imageDate);

        mImageFilePath = String.format(SCREENSHOT_FILE_PATH_TEMPLATE, imageDir,

                SCREENSHOTS_DIR_NAME, mImageFileName);



        // Create the large notification icon
@@ -190,7 +182,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
        }



        return params[0];

    };

    }



    @Override

    protected void onPostExecute(SaveImageInBackgroundData params) {
@@ -202,14 +194,14 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
            Resources r = params.context.getResources();



            // Create the intent to show the screenshot in gallery

            mLaunchIntent = new Intent(Intent.ACTION_VIEW);

            mLaunchIntent.setDataAndType(params.imageUri, "image/png");

            mLaunchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            Intent launchIntent = new Intent(Intent.ACTION_VIEW);

            launchIntent.setDataAndType(params.imageUri, "image/png");

            launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            mNotificationBuilder

                .setContentTitle(r.getString(R.string.screenshot_saved_title))

                .setContentText(r.getString(R.string.screenshot_saved_text))

                .setContentIntent(PendingIntent.getActivity(params.context, 0, mLaunchIntent, 0))

                .setContentIntent(PendingIntent.getActivity(params.context, 0, launchIntent, 0))

                .setWhen(System.currentTimeMillis())

                .setAutoCancel(true);
@@ -218,7 +210,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
            mNotificationManager.notify(mNotificationId, n);

        }

        params.finisher.run();

    };

    }

}



/**
@@ -228,7 +220,6 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
 *     type of gallery?

 */

class GlobalScreenshot {

    private static final String TAG = "GlobalScreenshot";

    private static final int SCREENSHOT_NOTIFICATION_ID = 789;

    private static final int SCREENSHOT_FLASH_TO_PEAK_DURATION = 130;

    private static final int SCREENSHOT_DROP_IN_DURATION = 430;
@@ -244,8 +235,6 @@ class GlobalScreenshot { 
    private static final float SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET = 0f;



    private Context mContext;

    private LayoutInflater mLayoutInflater;

    private IWindowManager mIWindowManager;

    private WindowManager mWindowManager;

    private WindowManager.LayoutParams mWindowLayoutParams;

    private NotificationManager mNotificationManager;
@@ -256,7 +245,6 @@ class GlobalScreenshot { 
    private Bitmap mScreenBitmap;

    private View mScreenshotLayout;

    private ImageView mBackgroundView;

    private FrameLayout mScreenshotContainerView;

    private ImageView mScreenshotView;

    private ImageView mScreenshotFlash;
@@ -273,14 +261,13 @@ class GlobalScreenshot { 
    public GlobalScreenshot(Context context) {

        Resources r = context.getResources();

        mContext = context;

        mLayoutInflater = (LayoutInflater)

        LayoutInflater layoutInflater = (LayoutInflater)

                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);



        // Inflate the screenshot layout

        mDisplayMatrix = new Matrix();

        mScreenshotLayout = mLayoutInflater.inflate(R.layout.global_screenshot, null);

        mScreenshotLayout = layoutInflater.inflate(R.layout.global_screenshot, null);

        mBackgroundView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_background);

        mScreenshotContainerView = (FrameLayout) mScreenshotLayout.findViewById(R.id.global_screenshot_container);

        mScreenshotView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot);

        mScreenshotFlash = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_flash);

        mScreenshotLayout.setFocusable(true);
@@ -293,8 +280,6 @@ class GlobalScreenshot { 
        });



        // Setup the window that we are going to use

        mIWindowManager = IWindowManager.Stub.asInterface(

                ServiceManager.getService(Context.WINDOW_SERVICE));

        mWindowLayoutParams = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, 0, 0,

                WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,
@@ -428,8 +413,8 @@ class GlobalScreenshot { 
        mScreenshotLayout.post(new Runnable() {

            @Override

            public void run() {

                mScreenshotContainerView.setLayerType(View.LAYER_TYPE_HARDWARE, null);

                mScreenshotContainerView.buildLayer();

                mScreenshotView.setLayerType(View.LAYER_TYPE_HARDWARE, null);

                mScreenshotView.buildLayer();

                mScreenshotAnimation.start();

            }

        });
@@ -463,20 +448,16 @@ class GlobalScreenshot { 
        anim.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                mBackgroundView.setFastAlpha(0f);

                mBackgroundView.setAlpha(0f);

                mBackgroundView.setVisibility(View.VISIBLE);

                mBackgroundView.fastInvalidate();

                mScreenshotContainerView.setFastAlpha(0f);

                mScreenshotContainerView.setFastTranslationX(0f);

                mScreenshotContainerView.setFastTranslationY(0f);

                mScreenshotContainerView.setFastScaleX(SCREENSHOT_SCALE + mBgPaddingScale);

                mScreenshotContainerView.setFastScaleY(SCREENSHOT_SCALE + mBgPaddingScale);

                mScreenshotContainerView.setVisibility(View.VISIBLE);

                mScreenshotContainerView.fastInvalidate();

                mScreenshotFlash.setFastAlpha(0f);

                mScreenshotView.setAlpha(0f);

                mScreenshotView.setTranslationX(0f);

                mScreenshotView.setTranslationY(0f);

                mScreenshotView.setScaleX(SCREENSHOT_SCALE + mBgPaddingScale);

                mScreenshotView.setScaleY(SCREENSHOT_SCALE + mBgPaddingScale);

                mScreenshotView.setVisibility(View.VISIBLE);

                mScreenshotFlash.setAlpha(0f);

                mScreenshotFlash.setVisibility(View.VISIBLE);

                mScreenshotFlash.fastInvalidate();

                mScreenshotLayout.invalidate();

            }

            @Override

            public void onAnimationEnd(android.animation.Animator animation) {
@@ -486,19 +467,15 @@ class GlobalScreenshot { 
        anim.addUpdateListener(new AnimatorUpdateListener() {

            @Override

            public void onAnimationUpdate(ValueAnimator animation) {

                float t = ((Float) animation.getAnimatedValue()).floatValue();

                float t = (Float) animation.getAnimatedValue();

                float scaleT = (SCREENSHOT_SCALE + mBgPaddingScale)

                    - (float) scaleInterpolator.getInterpolation(t)

                    - scaleInterpolator.getInterpolation(t)

                        * (SCREENSHOT_SCALE - SCREENSHOT_DROP_IN_MIN_SCALE);

                mBackgroundView.setFastAlpha(scaleInterpolator.getInterpolation(t) * BACKGROUND_ALPHA);

                mBackgroundView.fastInvalidate();

                mScreenshotContainerView.setFastAlpha(t);

                mScreenshotContainerView.setFastScaleX(scaleT);

                mScreenshotContainerView.setFastScaleY(scaleT);

                mScreenshotContainerView.fastInvalidate();

                mScreenshotFlash.setFastAlpha(flashAlphaInterpolator.getInterpolation(t));

                mScreenshotFlash.fastInvalidate();

                mScreenshotLayout.invalidate();

                mBackgroundView.setAlpha(scaleInterpolator.getInterpolation(t) * BACKGROUND_ALPHA);

                mScreenshotView.setAlpha(t);

                mScreenshotView.setScaleX(scaleT);

                mScreenshotView.setScaleY(scaleT);

                mScreenshotFlash.setAlpha(flashAlphaInterpolator.getInterpolation(t));

            }

        });

        return anim;
@@ -511,8 +488,8 @@ class GlobalScreenshot { 
            @Override

            public void onAnimationEnd(Animator animation) {

                mBackgroundView.setVisibility(View.GONE);

                mScreenshotContainerView.setVisibility(View.GONE);

                mScreenshotContainerView.setLayerType(View.LAYER_TYPE_NONE, null);

                mScreenshotView.setVisibility(View.GONE);

                mScreenshotView.setLayerType(View.LAYER_TYPE_NONE, null);

            }

        });
@@ -522,17 +499,13 @@ class GlobalScreenshot { 
            anim.addUpdateListener(new AnimatorUpdateListener() {

                @Override

                public void onAnimationUpdate(ValueAnimator animation) {

                    float t = ((Float) animation.getAnimatedValue()).floatValue();

                    float t = (Float) animation.getAnimatedValue();

                    float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)

                            - (float) t * (SCREENSHOT_DROP_IN_MIN_SCALE

                                    - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);

                    mBackgroundView.setFastAlpha((1f - t) * BACKGROUND_ALPHA);

                    mBackgroundView.fastInvalidate();

                    mScreenshotContainerView.setFastAlpha(1f - t);

                    mScreenshotContainerView.setFastScaleX(scaleT);

                    mScreenshotContainerView.setFastScaleY(scaleT);

                    mScreenshotContainerView.fastInvalidate();

                    mScreenshotLayout.invalidate();

                            - t * (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);

                    mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);

                    mScreenshotView.setAlpha(1f - t);

                    mScreenshotView.setScaleX(scaleT);

                    mScreenshotView.setScaleY(scaleT);

                }

            });

        } else {
@@ -563,19 +536,16 @@ class GlobalScreenshot { 
            anim.addUpdateListener(new AnimatorUpdateListener() {

                @Override

                public void onAnimationUpdate(ValueAnimator animation) {

                    float t = ((Float) animation.getAnimatedValue()).floatValue();

                    float t = (Float) animation.getAnimatedValue();

                    float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)

                        - (float) scaleInterpolator.getInterpolation(t)

                        - scaleInterpolator.getInterpolation(t)

                            * (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_DROP_OUT_MIN_SCALE);

                    mBackgroundView.setFastAlpha((1f - t) * BACKGROUND_ALPHA);

                    mBackgroundView.fastInvalidate();

                    mScreenshotContainerView.setFastAlpha(1f - scaleInterpolator.getInterpolation(t));

                    mScreenshotContainerView.setFastScaleX(scaleT);

                    mScreenshotContainerView.setFastScaleY(scaleT);

                    mScreenshotContainerView.setFastTranslationX(t * finalPos.x);

                    mScreenshotContainerView.setFastTranslationY(t * finalPos.y);

                    mScreenshotContainerView.fastInvalidate();

                    mScreenshotLayout.invalidate();

                    mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);

                    mScreenshotView.setAlpha(1f - scaleInterpolator.getInterpolation(t));

                    mScreenshotView.setScaleX(scaleT);

                    mScreenshotView.setScaleY(scaleT);

                    mScreenshotView.setTranslationX(t * finalPos.x);

                    mScreenshotView.setTranslationY(t * finalPos.y);

                }

            });

        }