diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-08 08:40:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-08 08:40:36 -0800 |
| commit | a06814aafd8a3dc6336ef24df9a12fcb6d585500 (patch) | |
| tree | 1ea31d3f222871c314b4db25123219d83d7f82bb /src/com/android/camera/SettingsManager.java | |
| parent | 7d7f377f7bafbec1999e3addf8f607616f957132 (diff) | |
| parent | cfdc874eb6e23e101bd32d10183e419894e405f2 (diff) | |
| download | android_packages_apps_Snap-a06814aafd8a3dc6336ef24df9a12fcb6d585500.tar.gz android_packages_apps_Snap-a06814aafd8a3dc6336ef24df9a12fcb6d585500.tar.bz2 android_packages_apps_Snap-a06814aafd8a3dc6336ef24df9a12fcb6d585500.zip | |
Merge "SnapdragonCamera:DeepPortrait"
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 410f2a8fd..c75f31809 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -52,6 +52,7 @@ import com.android.camera.imageprocessor.filter.BeautificationFilter; import com.android.camera.imageprocessor.filter.BestpictureFilter; import com.android.camera.imageprocessor.filter.BlurbusterFilter; import com.android.camera.imageprocessor.filter.ChromaflashFilter; +import com.android.camera.imageprocessor.filter.DeepPortraitFilter; import com.android.camera.imageprocessor.filter.OptizoomFilter; import com.android.camera.imageprocessor.filter.SharpshooterFilter; import com.android.camera.imageprocessor.filter.StillmoreFilter; @@ -100,6 +101,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final int SCENE_MODE_TRACKINGFOCUS_INT = SCENE_MODE_CUSTOM_START + 8; public static final int SCENE_MODE_PROMODE_INT = SCENE_MODE_CUSTOM_START + 9; public static final int SCENE_MODE_DEEPZOOM_INT = SCENE_MODE_CUSTOM_START + 10; + public static final int SCENE_MODE_DEEPPORTRAIT_INT = SCENE_MODE_CUSTOM_START + 11; public static final String SCENE_MODE_DUAL_STRING = "100"; public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key"; public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key"; @@ -160,6 +162,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_QCFA = "pref_camera2_qcfa_key"; public static final String KEY_EIS_VALUE = "pref_camera2_eis_key"; public static final String KEY_FOVC_VALUE = "pref_camera2_fovc_key"; + public static final String KEY_DEEPPORTRAIT_VALUE = "pref_camera2_deepportrait_key"; public static final HashMap<String, Integer> KEY_ISO_INDEX = new HashMap<String, Integer>(); public static final String KEY_BSGC_DETECTION = "pref_camera2_bsgc_key"; @@ -1229,12 +1232,20 @@ public class SettingsManager implements ListMenu.SettingsListener { Size[] sizes = map.getOutputSizes(ImageFormat.JPEG); List<String> res = new ArrayList<>(); + boolean isDeepportrait = getDeepportraitEnabled(); + if (getQcfaPrefEnabled() && getIsSupportedQcfa(cameraId)) { res.add(getSupportedQcfaDimension(cameraId)); } if (sizes != null) { for (int i = 0; i < sizes.length; i++) { + if (isDeepportrait && + (Math.min(sizes[i].getWidth(),sizes[i].getHeight()) < 720 || + Math.max(sizes[i].getWidth(),sizes[i].getHeight()) <= 1024)) { + //some reslutions are not supported in deepportrait + continue; + } res.add(sizes[i].toString()); } } @@ -1352,7 +1363,7 @@ public class SettingsManager implements ListMenu.SettingsListener { if (BlurbusterFilter.isSupportedStatic()) modes.add(SCENE_MODE_BLURBUSTER_INT + ""); if (SharpshooterFilter.isSupportedStatic()) modes.add(SCENE_MODE_SHARPSHOOTER_INT + ""); if (TrackingFocusFrameListener.isSupportedStatic()) modes.add(SCENE_MODE_TRACKINGFOCUS_INT + ""); - if (DeepZoomFilter.isSupportedStatic()) modes.add(SCENE_MODE_DEEPZOOM_INT + ""); + if (DeepPortraitFilter.isSupportedStatic()) modes.add(SCENE_MODE_DEEPPORTRAIT_INT+""); modes.add("" + SCENE_MODE_PROMODE_INT); for (int mode : sceneModes) { modes.add("" + mode); @@ -1518,14 +1529,21 @@ public class SettingsManager implements ListMenu.SettingsListener { } public boolean getQcfaPrefEnabled() { - ListPreference qcfaPref = mPreferenceGroup.findPreference(KEY_QCFA); - String qcfa = qcfaPref.getValue(); + String qcfa = getValue(KEY_QCFA); if(qcfa != null && qcfa.equals("enable")) { return true; } return false; } + public boolean getDeepportraitEnabled() { + String dp = getValue(KEY_SCENE_MODE); + if( dp!= null && Integer.valueOf(dp) == SCENE_MODE_DEEPPORTRAIT_INT) { + return true; + } + return false; + } + public boolean getIsSupportedQcfa (int cameraId) { byte isSupportQcfa = 0; try { |