Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

1 files changed, 31 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index c1f02ff3a..ad0c30ac6 100644..100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -92,6 +92,7 @@ public class CameraSettings {
     public static final String KEY_POWER_MODE = "pref_camera_powermode_key";
     public static final String KEY_PICTURE_FORMAT = "pref_camera_pictureformat_key";
     public static final String KEY_ZSL = "pref_camera_zsl_key";
+    public static final String KEY_CAMERA_SAVEPATH = "pref_camera_savepath_key";
     public static final String KEY_FILTER_MODE = "pref_camera_filter_mode_key";
     public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
     public static final String KEY_VIDEOCAMERA_COLOR_EFFECT = "pref_camera_video_coloreffect_key";
@@ -1134,6 +1135,7 @@ public class CameraSettings {
         ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE);
         ListPreference videoEncoder = group.findPreference(KEY_VIDEO_ENCODER);
         ListPreference noiseReductionMode = group.findPreference(KEY_NOISE_REDUCTION);
+        ListPreference savePath = group.findPreference(KEY_CAMERA_SAVEPATH);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
@@ -1257,6 +1259,35 @@ public class CameraSettings {
             removePreference(group, powerShutter.getKey());
         }
 
+        if (PersistUtil.isSaveInSdEnabled()) {
+            final String CAMERA_SAVEPATH_SDCARD = "1";
+            final int CAMERA_SAVEPATH_SDCARD_IDX = 1;
+            final int CAMERA_SAVEPATH_PHONE_IDX = 0;
+
+            SharedPreferences pref = group.getSharedPreferences();
+            String savePathValue = null;
+            if (pref != null) {
+                savePathValue = pref.getString(KEY_CAMERA_SAVEPATH, CAMERA_SAVEPATH_SDCARD);
+            }
+            if (savePath != null && CAMERA_SAVEPATH_SDCARD.equals(savePathValue)) {
+                // If sdCard is present, set sdCard as default save path.
+                // Only for the first time when camera start.
+                if (SDCard.instance().isWriteable()) {
+                    Log.d(TAG, "set Sdcard as save path.");
+                    savePath.setValueIndex(CAMERA_SAVEPATH_SDCARD_IDX);
+                } else {
+                    Log.d(TAG, "set Phone as save path when sdCard is unavailable.");
+                    savePath.setValueIndex(CAMERA_SAVEPATH_PHONE_IDX);
+                }
+            }
+        }
+        if (savePath != null) {
+            Log.d(TAG, "check storage menu " +  SDCard.instance().isWriteable());
+            if (!SDCard.instance().isWriteable()) {
+                removePreference(group, savePath.getKey());
+            }
+        }
+
         qcomInitPreferences(group);
     }