Camera 增加1:1拍照

---- vendor/mediatek/proprietary/packages/apps/Camera/res/values/arrays.xml ---- index 80c4b3a..ab8528f 100755 @@ -406,6 +406,9 @@          <item>@string/pref_camera_picturesize_entry_1280x960</item>          <item>@string/pref_camera_picturesize_entry_2048x1536</item>          <item>@string/pref_camera_picturesize_entry_2592x1936</item> +        <!-- 1:1 --> +        <item>@string/pref_camera_picturesize_entry_1280x768</item> +        <item>@string/pref_camera_picturesize_entry_3328x1872</item>      </string-array>        <!-- When launching the camera app first time, we will set the picture @@ -461,6 +464,9 @@          <item>1440x960</item>          <item>2048x1360</item>          <item>2560x1712</item> +        <!-- 1:1 --> +        <item>960x960</item> +        <item>2448x2448</item>      </string-array>        <string-array name="pref_camera_picturesize_ratio_entries" translatable="false"> @@ -468,12 +474,14 @@          <item>@string/pref_camera_picturesize_ratio_entry_5_3</item>          <item>@string/pref_camera_picturesize_ratio_entry_3_2</item>          <item>@string/pref_camera_picturesize_ratio_entry_4_3</item> +        <item>@string/pref_camera_picturesize_ratio_entry_1_1</item>      </string-array>      <string-array name="pref_camera_picturesize_ratio_entryvalues" translatable="false">          <item>1.7778</item>          <item>1.6667</item>          <item>1.5</item>          <item>1.3333</item> +        <item>1</item>      </string-array>        <!-- Default focus mode setting.--> --- vendor/mediatek/proprietary/packages/apps/Camera/res/values/strings.xml --- index 59bdb96..0869eba 100755 @@ -201,6 +201,7 @@      <string name="pref_camera_picturesize_ratio_entry_5_3" translatable="false">@string/pref_camera_picturesize_ratio_entry_16_9</string>      <string name="pref_camera_picturesize_ratio_entry_3_2" translatable="false">@string/pref_camera_picturesize_ratio_entry_16_9</string>      <string name="pref_camera_picturesize_ratio_entry_4_3">Standard (4:3)</string> +    <string name="pref_camera_picturesize_ratio_entry_1_1">Square (1:1)</string>      <!-- ISO -->      <string name="pref_camera_iso_title" translatable="false">ISO</string>      <string name="pref_camera_iso_default" translatable="false">auto</string>  vendor/mediatek/proprietary/packages/apps/Camera/src/com/mediatek/camera/setting/SettingDataBase.java  index 7d5336f..e2bec4e 100755 @@ -386,6 +386,7 @@ public class SettingDataBase {      private static final String PICTURE_RATIO_5_3 = "1.6667";      private static final String PICTURE_RATIO_3_2 = "1.5";      private static final String PICTURE_RATIO_4_3 = "1.3333"; +    private static final String PICTURE_RATIO_1_1 = "1";            private static final String[] PICTURE_SIZE_4_3 = new String[] {          "320x240", @@ -437,6 +438,10 @@ public class SettingDataBase {          "2048x1360",          "2560x1712"      }; +    private static final String[] PICTURE_SIZE_1_1 = new String[] { +        "2448x2448", +        "960x960", + };            public static final String[] VIDEO_QUALITY_WHITHOUT_FINE = new String[] {          Integer.toString(CamcorderProfileEx.QUALITY_HIGH) , @@ -605,6 +610,15 @@ public class SettingDataBase {                      .setEnable(true)                      .setMappingFinder(new PictureSizeMappingFinder())                      .setValues(PICTURE_SIZE_3_2)), +         + new Restriction(SettingConstants.ROW_SETTING_PICTURE_RATIO) +            .setType(Restriction.TYPE_SETTING) +            .setValues(PICTURE_RATIO_1_1) +            .setRestrictions( +                new Restriction(SettingConstants.ROW_SETTING_PICTURE_SIZE) +                    .setEnable(true) +                    .setMappingFinder(new PictureSizeMappingFinder()) +                    .setValues(PICTURE_SIZE_1_1)),                                new Restriction(SettingConstants.ROW_SETTING_SMILE_SHOT)              .setValues("on")  vendor/mediatek/proprietary/packages/apps/Camera/src/com/mediatek/camera/setting/SettingUtils.java  index 0fbb09f..d3329d1 100755 @@ -310,6 +310,7 @@ public class SettingUtils {          if (context != null && parameters != null) {              // Add standard preview ratio.              supportedRatios.add(getRatioString(4d / 3)); +            supportedRatios.add(getRatioString(1d / 1));                mCurrentFullScreenRatio = findFullscreenRatio(context);              List<String> fullScreenPictureSizes = buildSupportedPictureSizeByRatio(parameters,  vendor/mediatek/proprietary/packages/apps/Camera/src/com/mediatek/camera/v2/util/Utils.java  index dfe4537..8f51724 100755 @@ -100,7 +100,7 @@ public class Utils {      public static final String               RESET_STATE_VALUE_DISABLE = "disable-value";      /** Orientation hysteresis amount used in rounding, in degrees. */      public static final int                  ORIENTATION_HYSTERESIS = 5; -    public static final double[]             RATIOS = new double[] { 1.3333, 1.5, 1.6667, 1.7778 }; +    public static final double[]             RATIOS = new double[] { 1, 1.3333, 1.5, 1.6667, 1.7778 };      public static final double               ASPECT_TOLERANCE = 0.02;      private static ImageFileNamer            sImageFileNamer;