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

Commit bd141b5a authored by Chih-Chung Chang's avatar Chih-Chung Chang
Browse files

Support drawing in different orientation in Gallery. 

Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts
Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device
Bug 6313192: Swiping UX: make Gallery display in rotated mode
Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation
Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly
Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly
Bug 6401075: Able to scroll through the gallery pics while capturing video.
Bug 6405087: Filmstrip does not change with orientation

Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
parent 23a5e6f2

src/com/android/gallery3d/app/AbstractGalleryActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity 
    private GLRootView mGLRootView;

    private StateManager mStateManager;

    private GalleryActionBar mActionBar;

    private OrientationManager mOrientationManager;

    private boolean mDisableToggleStatusBar;



    private AlertDialog mAlertDialog = null;
@@ -58,6 +59,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mOrientationManager = new OrientationManager(this);

        toggleStatusBarByOrientation();

    }
@@ -103,6 +105,10 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity 
        return mGLRootView;

    }



    public OrientationManager getOrientationManager() {

        return mOrientationManager;

    }



    @Override

    public void setContentView(int resId) {

        super.setContentView(resId);
@@ -165,11 +171,13 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity 
            mGLRootView.unlockRenderThread();

        }

        mGLRootView.onResume();

        mOrientationManager.resume();

    }



    @Override

    protected void onPause() {

        super.onPause();

        mOrientationManager.pause();

        mGLRootView.onPause();

        mGLRootView.lockRenderThread();

        try {

src/com/android/gallery3d/app/AlbumPage.java

+1 −7
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.gallery3d.ui.GLCanvas; 
import com.android.gallery3d.ui.GLRoot;

import com.android.gallery3d.ui.GLView;

import com.android.gallery3d.ui.RelativePosition;

import com.android.gallery3d.ui.ScreenNailHolder;

import com.android.gallery3d.ui.SelectionManager;

import com.android.gallery3d.ui.SlotView;

import com.android.gallery3d.ui.SynchronizedHandler;
@@ -79,7 +78,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
    private static final int BIT_LOADING_SYNC = 2;



    private static final float USER_DISTANCE_METER = 0.3f;

    private static final boolean TEST_CAMERA_PREVIEW = false;



    private boolean mIsActive = false;

    private AlbumSlotRenderer mAlbumView;
@@ -210,10 +208,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
                    mMediaSetPath.toString());

            data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH,

                    item.getPath().toString());

            if (TEST_CAMERA_PREVIEW) {

                ScreenNailHolder holder = new CameraScreenNailHolder(mActivity);

                data.putParcelable(PhotoPage.KEY_SCREENNAIL_HOLDER, holder);

            }

            mActivity.getStateManager().startStateForResult(

                    PhotoPage.class, REQUEST_PHOTO, data);

        }
