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

Commit 1f60d9cd authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix camera preview being squished" into gb-ub-photos-bryce

parents 41185c4f dfde1ea8

src/com/android/camera/PhotoModule.java

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ public class PhotoModule 
        if (mFocusManager != null) mFocusManager.setPreviewSize(width, height);

        ((CameraScreenNail) mActivity.mCameraScreenNail).setPreviewFrameLayoutSize(

                previewWidth, previewHeight);

        mActivity.notifyScreenNailChanged();

    }



    private void resetExposureCompensation() {

src/com/android/camera/PhotoUI.java

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ public class PhotoUI implements PieListener, 
            }

        }



        mRootView.addOnLayoutChangeListener(mLayoutListener);

    }



    public View getRootView() {
@@ -259,6 +258,7 @@ public class PhotoUI implements PieListener, 
        mShutterButton.setImageResource(R.drawable.btn_new_shutter);

        mShutterButton.setOnShutterButtonListener(mController);

        mShutterButton.setVisibility(View.VISIBLE);

        mRootView.addOnLayoutChangeListener(mLayoutListener);

    }



    // called from onResume every other time
@@ -270,6 +270,7 @@ public class PhotoUI implements PieListener, 
        if (mMenu != null) {

            mMenu.reloadPreferences();

        }

        mRootView.addOnLayoutChangeListener(mLayoutListener);

    }



    public void initializeZoom(Camera.Parameters params) {