Import translations. DO NOT MERGE

Change-Id: Ia806543ecbf4a05c710e383dc9a1367c4d07553b
Auto-generated-cl: translation import
merge in jb-mr0-release history after reset to jb-dev
Fix the crash when choosing pick your video in effects recording.

In pick your video case, mEffectType is not EFFECTS_NONE and
mEffectsRecorder is null in onPause.

bug:6826528

Change-Id: Id8c933555b1b8a37c541deb04746468efe1787c0
merge in jb-mr0-release history after reset to jb-dev
Import translations. DO NOT MERGE

Change-Id: I46ec874140d9ea92664127596dbf5345a51676fe
Auto-generated-cl: translation import
merge in jb-mr0-release history after reset to jb-dev
Camera: Updated czech translation

Change-Id: I36b2230ebdf24a514306649045313932585b3c81
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
VideoCamera: Do not use continuous autofocus in time-laspe mode

Change-Id: I5808aafb6b3b1343e4b0770e262344de7542e1c8
Camera: Add JPEG Quality settings.

Patchset 2: remove comment.

Change-Id: I7a963bfb226231918648006e4ab61a42ee79b182
Camera: streamline settings

flips anti-banding and color effect arrays so all options go from low to high

Change-Id: Idc47537f2e0b49c8e54a8920a9d64cb6d0b1fbf1
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "Camera: Updated czech translation" into jb
Camera: fix NPE

add null check to mPreference to avoid the following

09-14 10:39:48.829: E/AndroidRuntime(5495): Caused by: java.lang.NullPointerException
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.ui.InLineSettingItem.reloadPreference(InLineSettingItem.java:80)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.ui.OtherSettingsPopup.reloadPreference(OtherSettingsPopup.java:155)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.ui.AbstractIndicatorButton.reloadPreference(AbstractIndicatorButton.java:165)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.ui.IndicatorControl.reloadPreferences(IndicatorControl.java:213)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.ui.IndicatorControlBarContainer.reloadPreferences(IndicatorControlBarContainer.java:139)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.Camera.initializeSecondTime(Camera.java:621)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at com.android.camera.Camera.onResume(Camera.java:1788)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1184)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at android.app.Activity.performResume(Activity.java:5082)
09-14 10:39:48.829: E/AndroidRuntime(5495): 	at android.app.ActivityThread.performResumeActivity(ActivityThread.java:2688)

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>

Change-Id: I30af8885e4d68612c1dac9f7c5cbbe4270bf99f5
Camera: Fix issue with restore default camera parameters

Intialize mPreferences before you reload preferences.

CRs-Fixed: 383840

Change-Id: I426627725b2606d313d931ada6adfbae82b355cc
(cherry picked from commit 683ba67603d06562805819fff4ee4370028adf38)
Revert "Camera: fix NPE"

*true fix in previous commit

This reverts commit 90e19612eede048d1ed4c85cc64a53f1304706cd.
Merge remote-tracking branch 'aokp/jb' into aokpcm10
Camera: Updated czech translation

Change-Id: Ie58cf055b468a2ca75bf0c7c5baed756d061f3ef
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Camera: Prevent double-stops on preview for some HALs

The OMAP3 HAL (at least) stops the preview while taking a snapshot,
without generating events to the upper layers, and telling it to
stop again leads to an inconsistent state.
Use "previewStopsDuringSnapshot" to avoid sending a stop while
it is already stopped

Change-Id: I4d4fe501c0dd6dd9aefb7d35f0e9dc6887e15162
Merge tag 'android-4.1.2_r1' into HEAD

Android 4.1.2 release 1

Conflicts:
	res/values-hi/strings.xml

Change-Id: I8af54bf11e7391f4e19cb230de9bfd3ebe392dec
Merge remote-tracking branch 'aokp/jb' into aokpcm10