Merge "Camera: Powerkey shutter (2/2)" into cm-11.0
diff --git a/res/values/cm_dummy.xml b/res/values/cm_dummy.xml
new file mode 100644
index 0000000..8351eeb
--- /dev/null
+++ b/res/values/cm_dummy.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Dummy strings to prevent aapt warnings -->
+ <string name="pref_video_quality_entry_high"></string>
+ <string name="pref_video_quality_entry_low"></string>
+</resources>
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 930a160..d83661e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -552,8 +552,8 @@
if (mCameraDevice == null) {
return;
}
- mCameraDevice.setPreviewTexture(null);
stopPreview();
+ mCameraDevice.setPreviewTexture(null);
}
private void setLocationPreference(String value) {