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

Commit 37d84ae6 authored by John Spurlock's avatar John Spurlock
Browse files

Render camera widget on a background thread.

Bug:7470978
Change-Id: Ieace005ac42d39ac4c146673910e6681f38e8f56
parent f70239a4
Loading
Loading
Loading
Loading
+42 −16
Original line number Diff line number Diff line
@@ -152,37 +152,62 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
    }

    public void render() {
        final Throwable[] thrown = new Throwable[1];
        final Bitmap[] offscreen = new Bitmap[1];
        try {
            int width = getRootView().getWidth();
            int height = getRootView().getHeight();
            final int width = getRootView().getWidth();
            final int height = getRootView().getHeight();
            if (mRenderedSize.x == width && mRenderedSize.y == height) {
                if (DEBUG) Log.d(TAG, String.format("already rendered at size=%sx%s",
                if (DEBUG) Log.d(TAG, String.format("Already rendered at size=%sx%s",
                        width, height));
                return;
            }
            if (width == 0 || height == 0) {
                return;
            }
            if (DEBUG) Log.d(TAG, String.format("render size=%sx%s instance=%s at %s",
                    width, height,
                    Integer.toHexString(hashCode()),
                    SystemClock.uptimeMillis()));

            Bitmap offscreen = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
            Canvas c = new Canvas(offscreen);
            final long start = SystemClock.uptimeMillis();
            offscreen[0] = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
            final Canvas c = new Canvas(offscreen[0]);
            mWidgetView.measure(
                    MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
            mWidgetView.layout(0, 0, width, height);
            mWidgetView.draw(c);
            ((ImageView)getChildAt(0)).setImageBitmap(offscreen);

            final long end = SystemClock.uptimeMillis();
            if (DEBUG) Log.d(TAG, String.format(
                    "Rendered camera widget in %sms size=%sx%s instance=%s at %s",
                    end - start,
                    width, height,
                    Integer.toHexString(hashCode()),
                    end));
            mRenderedSize.set(width, height);
        } catch (Throwable t) {
            Log.w(TAG, "Error rendering camera widget", t);
            thrown[0] = t;
        }

        mHandler.post(new Runnable() {
            @Override
            public void run() {
                if (thrown[0] == null) {
                    try {
                        ((ImageView) getChildAt(0)).setImageBitmap(offscreen[0]);
                    } catch (Throwable t) {
                        thrown[0] = t;
                    }
                }
                if (thrown[0] == null)
                    return;

                Log.w(TAG, "Error rendering camera widget", thrown[0]);
                try {
                    removeAllViews();
            View genericView = inflateGenericWidgetView(mContext);
                    final View genericView = inflateGenericWidgetView(mContext);
                    addView(genericView);
                } catch (Throwable t) {
                    Log.w(TAG, "Error inflating generic camera widget", t);
                }
            }});
    }

    private void transitionToCamera() {
@@ -332,7 +357,8 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
        if (DEBUG) Log.d(TAG, String.format("onSizeChanged new=%sx%s old=%sx%s at %s",
                w, h, oldw, oldh, SystemClock.uptimeMillis()));
        mHandler.post(mRenderRunnable);
        final Handler worker =  getWorkerHandler();
        (worker != null ? worker : mHandler).post(mRenderRunnable);
        super.onSizeChanged(w, h, oldw, oldh);
    }

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
@@ -61,6 +62,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
    private CheckLongPressHelper mLongPressHelper;
    private Animator mFrameFade;
    private boolean mIsSmall = false;
    private Handler mWorkerHandler;

    private float mBackgroundAlpha;
    private float mContentAlpha;
@@ -465,4 +467,12 @@ public class KeyguardWidgetFrame extends FrameLayout {
        // hook for subclasses
        return false;
    }

    public void setWorkerHandler(Handler workerHandler) {
        mWorkerHandler = workerHandler;
    }

    public Handler getWorkerHandler() {
        return mWorkerHandler;
    }
}
+11 −12
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit

    private KeyguardWidgetFrame mWidgetToResetAfterFadeOut;

    // Background threads to deal with persistence
    private HandlerThread mBgPersistenceWorkerThread;
    private Handler mBgPersistenceWorkerHandler;
    // Background worker thread: used here for persistence, also made available to widget frames
    private final HandlerThread mBackgroundWorkerThread;
    private final Handler mBackgroundWorkerHandler;

    public KeyguardWidgetPager(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
@@ -94,19 +94,17 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit

        Resources r = getResources();
        mCameraWidgetEnabled = r.getBoolean(R.bool.kg_enable_camera_default_widget);
        mBgPersistenceWorkerThread = new HandlerThread("KeyguardWidgetPager Persistence");
        mBgPersistenceWorkerThread.start();
        mBgPersistenceWorkerHandler = new Handler(mBgPersistenceWorkerThread.getLooper());
        mBackgroundWorkerThread = new HandlerThread("KeyguardWidgetPager Worker");
        mBackgroundWorkerThread.start();
        mBackgroundWorkerHandler = new Handler(mBackgroundWorkerThread.getLooper());
    }

    @Override
    protected void onDetachedFromWindow() {
        super.onDetachedFromWindow();

        // Clean up the persistence worker thread
        if (mBgPersistenceWorkerThread != null) {
            mBgPersistenceWorkerThread.quit();
        }
        // Clean up the worker thread
        mBackgroundWorkerThread.quit();
    }

    public void setViewStateManager(KeyguardViewStateManager viewStateManager) {
@@ -230,7 +228,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit

    public void onRemoveView(View v) {
        final int appWidgetId = ((KeyguardWidgetFrame) v).getContentAppWidgetId();
        mBgPersistenceWorkerHandler.post(new Runnable() {
        mBackgroundWorkerHandler.post(new Runnable() {
            @Override
            public void run() {
                mLockPatternUtils.removeAppWidget(appWidgetId);
@@ -245,7 +243,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
        boundByReorderablePages(true, pagesRange);
        // Subtract from the index to take into account pages before the reorderable
        // pages (e.g. the "add widget" page)
        mBgPersistenceWorkerHandler.post(new Runnable() {
        mBackgroundWorkerHandler.post(new Runnable() {
            @Override
            public void run() {
                mLockPatternUtils.addAppWidget(appWidgetId, index - pagesRange[0]);
@@ -288,6 +286,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
        ViewGroup.LayoutParams pageLp = new ViewGroup.LayoutParams(
                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
        frame.setOnLongClickListener(this);
        frame.setWorkerHandler(mBackgroundWorkerHandler);

        if (pageIndex == -1) {
            addView(frame, pageLp);