merge in ics-mr0-release history after reset to ics-mr0
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b915e2c..ea9a1e3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -79,7 +79,7 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ночь"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Закат"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Вечеринка"</string>
- <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Недоступно в режиме сцены"</string>
+ <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Недоступно в режиме съемки"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Настройки камеры"</string>
<string name="pref_restore_detail" msgid="5732490002291044791">"Восстановить настройки по умолчанию"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Экспозиция"</string>
diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index a561011..d5f83ef 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -337,8 +337,7 @@
}
private void setRecordingOrientation() {
- if ( (mState == STATE_CONFIGURE || mState == STATE_WAITING_FOR_SURFACE)
- && mRunner != null ) {
+ if ( mState != STATE_RECORD && mRunner != null) {
Point bl = new Point(0, 0);
Point br = new Point(1, 0);
Point tl = new Point(0, 1);
