X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fandroid%2Fcamera%2Fsettings%2FKeys.java;h=a90bf3660bd5b4ccc5732e1a07b0f017fb08d4b6;hb=896ac2d867f54dc38c02ad3e79cea12945003a21;hp=35d0aca814df688a1596377b90ef4b85e751ea8a;hpb=34e1b5d106536186bd15744042a2cede436c066e;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/src/com/android/camera/settings/Keys.java b/src/com/android/camera/settings/Keys.java
index 35d0aca81..a90bf3660 100644
--- a/src/com/android/camera/settings/Keys.java
+++ b/src/com/android/camera/settings/Keys.java
@@ -62,17 +62,25 @@ public class Keys {
             "pref_release_dialog_last_shown_version";
     public static final String KEY_FLASH_SUPPORTED_BACK_CAMERA =
             "pref_flash_supported_back_camera";
+    public static final String KEY_HDR_SUPPORT_MODE_BACK_CAMERA =
+            "pref_hdr_support_mode_back_camera";
     public static final String KEY_UPGRADE_VERSION = "pref_upgrade_version";
     public static final String KEY_REQUEST_RETURN_HDR_PLUS = "pref_request_return_hdr_plus";
     public static final String KEY_SHOULD_SHOW_REFOCUS_VIEWER_CLING =
             "pref_should_show_refocus_viewer_cling";
     public static final String KEY_EXPOSURE_COMPENSATION_ENABLED =
             "pref_camera_exposure_compensation_key";
+
+    /**
+     * Whether the user has chosen an aspect ratio on the first run dialog.
+     */
     public static final String KEY_USER_SELECTED_ASPECT_RATIO = "pref_user_selected_aspect_ratio";
+
     public static final String KEY_COUNTDOWN_DURATION = "pref_camera_countdown_duration_key";
     public static final String KEY_HDR_PLUS_FLASH_MODE = "pref_hdr_plus_flash_mode";
     public static final String KEY_SHOULD_SHOW_SETTINGS_BUTTON_CLING =
             "pref_should_show_settings_button_cling";
+    public static final String KEY_HAS_SEEN_PERMISSIONS_DIALOGS = "pref_has_seen_permissions_dialogs";
 
     /**
      * Set some number of defaults for the defined keys.
@@ -94,6 +102,10 @@ public class Keys {
             context.getString(R.string.pref_camera_flashmode_default),
             context.getResources().getStringArray(R.array.pref_camera_flashmode_entryvalues));
 
+        settingsManager.setDefaults(KEY_HDR_SUPPORT_MODE_BACK_CAMERA,
+            context.getString(R.string.pref_camera_hdr_supportmode_none),
+            context.getResources().getStringArray(R.array.pref_camera_hdr_supportmode_entryvalues));
+
         settingsManager.setDefaults(KEY_CAMERA_HDR, false);
         settingsManager.setDefaults(KEY_CAMERA_HDR_PLUS, false);
 
@@ -103,7 +115,7 @@ public class Keys {
             context.getString(R.string.pref_camera_focusmode_default),
             context.getResources().getStringArray(R.array.pref_camera_focusmode_entryvalues));
 
-        String videoQualityBackDefaultValue = context.getString(R.string.pref_video_quality_large);
+        String videoQualityBackDefaultValue = context.getString(R.string.pref_video_quality_medium);
         // TODO: We tweaked the default setting based on model string which is not ideal. Detecting
         // CamcorderProfile capability is a better way to get this job done. However,
         // |CamcorderProfile.hasProfile| needs camera id info. We need a way to provide camera id to
@@ -122,7 +134,7 @@ public class Keys {
         }
 
         settingsManager.setDefaults(KEY_VIDEO_QUALITY_FRONT,
-            context.getString(R.string.pref_video_quality_large),
+            context.getString(R.string.pref_video_quality_medium),
             context.getResources().getStringArray(R.array.pref_video_quality_entryvalues));
         if (!settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, Keys.KEY_VIDEO_QUALITY_FRONT)) {
             settingsManager.setToDefault(SettingsManager.SCOPE_GLOBAL,
@@ -211,53 +223,5 @@ public class Keys {
         return settingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
                                           KEY_CAMERA_GRID_LINES);
     }
-
-    /**
-     * Returns whether pano orientation is horizontal.
-     */
-    public static boolean isPanoOrientationHorizontal(SettingsManager settingsManager) {
-        return settingsManager.isDefault(SettingsManager.SCOPE_GLOBAL,
-                                         KEY_CAMERA_PANO_ORIENTATION);
-    }
-
-    /**
-     * Sets the settings for whether location recording should be enabled or
-     * not. Also makes sure to pass on the change to the location manager.
-     */
-    public static void setLocation(SettingsManager settingsManager, boolean on,
-                                   LocationManager locationManager) {
-        settingsManager.set(SettingsManager.SCOPE_GLOBAL, KEY_RECORD_LOCATION, on);
-        locationManager.recordLocation(on);
-    }
-
-    /**
-     * Sets the user selected aspect ratio setting to selected.
-     */
-    public static void setAspectRatioSelected(SettingsManager settingsManager) {
-        settingsManager.set(SettingsManager.SCOPE_GLOBAL,
-                            KEY_USER_SELECTED_ASPECT_RATIO, true);
-    }
-
-    /**
-     * Sets the manual exposure compensation enabled setting
-     * to on/off based on the given argument.
-     */
-    public static void setManualExposureCompensation(SettingsManager settingsManager,
-                                              boolean on) {
-        settingsManager.set(SettingsManager.SCOPE_GLOBAL,
-                            KEY_EXPOSURE_COMPENSATION_ENABLED, on);
-    }
-
-    /**
-     * Reads the current location recording settings and passes it on to the
-     * given location manager.
-     */
-    public static void syncLocationManager(SettingsManager settingsManager,
-                                    LocationManager locationManager) {
-        boolean value = settingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
-                                                   KEY_RECORD_LOCATION);
-        locationManager.recordLocation(value);
-    }
-
 }