diff options
author | Angus Kong <shkong@google.com> | 2013-08-09 14:55:20 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-08-09 17:12:11 -0700 |
commit | b50b5cbfbc0a67db6fc43373363b10381c9c61a3 (patch) | |
tree | b66054bcd1fbbae3ccf4f79d82c29ea1fb643ebf /src/com/android/camera/CameraSettings.java | |
parent | 4b2cb93c3f652734c41b4eb7449215178c586e8a (diff) | |
download | android_packages_apps_Snap-b50b5cbfbc0a67db6fc43373363b10381c9c61a3.tar.gz android_packages_apps_Snap-b50b5cbfbc0a67db6fc43373363b10381c9c61a3.tar.bz2 android_packages_apps_Snap-b50b5cbfbc0a67db6fc43373363b10381c9c61a3.zip |
Clean up Gallery codes.
bug:10263696
Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 9e01d5c9b..791a4f719 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -29,8 +29,9 @@ import android.media.CamcorderProfile; import android.util.FloatMath; import android.util.Log; +import com.android.camera.util.CameraUtil; import com.android.camera2.R; -import com.android.camera.support.common.ApiHelper; +import com.android.camera.util.ApiHelper; import java.util.ArrayList; import java.util.List; @@ -197,7 +198,7 @@ public class CameraSettings { flashMode, mParameters.getSupportedFlashModes()); } if (focusMode != null) { - if (!Util.isFocusAreaSupported(mParameters)) { + if (!CameraUtil.isFocusAreaSupported(mParameters)) { filterUnsupportedOptions(group, focusMode, mParameters.getSupportedFocusModes()); } else { @@ -228,7 +229,7 @@ public class CameraSettings { } } if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR - || !Util.isCameraHdrSupported(mParameters))) { + || !CameraUtil.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } } @@ -553,8 +554,8 @@ public class CameraSettings { EffectsRecorder.isEffectSupported(EffectsRecorder.EFFECT_GOOFY_FACE); boolean backdropperSupported = EffectsRecorder.isEffectSupported(EffectsRecorder.EFFECT_BACKDROPPER) && - Util.isAutoExposureLockSupported(mParameters) && - Util.isAutoWhiteBalanceLockSupported(mParameters); + CameraUtil.isAutoExposureLockSupported(mParameters) && + CameraUtil.isAutoWhiteBalanceLockSupported(mParameters); ArrayList<String> supported = new ArrayList<String>(); for (CharSequence value : values) { |