am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
* commit 'fd6f316adc5abfa071534642688bdf46f47a3925':
Ensure CaptureModule/API2 works without front camera
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 076863d..07647ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,8 @@
android:largeHeap="true"
android:restoreAnyVersion="true"
android:supportsRtl="true"
- android:theme="@style/Theme.Camera" >
+ android:theme="@style/Theme.Camera"
+ android:usesCleartextTraffic="false" >
<activity
android:name="com.android.camera.CameraActivity"
android:clearTaskOnLaunch="true"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f7aca53..bfad80a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -274,7 +274,7 @@
<string name="set_time_interval_help" msgid="64145154088021389">"Funkce časosběr je vypnutá. Zapněte ji a nastavte časový interval."</string>
<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 si, kde byly fotky pořízeny?"</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 a uloženým obrázkům přístup."</string>
<string name="remember_location_no" msgid="4412802756840226925">"Díky, nemám zájem"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Ano"</string>
@@ -362,14 +362,14 @@
<string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
<string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD 4K"</string>
<string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s Mpx"</string>
- <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d : %2$d) %3$s Mpx"</string>
+ <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s Mpx"</string>
<string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Chcete-li změnit zaostření, klepněte sem."</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"Rozšířené"</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">"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"</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>
<string name="confirm_button_text" msgid="7389949384482206814">"OK, ROZUMÍM"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index de6ca31..1acfb4c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -369,7 +369,7 @@
<string name="settings_cling_text" msgid="5368054627268181292">"I Indstillinger kan du ændre opløsningen og kvaliteten eller prøve avancerede funktioner."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"Vælg billedstørrelse"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Du kan ændre dette senere i Indstillinger."</string>
- <string name="share_to" msgid="5144911209144798122">"Del via"</string>
+ <string name="share_to" msgid="5144911209144798122">"Del til"</string>
<string name="edit_with" msgid="615569327230783971">"Rediger med"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"NÆSTE"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"OK, FORSTÅET"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fde6c60..d36b7f5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -366,7 +366,7 @@
<string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"फिर से फ़ोकस करने के लिए, यहां स्पर्श करें"</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"वरीयताएं"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"मैन्युअल एक्सपोज़र"</string>
- <string name="settings_cling_text" msgid="5368054627268181292">"सेटिंग में, रिज़ॉल्यूशन और गुणवत्ता बदलें, या अतिरिक्त सुविधाओं को आज़माएं."</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"सेटिंग में, रिज़ॉल्यूशन बदलें, या अतिरिक्त सुविधाओं को आज़माएं."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"फ़ोटो आकार चुनें"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"आप इसे बाद में सेटिंग में बदल सकते हैं."</string>
<string name="share_to" msgid="5144911209144798122">"इनसे साझा करें:"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 275abfb..7df5281 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -80,7 +80,7 @@
<string name="pref_camera_id_title" msgid="4680648115225411185">"Scegli fotocamera"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Posteriore"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Anteriore"</string>
- <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Salva posizione"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Salva località"</string>
<string name="pref_camera_location_label" msgid="8695441802378057719">"LOCALITÀ"</string>
<string name="pref_camera_timer_title" msgid="4728838281741571323">"Timer conto alla rovescia"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index c217ef3..49ca30f 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -365,7 +365,7 @@
<string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s மெகாபிக்சல்கள்"</string>
<string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"மறுகவனம் செலுத்த, இங்கு தொடவும்"</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"மேம்பட்டவை"</string>
- <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"கைமுறை எக்ஸ்போஷர்"</string>
+ <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"பயனராக வெளிக்காட்டுதல்"</string>
<string name="settings_cling_text" msgid="5368054627268181292">"அமைப்புகளில், தெளிவுத்திறனையும் தரத்தையும் மாற்றவும் அல்லது மேம்பட்ட அம்சங்களை முயற்சிக்கவும்."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"பட அளவைத் தேர்வுசெய்க"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"இதைப் பின்பு அமைப்புகளில் மாற்றலாம்."</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index df36d46..351d780 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -57,7 +57,7 @@
<string name="exposure_time" msgid="949787291620767754">"Exposure time"</string>
<string name="iso" msgid="8578773821062054902">"ISO"</string>
<string name="unit_mm" msgid="5210344300697638286">"mm"</string>
- <string name="manual" msgid="2444400953521760140">"Manu-mano"</string>
+ <string name="manual" msgid="2444400953521760140">"Manual"</string>
<string name="auto" msgid="2552649885114400474">"Auto"</string>
<string name="flash_on" msgid="6573457197393807642">"Flash fired"</string>
<string name="flash_off" msgid="7889323512830926273">"Walang flash"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 136e6e7..ad1ede4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -320,9 +320,9 @@
<string name="camera_id_front_desc" msgid="7497517948130254220">"Ön kamera"</string>
<string name="grid_lines_off_desc" msgid="2022385817190451353">"Kılavuz çizgileri kapalı"</string>
<string name="grid_lines_on_desc" msgid="4601540461914364817">"Kılavuz çizgileri açık"</string>
- <string name="countdown_timer_off" msgid="1663008439564495948">"Geri sayım zamanlayıcısı kapalı"</string>
- <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Geri sayım süresi 3 saniyeye ayarlandı"</string>
- <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Geri sayım süresi 10 saniyeye ayarlandı"</string>
+ <string name="countdown_timer_off" msgid="1663008439564495948">"Geri sayım kronometresi kapalı"</string>
+ <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Geri sayım kronometresinin süresi 3 saniyeye ayarlandı"</string>
+ <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Geri sayım kronometresinin süresi 10 saniyeye ayarlandı"</string>
<string name="more_options_desc" msgid="4628738800610478353">"Diğer Seçenekler"</string>
<string name="cancel_button_description" msgid="3801167024006905033">"İptal"</string>
<string name="done_button_description" msgid="1334963435441544592">"Bitti"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0d56905..bfa7867 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -347,7 +347,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"Камера за умовчанням"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Довідка й відгуки"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Обробка HDR+…"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"Ліцензії відкритого коду"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Ліцензії ПЗ з відкритим кодом"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Загальні налаштування"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Роздільна здатність і якість"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Про програму"</string>
diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index 8d0b387..0cedb18 100644
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -40,10 +40,8 @@
*/
public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver,
MemoryManager memoryManager) {
- // Enable CaptureModule on all L devices unless the device is
- // black-listed.
- boolean useCaptureModule = ApiHelper.HAS_CAMERA_2_API
- && !GservicesHelper.isCaptureModuleDisabled(contentResolver);
+ // Enable CaptureModule on all M devices.
+ boolean useCaptureModule = true;
Log.i(TAG, "CaptureModule? " + useCaptureModule);
// HDR+ has multiple levels of support.