diff options
| author | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-07-21 22:57:45 -0700 |
|---|---|---|
| committer | Sachin Shah <sachins@codeaurora.org> | 2014-08-16 11:50:19 -0700 |
| commit | 7ec9d242fd268ab698b665a894bbb7368e9a1776 (patch) | |
| tree | ce24a3c7099d5f7965cb5e860604834957b0e599 | |
| parent | ec58b34450e9f3b4d3aa11396cc7525200c2460b (diff) | |
| download | android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.tar.gz android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.tar.bz2 android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.zip | |
Camera2: Enhance KK cameraapp for L
Enhance KK cameraapp for L.
Change-Id: If708b253f34a131d7842f8921e54c008283e0056
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/pano_review_control.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 568aaab99..65cb4b855 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="19" /> + android:targetSdkVersion="20" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> diff --git a/res/layout-port/pano_review_control.xml b/res/layout-port/pano_review_control.xml index 852b486ad..eeb2ebee4 100644 --- a/res/layout-port/pano_review_control.xml +++ b/res/layout-port/pano_review_control.xml @@ -24,10 +24,10 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" /> - <ImageView android:id="@id/pano_review_cancel_button" + <ImageView android:id="@+id/pano_review_cancel_button" android:scaleType="center" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:layout_gravity="center_horizontal|bottom" android:src="@drawable/ic_menu_cancel_holo_light" /> -</merge>
\ No newline at end of file +</merge> diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 1027c9c39..4a05994d5 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -844,9 +844,9 @@ public class CameraSettings { supported.add(Integer.toString(CamcorderProfile.QUALITY_4kDCI)); } } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_4kUHD)) { + if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) { if (checkSupportedVideoQuality(parameters,3840,2160)) { - supported.add(Integer.toString(CamcorderProfile.QUALITY_4kUHD)); + supported.add(Integer.toString(CamcorderProfile.QUALITY_2160P)); } } if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_1080P)) { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 79ab14761..16911f1f0 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -810,7 +810,7 @@ public class VideoModule implements CameraModule, } private boolean is4KEnabled() { - if (mProfile.quality == CamcorderProfile.QUALITY_4kUHD || + if (mProfile.quality == CamcorderProfile.QUALITY_2160P || mProfile.quality == CamcorderProfile.QUALITY_4kDCI) { return true; } else { @@ -1622,7 +1622,7 @@ public class VideoModule implements CameraModule, Log.v(TAG, "pauseVideoRecording"); mMediaRecorderPausing = true; mRecordingTotalTime += SystemClock.uptimeMillis() - mRecordingStartTime; - mMediaRecorder.pause(); + //mMediaRecorder.pause(); } private void resumeVideoRecording() { @@ -1630,7 +1630,7 @@ public class VideoModule implements CameraModule, mMediaRecorderPausing = false; mRecordingStartTime = SystemClock.uptimeMillis(); updateRecordingTime(); - mMediaRecorder.start(); + //mMediaRecorder.start(); } private boolean stopVideoRecording() { |