Remove white balance and non-HDR scene mode settings

[android-x86/packages-apps-Camera2.git] / src / com / android / camera / settings / SettingsManager.java

diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index ba62abe..187bfd8 100644 (file)
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -20,12 +20,12 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.camera.ListPreference;
 import com.android.camera.app.AppController;
 import com.android.camera.app.LocationManager;
+import com.android.camera.debug.Log;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.SettingsHelper;
 import com.android.camera2.R;
@@ -38,7 +38,7 @@ import java.util.List;
  * local SharedPreferences.
  */
 public class SettingsManager {
-    private static final String TAG = "SettingsManager";
+    private static final Log.Tag TAG = new Log.Tag("SettingsManager");
 
     private final Context mContext;
     private final SharedPreferences mDefaultSettings;
@@ -350,11 +350,8 @@ public class SettingsManager {
     public static final int SETTING_FOCUS_MODE = 7;
     public static final int SETTING_FLASH_MODE = 8;
     public static final int SETTING_VIDEOCAMERA_FLASH_MODE = 9;
-    public static final int SETTING_WHITE_BALANCE = 10;
     public static final int SETTING_SCENE_MODE = 11;
     public static final int SETTING_EXPOSURE = 12;
-    public static final int SETTING_TIMER = 13;
-    public static final int SETTING_TIMER_SOUND_EFFECTS = 14;
     public static final int SETTING_VIDEO_EFFECT = 15;
     public static final int SETTING_CAMERA_ID = 16;
     public static final int SETTING_CAMERA_HDR = 17;
@@ -362,14 +359,12 @@ public class SettingsManager {
     public static final int SETTING_CAMERA_FIRST_USE_HINT_SHOWN = 19;
     public static final int SETTING_VIDEO_FIRST_USE_HINT_SHOWN = 20;
     public static final int SETTING_STARTUP_MODULE_INDEX = 21;
-    public static final int SETTING_SHIMMY_REMAINING_PLAY_TIMES_INDEX = 22;
     public static final int SETTING_KEY_CAMERA_MODULE_LAST_USED_INDEX = 23;
     public static final int SETTING_CAMERA_PANO_ORIENTATION = 24;
     public static final int SETTING_CAMERA_GRID_LINES = 25;
     public static final int SETTING_RELEASE_DIALOG_LAST_SHOWN_VERSION = 26;
     public static final int SETTING_FLASH_SUPPORTED_BACK_CAMERA = 27;
     public static final int SETTING_STRICT_UPGRADE_VERSION = 28;
-    public static final int SETTING_FILMSTRIP_PEEK_ANIM_REMAINING_PLAY_TIMES_INDEX = 29;
     // A boolean for requesting to return to HDR plus
     // as soon as possible, if a user requests a setting/mode option
     // that forces them to leave HDR plus.
@@ -387,11 +382,8 @@ public class SettingsManager {
     public static final String KEY_FOCUS_MODE = "pref_camera_focusmode_key";
     public static final String KEY_FLASH_MODE = "pref_camera_flashmode_key";
     public static final String KEY_VIDEOCAMERA_FLASH_MODE = "pref_camera_video_flashmode_key";
-    public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key";
     public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
     public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
-    public static final String KEY_TIMER = "pref_camera_timer_key";
-    public static final String KEY_TIMER_SOUND_EFFECTS = "pref_camera_timer_sound_key";
     public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key";
     public static final String KEY_CAMERA_ID = "pref_camera_id_key";
     public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key";
@@ -401,8 +393,6 @@ public class SettingsManager {
     public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN =
             "pref_video_first_use_hint_shown_key";
     public static final String KEY_STARTUP_MODULE_INDEX = "camera.startup_module";
-    public static final String KEY_SHIMMY_REMAINING_PLAY_TIMES =
-            "pref_shimmy_remaining_play_times";
     public static final String KEY_CAMERA_MODULE_LAST_USED =
             "pref_camera_module_last_used_index";
     public static final String KEY_CAMERA_PANO_ORIENTATION = "pref_camera_pano_orientation";
@@ -412,8 +402,6 @@ public class SettingsManager {
     public static final String KEY_FLASH_SUPPORTED_BACK_CAMERA =
             "pref_flash_supported_back_camera";
     public static final String KEY_STRICT_UPGRADE_VERSION = "pref_strict_upgrade_version";
-    public static final String KEY_FILMSTRIP_PEEK_ANIM_REMAINING_PLAY_TIMES =
-            "pref_filmstrip_peek_anim_remaining_play_times";
     public static final String KEY_REQUEST_RETURN_HDR_PLUS = "pref_request_return_hdr_plus";
 
     public static final int WHITE_BALANCE_DEFAULT_INDEX = 2;
@@ -433,7 +421,7 @@ public class SettingsManager {
         /**
          * A constructor used to store a setting's profile.
          */
-        Setting(String source, String type, String defaultValue, String key,
+        public Setting(String source, String type, String defaultValue, String key,
                 String[] values, boolean flushOnCameraChange) {
             mSource = source;
             mType = type;
@@ -963,14 +951,6 @@ public class SettingsManager {
                 values, FLUSH_ON);
     }
 
-    public static Setting getWhiteBalanceSetting(Context context) {
-        String defaultValue = context.getString(R.string.pref_camera_whitebalance_default);
-        String[] values = context.getResources().getStringArray(
-                R.array.pref_camera_whitebalance_entryvalues);
-        return new Setting(SOURCE_CAMERA, TYPE_STRING, defaultValue, KEY_WHITE_BALANCE,
-                values, FLUSH_OFF);
-    }
-
     public static Setting getHdrSetting(Context context) {
         String defaultValue = context.getString(R.string.pref_camera_hdr_default);
         String[] values = context.getResources().getStringArray(
@@ -1029,21 +1009,6 @@ public class SettingsManager {
                 values, FLUSH_OFF);
     }
 
-    public static Setting getTimerSetting(Context context) {
-        String defaultValue = context.getString(R.string.pref_camera_timer_default);
-        String[] values = null; // TODO: get the values dynamically.
-        return new Setting(SOURCE_GLOBAL, TYPE_STRING, defaultValue, KEY_TIMER,
-                values, FLUSH_OFF);
-    }
-
-    public static Setting getTimerSoundSetting(Context context) {
-        String defaultValue = context.getString(R.string.pref_camera_timer_sound_default);
-        String[] values = context.getResources().getStringArray(
-                R.array.pref_camera_timer_sound_entryvalues);
-        return new Setting(SOURCE_GLOBAL, TYPE_STRING, defaultValue, KEY_TIMER_SOUND_EFFECTS,
-                values, FLUSH_OFF);
-    }
-
     public static Setting getVideoQualityBackSetting(Context context) {
         String defaultValue = context.getString(R.string.pref_video_quality_default);
         String[] values = context.getResources().getStringArray(
@@ -1108,12 +1073,6 @@ public class SettingsManager {
                 KEY_STARTUP_MODULE_INDEX, values, FLUSH_OFF);
     }
 
-    public static Setting getShimmyRemainingTimesSetting(Context context) {
-        String defaultValue = context.getString(R.string.pref_shimmy_play_times);
-        return new Setting(SOURCE_DEFAULT, TYPE_INTEGER, defaultValue,
-                KEY_SHIMMY_REMAINING_PLAY_TIMES, null, FLUSH_OFF);
-    }
-
     public static Setting getLastUsedCameraModule(Context context) {
         String defaultValue = Integer.toString(context.getResources()
                 .getInteger(R.integer.camera_mode_photo));
@@ -1154,12 +1113,6 @@ public class SettingsManager {
                 KEY_STRICT_UPGRADE_VERSION, null, FLUSH_OFF);
     }
 
-    public static Setting getPeekAnimRemainingTimesSetting(Context context) {
-        String defaultValue = context.getString(R.string.pref_filmstrip_peek_anim_play_times);
-        return new Setting(SOURCE_DEFAULT, TYPE_INTEGER, defaultValue,
-                KEY_FILMSTRIP_PEEK_ANIM_REMAINING_PLAY_TIMES, null, FLUSH_OFF);
-    }
-
     public static Setting getRequestReturnHdrPlusSetting(Context context) {
         String defaultValue = context.getString(R.string.setting_none_value);
         return new Setting(SOURCE_MODULE, TYPE_BOOLEAN, VALUE_OFF,
@@ -1181,6 +1134,14 @@ public class SettingsManager {
      * Returns whether hdr plus mode is set on.
      */
     public boolean isHdrPlusOn() {
+        String hdrOn = get(SettingsManager.SETTING_CAMERA_HDR_PLUS);
+        return hdrOn.equals(SettingsManager.VALUE_ON);
+    }
+
+    /**
+     * Returns whether hdr mode is set on.
+     */
+    public boolean isHdrOn() {
         String hdrOn = get(SettingsManager.SETTING_CAMERA_HDR);
         return hdrOn.equals(SettingsManager.VALUE_ON);
     }