diff options
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7f6143e6e..40b55892f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -361,13 +361,13 @@ <!-- Videocamera Preferences flash mode dialog box entries --> <string-array name="pref_camera_video_flashmode_entries" translatable="false"> - <item>@string/pref_camera_flashmode_entry_on</item> <item>@string/pref_camera_flashmode_entry_off</item> + <item>@string/pref_camera_flashmode_entry_on</item> </string-array> <string-array name="pref_camera_video_flashmode_labels" translatable="false"> - <item>@string/pref_camera_flashmode_label_on</item> <item>@string/pref_camera_flashmode_label_off</item> + <item>@string/pref_camera_flashmode_label_on</item> </string-array> <string-array name="pref_camera_video_flashmode_entryvalues" translatable="false"> @@ -376,13 +376,13 @@ </string-array> <array name="video_flashmode_icons" translatable="false"> - <item>@drawable/ic_flash_on_holo_light</item> <item>@drawable/ic_flash_off_holo_light</item> + <item>@drawable/ic_flash_on_holo_light</item> </array> <array name="video_flashmode_largeicons" translatable="false"> - <item>@drawable/ic_flash_on_holo_light</item> <item>@drawable/ic_flash_off_holo_light</item> + <item>@drawable/ic_flash_on_holo_light</item> </array> <string-array name="pref_camera_recordlocation_entryvalues" translatable="false"> diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 103529bb8..830c04079 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1136,7 +1136,6 @@ public class VideoModule implements CameraModule, if(mWasMute != mIsMute) { setMute(mIsMute, false); } - initializeVideoControl(); showVideoSnapshotUI(false); installIntentFilter(); @@ -1153,6 +1152,7 @@ public class VideoModule implements CameraModule, mUI.enableShutter(true); } + initializeVideoControl(); mUI.applySurfaceChange(VideoUI.SURFACE_STATUS.SURFACE_VIEW); mUI.initDisplayChangeListener(); |