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

Commit acd4e6de authored by Mihai Popa's avatar Mihai Popa Committed by Android (Google) Code Review
Browse files

Merge changes from topic "magnifier_sync_movement" 

* changes:
  [Magnifier-24] Add completion callback TestApi
  [Magnifier-21] Rate-limit drawings to renderer
  [Magnifier-20] Raw Surface instead of PopupWindow
parents 33824439 2ba5d8e8

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,11 @@ package android.widget { 
    method public android.graphics.Bitmap getContent();

    method public static android.graphics.PointF getMagnifierDefaultSize();

    method public android.graphics.Rect getWindowPositionOnScreen();

    method public void setOnOperationCompleteCallback(android.widget.Magnifier.Callback);

  }



  public static abstract interface Magnifier.Callback {

    method public abstract void onOperationComplete();

  }



  public class NumberPicker extends android.widget.LinearLayout {

core/java/android/view/ThreadedRenderer.java

+104 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Trace; 
import android.util.Log;

import android.view.Surface.OutOfResourcesException;

import android.view.View.AttachInfo;

import android.view.animation.AnimationUtils;



import com.android.internal.R;

import com.android.internal.util.VirtualRefBasePtr;
@@ -943,6 +944,109 @@ public final class ThreadedRenderer { 
        }

    }



    /**

     * Basic synchronous renderer. Currently only used to render the Magnifier, so use with care.

     * TODO: deduplicate against ThreadedRenderer.

     *

     * @hide

     */

    public static class SimpleRenderer {

        private final RenderNode mRootNode;

        private long mNativeProxy;

        private final float mLightY, mLightZ;

        private Surface mSurface;

        private final FrameInfo mFrameInfo = new FrameInfo();



        public SimpleRenderer(final Context context, final String name, final Surface surface) {

            final TypedArray a = context.obtainStyledAttributes(null, R.styleable.Lighting, 0, 0);

            mLightY = a.getDimension(R.styleable.Lighting_lightY, 0);

            mLightZ = a.getDimension(R.styleable.Lighting_lightZ, 0);

            final float lightRadius = a.getDimension(R.styleable.Lighting_lightRadius, 0);

            final int ambientShadowAlpha =

                    (int) (255 * a.getFloat(R.styleable.Lighting_ambientShadowAlpha, 0) + 0.5f);

            final int spotShadowAlpha =

                    (int) (255 * a.getFloat(R.styleable.Lighting_spotShadowAlpha, 0) + 0.5f);

            a.recycle();



            final long rootNodePtr = nCreateRootRenderNode();

            mRootNode = RenderNode.adopt(rootNodePtr);

            mRootNode.setClipToBounds(false);

            mNativeProxy = nCreateProxy(true /* translucent */, rootNodePtr);

            nSetName(mNativeProxy, name);



            ProcessInitializer.sInstance.init(context, mNativeProxy);

            nLoadSystemProperties(mNativeProxy);



            nSetup(mNativeProxy, lightRadius, ambientShadowAlpha, spotShadowAlpha);



            mSurface = surface;

            nUpdateSurface(mNativeProxy, surface);

        }



        /**

         * Set the light center.

         */

        public void setLightCenter(final Display display,

                final int windowLeft, final int windowTop) {

            // Adjust light position for window offsets.

            final Point displaySize = new Point();

            display.getRealSize(displaySize);

            final float lightX = displaySize.x / 2f - windowLeft;

            final float lightY = mLightY - windowTop;



            nSetLightCenter(mNativeProxy, lightX, lightY, mLightZ);

        }



        public RenderNode getRootNode() {

            return mRootNode;

        }



        /**

         * Draw the surface.

         */

        public void draw(final FrameDrawingCallback callback) {

            final long vsync = AnimationUtils.currentAnimationTimeMillis() * 1000000L;

            mFrameInfo.setVsync(vsync, vsync);

            mFrameInfo.addFlags(1 << 2 /* VSYNC */);

            // TODO: remove this fence

            nFence(mNativeProxy);

            if (callback != null) {

                callback.onFrameDraw(mSurface.getNextFrameNumber());

            }

            nSyncAndDrawFrame(mNativeProxy, mFrameInfo.mFrameInfo, mFrameInfo.mFrameInfo.length);

        }



        /**

         * Destroy the renderer.

         */

        public void destroy() {

            mSurface = null;

            nDestroy(mNativeProxy, mRootNode.mNativeRenderNode);

        }



        @Override

        protected void finalize() throws Throwable {

            try {

                nDeleteProxy(mNativeProxy);

                mNativeProxy = 0;

            } finally {

                super.finalize();

            }

        }

    }



    /**

     * Interface used to receive callbacks when a frame is being drawn.

     */

    public interface FrameDrawingCallback {

        /**

         * Invoked during a frame drawing.

         *

         * @param frame The id of the frame being drawn.

         */

        void onFrameDraw(long frame);

    }



    private static class ProcessInitializer {

        static ProcessInitializer sInstance = new ProcessInitializer();

core/java/android/widget/Magnifier.java

+381 −71

File changed.

Preview size limit exceeded, changes collapsed.