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

Commit af65d7ba authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

parents a1db2653 dadbad39

res/values/arrays.xml

+4 −0
Original line number Diff line number Diff line
@@ -159,8 +159,10 @@ 
        <item>@string/pref_camera_picturesize_entry_5mp</item>

        <item>@string/pref_camera_picturesize_entry_5mp</item>

        <item>@string/pref_camera_picturesize_entry_5mp</item>

        <item>@string/pref_camera_picturesize_entry_4mp</item>

        <item>@string/pref_camera_picturesize_entry_3mp</item>

        <item>@string/pref_camera_picturesize_entry_2mp</item>

        <item>@string/pref_camera_picturesize_entry_2mp_wide</item>

        <item>@string/pref_camera_picturesize_entry_1_3mp</item>

        <item>@string/pref_camera_picturesize_entry_1mp</item>

        <item>@string/pref_camera_picturesize_entry_vga</item>
@@ -176,8 +178,10 @@ 
        <item>2592x1944</item>

        <item>2592x1936</item>

        <item>2560x1920</item>

        <item>2688x1520</item>

        <item>2048x1536</item>

        <item>1600x1200</item>

        <item>1920x1088</item>

        <item>1280x960</item>

        <item>1024x768</item>

        <item>640x480</item>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -678,10 +678,14 @@ 
    <string name="pref_camera_picturesize_entry_8mp">8M pixels</string>

    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_5mp">5M pixels</string>

    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>

    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_3mp">3M pixels</string>

    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_2mp">2M pixels</string>

    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>

    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->

    <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>

    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->

src/com/android/camera/PhotoModule.java

+23 −2
Original line number Diff line number Diff line
@@ -1628,6 +1628,8 @@ public class PhotoModule 
                    return; // Exiting, so no need to get the surface texture.

                }

                mUI.setSurfaceTexture(screenNail.getSurfaceTexture());

            } else {

                updatePreviewSize(screenNail);

            }

            mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation);

            Object st = mUI.getSurfaceTexture();
@@ -1649,6 +1651,21 @@ public class PhotoModule 
        }

    }



    private void updatePreviewSize(CameraScreenNail snail) {

        Size size = mParameters.getPreviewSize();

        int w = size.width;

        int h = size.height;

        if (mCameraDisplayOrientation % 180 != 0) {

            w = size.height;

            h = size.width;

        }

        if (snail.getWidth() != w || snail.getHeight() != h) {

            snail.setSize(w, h);

        }

        snail.enableAspectRatioClamping();

        mActivity.notifyScreenNailChanged();

    }



    @Override

    public void stopPreview() {

        if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
@@ -1742,10 +1759,14 @@ public class PhotoModule 
        Size original = mParameters.getPreviewSize();

        if (!original.equals(optimalSize)) {

            mParameters.setPreviewSize(optimalSize.width, optimalSize.height);



            // Zoom related settings will be changed for different preview

            // sizes, so set and read the parameters to get latest values

            if (mHandler.getLooper() == Looper.myLooper()) {

                // On UI thread only, not when camera starts up

                setupPreview();

            } else {

                mCameraDevice.setParameters(mParameters);

            }

            mParameters = mCameraDevice.getParameters();

        }

        Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);