@@ -527,7 +521,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
            }

            case REQUEST_PHOTO: {

                if (data == null) return;

                mFocusIndex = data.getIntExtra(PhotoPage.KEY_INDEX_HINT, 0);

                mFocusIndex = data.getIntExtra(PhotoPage.KEY_RETURN_INDEX_HINT, 0);

                mSlotView.setCenterIndex(mFocusIndex);

                mSlotView.startRestoringAnimation(mFocusIndex);

                break;

src/com/android/gallery3d/ui/ScreenNailHolder.java→src/com/android/gallery3d/app/AppBridge.java

+62 −0
Original line number Diff line number Diff line
@@ -13,12 +13,16 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.gallery3d.ui;

package com.android.gallery3d.app;



import android.graphics.Rect;

import android.os.Parcel;

import android.os.Parcelable;



public abstract class ScreenNailHolder implements Parcelable {

import com.android.gallery3d.ui.ScreenNail;



// This is the bridge to connect a PhotoPage to the external environment.

public abstract class AppBridge implements Parcelable {

    public int describeContents() {

        return 0;

    }
@@ -26,6 +30,33 @@ public abstract class ScreenNailHolder implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

    }



    public abstract ScreenNail attach();

    public abstract void detach();

    //////////////////////////////////////////////////////////////////////////

    //  These are requests sent from PhotoPage to the app

    //////////////////////////////////////////////////////////////////////////



    public abstract ScreenNail attachScreenNail();

    public abstract void detachScreenNail();



    // Return true if the tap is consumed.

    public abstract boolean onSingleTapUp(int x, int y);



    // This is used to notify that the screen nail will be drawn in full screen

    // or not in next draw() call.

    public abstract void onFullScreenChanged(boolean full);



    //////////////////////////////////////////////////////////////////////////

    //  These are requests send from app to PhotoPage

    //////////////////////////////////////////////////////////////////////////



    public interface Server {

        // Set the camera frame relative to GLRootView.

        public void setCameraNaturalFrame(Rect frame);

        // Switch to the previous or next picture using the capture animation.

        // The offset is -1 to switch to the previous picture, 1 to switch to

        // the next picture.

        public boolean switchWithCaptureAnimation(int offset);

    }



    // If server is null, the services are not available.

    public abstract void setServer(Server server);

}

src/com/android/gallery3d/app/CameraScreenNail.java

deleted100644 → 0
+0 −225
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.gallery3d.app;



import android.app.Activity;

import android.graphics.SurfaceTexture;

import android.hardware.Camera;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

import android.util.Log;

import android.view.Surface;



import com.android.gallery3d.ui.GLCanvas;

import com.android.gallery3d.ui.ScreenNail;

import com.android.gallery3d.ui.ScreenNailHolder;

import com.android.gallery3d.ui.SurfaceTextureScreenNail;



// This is a ScreenNail which displays camera preview. This demos the usage of

// SurfaceTextureScreenNail. It is not intended for production use.

class CameraScreenNail extends SurfaceTextureScreenNail {

    private static final String TAG = "CameraScreenNail";

    private static final int CAMERA_ID = 0;

    private static final int PREVIEW_WIDTH = 960;

    private static final int PREVIEW_HEIGHT = 720;

    private static final int MSG_START_CAMERA = 1;

    private static final int MSG_STOP_CAMERA = 2;



    public interface Listener {

        void requestRender();

    }



    private Activity mActivity;

    private Listener mListener;

    private int mOrientation;

    private Camera mCamera;



    private HandlerThread mHandlerThread;

    private Handler mHandler;

    private volatile boolean mVisible;

    private volatile boolean mHasFrame;



    public CameraScreenNail(Activity activity, Listener listener) {

        mActivity = activity;

        mListener = listener;



        mOrientation = getCameraDisplayOrientation(mActivity, CAMERA_ID);

        if (mOrientation % 180 == 0) {

            setSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);

        } else {

            setSize(PREVIEW_HEIGHT, PREVIEW_WIDTH);

        }



        mHandlerThread = new HandlerThread("Camera");

        mHandlerThread.start();

        mHandler = new Handler(mHandlerThread.getLooper()) {

                public void handleMessage(Message message) {

                    if (message.what == MSG_START_CAMERA && mCamera == null) {

                        startCamera();

                    } else if (message.what == MSG_STOP_CAMERA && mCamera != null) {

                        stopCamera();

                    }

                }

            };

        mHandler.sendEmptyMessage(MSG_START_CAMERA);

    }



    private void startCamera() {

        try {

            acquireSurfaceTexture();

            Camera camera = Camera.open(CAMERA_ID);

            Camera.Parameters param = camera.getParameters();

            param.setPreviewSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);

            camera.setParameters(param);

            camera.setDisplayOrientation(mOrientation);

            camera.setPreviewTexture(getSurfaceTexture());

            camera.startPreview();

            synchronized (this) {

                mCamera = camera;

            }

        } catch (Throwable th) {

            Log.e(TAG, "cannot open camera", th);

        }

    }



    private void stopCamera() {

        releaseSurfaceTexture();

        mCamera.stopPreview();

        mCamera.release();

        synchronized (this) {

            mCamera = null;

            notifyAll();

        }

        mHasFrame = false;

    }



    @Override

    public void draw(GLCanvas canvas, int x, int y, int width, int height) {

        if (!mVisible) {

            mVisible = true;

            // Only send one message when mVisible makes transition from

            // false to true.

            mHandler.sendEmptyMessage(MSG_START_CAMERA);

        }



        if (mVisible && mHasFrame) {

            super.draw(canvas, x, y, width, height);

        }

    }



    @Override

    public void noDraw() {

        mVisible = false;

    }



    @Override

    public void recycle() {

        mVisible = false;

    }



    @Override

    public void onFrameAvailable(SurfaceTexture surfaceTexture) {

        mHasFrame = true;

        if (mVisible) {

            // We need to ask for re-render if the SurfaceTexture receives a new

            // frame (and we are visible).

            mListener.requestRender();

        }

    }



    public void destroy() {

        synchronized (this) {

            mHandler.sendEmptyMessage(MSG_STOP_CAMERA);



            // Wait until camera is closed.

            while (mCamera != null) {

                try {

                    wait();

                } catch (Exception ex) {

                    // ignore.

                }

            }

        }

        mHandlerThread.quit();

    }



    // The three methods below are copied from Camera.java

    private static int getCameraDisplayOrientation(

            Activity activity, int cameraId) {

        int displayRotation = getDisplayRotation(activity);

        int displayOrientation = getDisplayOrientation(

                displayRotation, cameraId);

        return displayOrientation;

    }



    private static int getDisplayRotation(Activity activity) {

        int rotation = activity.getWindowManager().getDefaultDisplay()

                .getRotation();

        switch (rotation) {

            case Surface.ROTATION_0: return 0;

            case Surface.ROTATION_90: return 90;

            case Surface.ROTATION_180: return 180;

            case Surface.ROTATION_270: return 270;

        }

        return 0;

    }



    private static int getDisplayOrientation(int degrees, int cameraId) {

        // See android.hardware.Camera.setDisplayOrientation for

        // documentation.

        Camera.CameraInfo info = new Camera.CameraInfo();

        Camera.getCameraInfo(cameraId, info);

        int result;

        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {

            result = (info.orientation + degrees) % 360;

            result = (360 - result) % 360;  // compensate the mirror

        } else {  // back-facing

            result = (info.orientation - degrees + 360) % 360;

        }

        return result;

    }

}



// This holds a CameraScreenNail, so we can pass it to a PhotoPage.

class CameraScreenNailHolder extends ScreenNailHolder

        implements CameraScreenNail.Listener {

    private static final String TAG = "CameraScreenNailHolder";

    private GalleryActivity mActivity;

    private CameraScreenNail mCameraScreenNail;



    public CameraScreenNailHolder(GalleryActivity activity) {

        mActivity = activity;

    }



    @Override

    public void requestRender() {

        mActivity.getGLRoot().requestRender();

    }



    @Override

    public ScreenNail attach() {

        mCameraScreenNail = new CameraScreenNail((Activity) mActivity, this);

        return mCameraScreenNail;

    }



    @Override

    public void detach() {

        mCameraScreenNail.destroy();

        mCameraScreenNail = null;

    }

}

src/com/android/gallery3d/app/GalleryActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ public interface GalleryActivity extends GalleryContext { 
    public StateManager getStateManager();

    public GLRoot getGLRoot();

    public GalleryActionBar getGalleryActionBar();

    public OrientationManager getOrientationManager();

}