summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/values-cs/strings.xml6
-rw-r--r--res/values-my-rMM/strings.xml4
-rw-r--r--res_p/mipmap-hdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-hdpi/logo_camera_color_44in48dp.png)bin4740 -> 4740 bytes
-rw-r--r--res_p/mipmap-mdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-mdpi/logo_camera_color_44in48dp.png)bin2928 -> 2928 bytes
-rw-r--r--res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xhdpi/logo_camera_color_44in48dp.png)bin6848 -> 6848 bytes
-rw-r--r--res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png)bin11187 -> 11187 bytes
-rw-r--r--res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png)bin16099 -> 16099 bytes
-rw-r--r--src/com/android/camera/PhotoModule.java81
9 files changed, 61 insertions, 32 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 435c48e8e..e187f99fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,7 @@
<application
android:name="com.android.camera.app.CameraApp"
android:hardwareAccelerated="true"
- android:icon="@drawable/logo_camera_color_44in48dp"
+ android:icon="@mipmap/logo_camera_color_44in48dp"
android:label="@string/app_name"
android:largeHeap="true"
android:restoreAnyVersion="true"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3db3423e6..357368eea 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -264,7 +264,7 @@
<string name="set_duration" msgid="1638453882581604341">"Nastavit dobu v sekundách"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"Odpočítávání spouště fotoaparátu"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Pamatovat, kde byly fotky pořízeny?"</string>
- <string name="remember_location_prompt" msgid="5104210757873140169">"Přidejte do fotek a videí označení míst, kde jste je pořídili.\n\nOstatní aplikace budou mít k těmto informacím přístup společně s přístupem k uloženým obrázkům."</string>
+ <string name="remember_location_prompt" msgid="5104210757873140169">"Přidejte do fotek a videí označení míst, kde jste je pořídili.\n\nOstatní aplikace budou mít k těmto informacím přístup společně s přístupem k uloženým obrázkům."</string>
<string name="remember_location_no" msgid="4412802756840226925">"Díky, nemám zájem"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Ano"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"DALŠÍ MOŽNOSTI"</string>
@@ -355,8 +355,8 @@
<string name="pref_category_advanced" msgid="5921085080077574872">"Pokročilé"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Ruční expozice"</string>
<string name="settings_cling_text" msgid="5368054627268181292">"V Nastavení můžete změnit rozlišení a kvalitu nebo vyzkoušet pokročilé funkce."</string>
- <string name="photo_size_selection_title" msgid="2789753590719172645">"Výběr velikosti fotky"</string>
- <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Později to můžete změnit v Nastavení."</string>
+ <string name="photo_size_selection_title" msgid="2789753590719172645">"Vyberte velikost fotky"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Poměr stran můžete později změnit v Nastaveních."</string>
<string name="share_to" msgid="5144911209144798122">"Sdílet na"</string>
<string name="edit_with" msgid="615569327230783971">"Upravit ve službě"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"DALŠÍ"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 51c0f78d2..fab073130 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -90,7 +90,7 @@
<string name="pref_camcorder_settings_category" msgid="3553148484755353397">"ကင်မရာရိုက်ကူးမှုဆက်တင်များ"</string>
<string name="pref_camera_picturesize_title" msgid="686045304547541815">"ပုံအရွယ်အစား"</string>
<string name="pref_camera_picturesize_entry_large" msgid="9014447075089601575">"ကြီးမားသော"</string>
- <string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"အလယ်အလတ်"</string>
+ <string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"အတော်အသင့်"</string>
<string name="pref_camera_picturesize_entry_small" msgid="2991239656622539068">"သေးငယ်သော"</string>
<string name="pref_camera_focusmode_title" msgid="3637702747984180030">"အာရုံစိုက်နေခြင်း"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"အလိုအလျောက်"</string>
@@ -285,7 +285,7 @@
<string name="mode_timelapse" msgid="1517168724627815453">"ကြားမြင့်ချိန်"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"ထောင့်ကျယ်"</string>
<string name="mode_panorama" msgid="6882648621305828861">"မြင်ကွင်းကျယ်"</string>
- <string name="mode_refocus" msgid="172192967119469061">"မှန်ဘလူးအားဝေဝါးခြင်း"</string>
+ <string name="mode_refocus" msgid="172192967119469061">"မှန်ဘီလူးဝါးဝါး"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"ကင်မရာစနစ်အားပြောင်းရန်"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"ဗီဒီယိုကင်မရာသို့ပြောင်းရန်"</string>
<string name="mode_photosphere_desc" msgid="2403816283825579161">"Photo Sphereစနစ်အားပြောင်းရန်"</string>
diff --git a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
index 1ac6b5840..1ac6b5840 100644
--- a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
index 3868f159c..3868f159c 100644
--- a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
index 7593dc3f8..7593dc3f8 100644
--- a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
index a989efe02..a989efe02 100644
--- a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
index 9264c3417..9264c3417 100644
--- a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 173ecaefc..8865a80be 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -160,6 +160,13 @@ public class PhotoModule
private boolean mAwbLockSupported;
private boolean mContinuousFocusSupported;
+ /*
+ * If true, attempts to start the preview will be denied. This ensures that
+ * we never call startPreview multiple times when making changes to
+ * settings.
+ */
+ private boolean mStartPreviewLock = false;
+
// The degrees of the device rotated clockwise from its natural orientation.
private int mOrientation = OrientationEventListener.ORIENTATION_UNKNOWN;
@@ -1383,12 +1390,21 @@ public class PhotoModule
// Do camera parameter dependent initialization.
mCameraSettings = mCameraDevice.getSettings();
- setCameraParameters(UPDATE_PARAM_ALL);
- // Set a listener which updates camera parameters based
- // on changed settings.
- SettingsManager settingsManager = mActivity.getSettingsManager();
- settingsManager.addListener(this);
- mCameraPreviewParamsReady = true;
+ // HACK: The call to setCameraParameters(UPDATE_PARAM_ALL) may
+ // eventually recurse back into startPreview().
+ // To avoid calling startPreview() twice, first acquire
+ // mStartPreviewLock.
+ mStartPreviewLock = true;
+ try {
+ setCameraParameters(UPDATE_PARAM_ALL);
+ // Set a listener which updates camera parameters based
+ // on changed settings.
+ SettingsManager settingsManager = mActivity.getSettingsManager();
+ settingsManager.addListener(this);
+ mCameraPreviewParamsReady = true;
+ } finally {
+ mStartPreviewLock = false;
+ }
startPreview();
@@ -1945,33 +1961,46 @@ public class PhotoModule
* The start/stop preview should only run on the UI thread.
*/
private void startPreview() {
- if (!checkPreviewPreconditions()) {
+ // HACK: The call to setCameraParameters(UPDATE_PARAM_ALL) may
+ // eventually recurse back into startPreview().
+ // To avoid calling startPreview() twice, we must acquire
+ // mStartPreviewLock.
+ if (mStartPreviewLock) {
+ // do nothing
return;
}
+ mStartPreviewLock = true;
+ try {
+ if (!checkPreviewPreconditions()) {
+ return;
+ }
- mCameraDevice.setErrorCallback(mHandler, mErrorCallback);
- setDisplayOrientation();
+ mCameraDevice.setErrorCallback(mHandler, mErrorCallback);
+ setDisplayOrientation();
- if (!mSnapshotOnIdle) {
- // If the focus mode is continuous autofocus, call cancelAutoFocus
- // to resume it because it may have been paused by autoFocus call.
- if (mFocusManager.getFocusMode(mCameraSettings.getCurrentFocusMode()) ==
- CameraCapabilities.FocusMode.CONTINUOUS_PICTURE) {
- mCameraDevice.cancelAutoFocus();
+ if (!mSnapshotOnIdle) {
+ // If the focus mode is continuous autofocus, call cancelAutoFocus
+ // to resume it because it may have been paused by autoFocus call.
+ if (mFocusManager.getFocusMode(mCameraSettings.getCurrentFocusMode()) ==
+ CameraCapabilities.FocusMode.CONTINUOUS_PICTURE) {
+ mCameraDevice.cancelAutoFocus();
+ }
+ mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
}
- mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
- }
- setCameraParameters(UPDATE_PARAM_ALL);
- mCameraDevice.setPreviewTexture(mActivity.getCameraAppUI().getSurfaceTexture());
+ setCameraParameters(UPDATE_PARAM_ALL);
+ mCameraDevice.setPreviewTexture(mActivity.getCameraAppUI().getSurfaceTexture());
- Log.i(TAG, "startPreview");
- mCameraDevice.startPreview();
+ Log.i(TAG, "startPreview");
+ mCameraDevice.startPreview();
- mFocusManager.onPreviewStarted();
- onPreviewStarted();
- SessionStatsCollector.instance().previewActive(true);
- if (mSnapshotOnIdle) {
- mHandler.post(mDoSnapRunnable);
+ mFocusManager.onPreviewStarted();
+ onPreviewStarted();
+ SessionStatsCollector.instance().previewActive(true);
+ if (mSnapshotOnIdle) {
+ mHandler.post(mDoSnapRunnable);
+ }
+ } finally {
+ mStartPreviewLock = false;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 01:37:23 +0000