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

Commit b22b852c authored by Michael Kolb's avatar Michael Kolb
Browse files

New capture animation 

  Bug: 8253060

Match new UX design for capture animation
Custom layout for camera controls

Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
parent 31a50d72

res/values-land/dimensions.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ 
<resources>

    <!-- for manage cache bar -->

    <dimen name="manage_cache_bottom_height">39dp</dimen>

    <dimen name="capture_margin_top">8dip</dimen>

</resources>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -97,4 +97,7 @@ 
    <dimen name="size_preview">600dip</dimen>

    <dimen name="navigation_bar_height">48dip</dimen>

    <dimen name="navigation_bar_width">42dip</dimen>

    <dimen name="capture_size">48dip</dimen>

    <dimen name="capture_margin_right">16dip</dimen>

    <dimen name="capture_margin_top">16dip</dimen>

</resources>

src/com/android/camera/ActivityBase.java

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ public abstract class ActivityBase extends AbstractGalleryActivity 
        public ScreenNail attachScreenNail() {

            if (mCameraScreenNail == null) {

                if (ApiHelper.HAS_SURFACE_TEXTURE) {

                    mCameraScreenNail = new CameraScreenNail(this);

                    mCameraScreenNail = new CameraScreenNail(this, getResources());

                } else {

                    Bitmap b = BitmapFactory.decodeResource(getResources(),

                            R.drawable.wallpaper_picker_preview);

src/com/android/camera/CameraActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -31,17 +31,14 @@ import android.os.IBinder; 
import android.provider.MediaStore;

import android.provider.Settings;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.OrientationEventListener;

import android.view.View;

import android.view.ViewGroup;

import android.view.Window;

import android.view.WindowManager;

import android.widget.FrameLayout;



import com.android.camera.ui.CameraSwitcher;

import com.android.camera.ui.RotatableLayout;

import com.android.gallery3d.R;

import com.android.gallery3d.app.PhotoPage;

import com.android.gallery3d.common.ApiHelper;

src/com/android/camera/CameraScreenNail.java

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.camera;



import android.annotation.TargetApi;

import android.content.res.Resources;

import android.graphics.SurfaceTexture;

import android.opengl.Matrix;

import android.util.Log;
@@ -111,8 +112,9 @@ public class CameraScreenNail extends SurfaceTextureScreenNail { 
        boolean requiresSurfaceTexture();

    }



    public CameraScreenNail(Listener listener) {

    public CameraScreenNail(Listener listener, Resources res) {

        mListener = listener;

        mCaptureAnimManager.setResources(res);

    }



    public void setFullScreen(boolean full) {
@@ -386,7 +388,8 @@ public class CameraScreenNail extends SurfaceTextureScreenNail { 
                        // Skip the animation if no longer in full screen mode

                        drawn = false;

                    } else {

                        drawn = mCaptureAnimManager.drawAnimation(canvas, this, mAnimTexture);

                        drawn = mCaptureAnimManager.drawAnimation(canvas, this, mAnimTexture,

                                x, y, width, height);

                    }

                } else {

                    drawn = mSwitchAnimManager.drawAnimation(canvas, x, y,