Merge "DO NOT MERGE - Merge Android 10 into master"
diff --git a/Android.mk b/Android.mk
index f5f1ead..b24a2df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,9 +5,9 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v13 \
- android-support-v4 \
- android-support-compat
+ androidx.legacy_legacy-support-v13 \
+ androidx.legacy_legacy-support-v4 \
+ androidx.core_core
LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7744a4f..9fa123f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -62,11 +62,11 @@
<string name="flash_on" msgid="6573457197393807642">"تم تشغيل الفلاش"</string>
<string name="flash_off" msgid="7889323512830926273">"بلا فلاش"</string>
<string name="unknown" msgid="564184550182858146">"غير معروف"</string>
- <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"هذا العنصر مخزن محليًا ومتاح في وضع عدم الاتصال."</string>
+ <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"هذا العنصر مخزن محليًا ومتاح بلا إنترنت."</string>
<string name="please_wait" msgid="1416313324505140068">"يُرجى الانتظار"</string>
<string name="camera_error_title" msgid="6200558085072670067">"خطأ في الكاميرا"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"يتعذر الاتصال بالكاميرا."</string>
- <string name="error_camera_disabled" msgid="5582398275657419692">"تم تعطيل الكاميرا بسبب سياسات الأمان."</string>
+ <string name="error_camera_disabled" msgid="5582398275657419692">"تم إيقاف الكاميرا بسبب سياسات الأمان."</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"حدثت مشكلة أثناء حفظ الصورة أو الفيديو."</string>
<string name="error_permissions" msgid="3454167403425651254">"لا يحتاج التطبيق إلى أذونات خطيرة لتشغيله، يرجى التحقق من إعدادات الأذونات."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"تعذّر تخزين الصورة."</string>
@@ -181,7 +181,7 @@
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"عيون صغيرة"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"في الفضاء"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"الغروب"</string>
- <string name="effect_backdropper_gallery" msgid="2333888391153564920">"مقطع فيديو"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"فيديو"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"المس لالتقاط صورة أثناء التسجيل."</string>
<string name="video_recording_started" msgid="3374878415050991030">"بدأ تسجيل الفيديو."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"تم إيقاف تسجيل الفيديو."</string>
@@ -210,7 +210,7 @@
<string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"إلغاء القفل للانتقال للكاميرا"</string>
<string name="media_date_content_description" msgid="2155634843596817141">"وسائط تم التقاطها في %s"</string>
<string name="photo_date_content_description" msgid="5705865897898465619">"صورة تمّ التقاطها في %s"</string>
- <string name="video_date_content_description" msgid="2151884014634284456">"مقطع فيديو تمّ التقاطه في %s"</string>
+ <string name="video_date_content_description" msgid="2151884014634284456">"فيديو تمّ التقاطه في %s"</string>
<string name="panorama_date_content_description" msgid="990703578639006144">"بانوراما تم التقاطها في %s"</string>
<string name="photosphere_date_content_description" msgid="4183741743409007876">"بانوراما Photo Sphere تمّ التقاطها في %s"</string>
<string name="refocus_date_content_description" msgid="5630960320424345547">"صورة بتركيز العدسة تمّ التقاطها في %s"</string>
@@ -276,7 +276,7 @@
<string name="set_duration" msgid="1638453882581604341">"تعيين المدة بالثواني"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"جارٍ بدء العد التنازلي لالتقاط صورة"</string>
<string name="remember_location_title" msgid="3045040613094030429">"هل تريد حفظ مواقع الصور؟"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"ضع علامة على الصور ومقاطع الفيديو تشير إلى المواقع التي تم التقاطها فيها."</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"ضع علامة على الصور والفيديوهات تشير إلى المواقع التي تم التقاطها فيها."</string>
<string name="remember_location_no" msgid="4412802756840226925">"لا شكرًا"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"نعم"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"المزيد من الخيارات"</string>
@@ -345,7 +345,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"فيديو الكاميرا الخلفية"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"صورة الكاميرا الأمامية"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"فيديو الكاميرا الأمامية"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"الكاميرا الافتراضية"</string>
+ <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">"جارٍ معالجة النطاق عالي الديناميكية+ …"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"تراخيص برامج مفتوحة مصدر"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1a6e456..051eba2 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -40,7 +40,7 @@
<string name="title" msgid="8061744305671964703">"শীর্ষক"</string>
<string name="description" msgid="8193138501982849808">"বর্ণনা"</string>
<string name="time" msgid="5248213506417024287">"সময়"</string>
- <string name="location" msgid="564326205780827668">"অবস্থান"</string>
+ <string name="location" msgid="564326205780827668">"লোকেশন"</string>
<string name="path" msgid="5927003361865586353">"পথ"</string>
<string name="width" msgid="7045750687833828758">"প্রস্থ"</string>
<string name="height" msgid="5186001199353423689">"উচ্চতা"</string>
@@ -81,8 +81,8 @@
<string name="pref_camera_id_title" msgid="4680648115225411185">"ক্যামেরা বেছে নিন"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"পিছনে"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"সামনের"</string>
- <string name="pref_camera_save_location_title" msgid="2344235620113384017">"অবস্থান সেভ করুন"</string>
- <string name="pref_camera_location_label" msgid="8695441802378057719">"অবস্থান"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"লোকেশন সেভ করুন"</string>
+ <string name="pref_camera_location_label" msgid="8695441802378057719">"লোকেশন"</string>
<string name="pref_camera_timer_title" msgid="4728838281741571323">"কাউন্টডাউন টাইমার"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
@@ -287,8 +287,8 @@
<string name="set_time_interval_help" msgid="64145154088021389">"সময় ব্যয় বৈশিষ্ট্যটি বন্ধ। সময় বিরতি সেট করতে এটিকে চালু করুন।"</string>
<string name="set_duration" msgid="1638453882581604341">"সময়কাল সেকেন্ডে সেট করুন"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"একটি ফটো তুলতে কাউন্ট ডাউন হচ্ছে"</string>
- <string name="remember_location_title" msgid="3045040613094030429">"ফটোর অবস্থান মনে রাখবেন?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"আপনার ফটো ও ভিডিওগুলির তোলার অবস্থান সহ সেগুলিকে ট্যাগ করুন৷"</string>
+ <string name="remember_location_title" msgid="3045040613094030429">"ফটোর লোকেশন মনে রাখবেন?"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"আপনার ফটো ও ভিডিওগুলির তোলার লোকেশন সহ সেগুলিকে ট্যাগ করুন৷"</string>
<string name="remember_location_no" msgid="4412802756840226925">"না থাক"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"হ্যাঁ"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"আরো বিকল্প"</string>
@@ -352,7 +352,7 @@
<string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"এক্সপোজার ঘাটতিপূরণ +১"</string>
<string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"এক্সপোজার ঘাটতিপূরণ: +২"</string>
<string name="button_change_announcement" msgid="3759686152778772111">"এখন বোতাম হল %s"</string>
- <string name="setting_location" msgid="4459859689227893838">"অবস্থান"</string>
+ <string name="setting_location" msgid="4459859689227893838">"লোকেশন"</string>
<string name="setting_back_camera_photo" msgid="256738900473265017">"ডিভাইসের পিছনের ক্যামেরার ফটো"</string>
<string name="setting_back_camera_video" msgid="5220819479408164689">"ডিভাইসের পিছনের ক্যামেরার ভিডিও"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"সামনের ক্যামেরার ফটো"</string>
@@ -360,7 +360,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/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ec6fe81..20fdf24 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -63,7 +63,7 @@
<string name="flash_off" msgid="7889323512830926273">"Bez blica"</string>
<string name="unknown" msgid="564184550182858146">"Nepoznato"</string>
<string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"Ovaj album je pohranjen lokalno i dostupan je van mreže."</string>
- <string name="please_wait" msgid="1416313324505140068">"Sačekajte"</string>
+ <string name="please_wait" msgid="1416313324505140068">"Pričekajte"</string>
<string name="camera_error_title" msgid="6200558085072670067">"Greška na kameri"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"Greška prilikom povezivanja s kamerom."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"Kamera je onemogućena zbog sigurnosnih pravila."</string>
@@ -195,7 +195,7 @@
<string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Prebaci na sliku"</string>
<string name="accessibility_switch_to_video" msgid="8174781871592793967">"Prebaci na snimanje videozapisa"</string>
<string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Prebaci na panoramski način rada"</string>
- <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Prebaci na način rada Foto-sfera"</string>
+ <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Prebaci na način rada za photo sphere fotografije"</string>
<string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"Prebaci na visoki kvalitet"</string>
<string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"Prebaci na način rada Promjena fokusa"</string>
<string name="accessibility_review_cancel" msgid="5462850829869569629">"Prekini pregled"</string>
@@ -293,14 +293,14 @@
<string name="mode_settings" msgid="2021937261522670921">"Postavke"</string>
<string name="mode_camera" msgid="279763925715250603">"Kamera"</string>
<string name="mode_video" msgid="8633929034048169139">"Videozapis"</string>
- <string name="mode_photosphere" msgid="5082338476237291833">"Foto-sfera"</string>
+ <string name="mode_photosphere" msgid="5082338476237291833">"Photo sphere fotografija"</string>
<string name="mode_timelapse" msgid="1517168724627815453">"Protok vremena"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"Široki ugao"</string>
<string name="mode_panorama" msgid="6882648621305828861">"Panoramski način rada"</string>
<string name="mode_refocus" msgid="172192967119469061">"Efekt s izoštr. objektom"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"Prebaci na način rada za kameru"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"Prebaciti na videokameru"</string>
- <string name="mode_photosphere_desc" msgid="2403816283825579161">"Prebaci na način rada Foto-sfera"</string>
+ <string name="mode_photosphere_desc" msgid="2403816283825579161">"Prebaci na način rada za photo sphere fotografije"</string>
<string name="mode_panorama_desc" msgid="6023020404237519590">"Prebaci na panoramski način rada"</string>
<string name="mode_refocus_desc" msgid="6171183297515508465">"Prebaci na način rada Efekt s izoštrenim objektom"</string>
<string name="settings_open_desc" msgid="6914471293841793766">"Otvori postavke"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index be634b3..82d8bee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -134,7 +134,7 @@
<string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESACTIVAT"</string>
<string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acció"</string>
<string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nit"</string>
- <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Posta del sol"</string>
+ <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Posta de sol"</string>
<string name="pref_camera_scenemode_entry_party" msgid="401232668169066415">"Festa"</string>
<string name="pref_camera_scenemode_label_auto" msgid="2874586883608401615">"CAP"</string>
<string name="pref_camera_scenemode_label_action" msgid="1822814017595414923">"ACCIÓ"</string>
@@ -180,7 +180,7 @@
<string name="effect_goofy_face_big_nose" msgid="6936976307035428164">"Nas gran"</string>
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Ulls petits"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"A l\'espai"</string>
- <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Posta del sol"</string>
+ <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Posta de sol"</string>
<string name="effect_backdropper_gallery" msgid="2333888391153564920">"El teu vídeo"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"Toca per fer una foto mentre enregistres un vídeo."</string>
<string name="video_recording_started" msgid="3374878415050991030">"La gravació de vídeo ha començat."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cf21f05..23d34c2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -339,7 +339,7 @@
<string name="exposure_compensation_desc_0" msgid="2820273752287040523">"Kompenzace expozice 0"</string>
<string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"Kompenzace expozice +1"</string>
<string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"Kompenzace expozice +2"</string>
- <string name="button_change_announcement" msgid="3759686152778772111">"Tlačítko je nyní ve stavu %s"</string>
+ <string name="button_change_announcement" msgid="3759686152778772111">"Tlačítko je teď ve stavu %s"</string>
<string name="setting_location" msgid="4459859689227893838">"Poloha"</string>
<string name="setting_back_camera_photo" msgid="256738900473265017">"Zadní fotoaparát – fotky"</string>
<string name="setting_back_camera_video" msgid="5220819479408164689">"Zadní fotoaparát – video"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 008852e..086591e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -296,7 +296,7 @@
<string name="mode_photosphere" msgid="5082338476237291833">"360°-ko panoramika"</string>
<string name="mode_timelapse" msgid="1517168724627815453">"Denbora-bitartea"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"Angeluhandia"</string>
- <string name="mode_panorama" msgid="6882648621305828861">"Panoramika"</string>
+ <string name="mode_panorama" msgid="6882648621305828861">"Argazki panoramikoa"</string>
<string name="mode_refocus" msgid="172192967119469061">"Fokatze-efektua"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"Aldatu kamera modura"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"Aldatu bideokamerara"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1aa1a9c..6cc07d3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -87,7 +87,7 @@
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Ajastimen ääni"</string>
- <string name="setting_off" msgid="6782191065550276632">"Ei käyt."</string>
+ <string name="setting_off" msgid="6782191065550276632">"Ei käytössä"</string>
<string name="setting_on" msgid="9086728135773197891">"KÄYTÖSSÄ"</string>
<string name="pref_video_quality_title" msgid="5887153490982738588">"Videon laatu"</string>
<string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Intervallikuvaus"</string>
@@ -227,7 +227,7 @@
<string name="capital_on" msgid="1118214824959797269">"KÄYTÖSSÄ"</string>
<string name="capital_off" msgid="3020696135020167263">"EI KÄYTÖSSÄ"</string>
<string name="video_control_play" msgid="6895236811408921715">"Toista video"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Ei käyt."</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Ei käytössä"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 sekuntia"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 sekunti"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1,5 sekuntia"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6b84551..37fcd70 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -303,7 +303,7 @@
<string name="mode_photosphere_desc" msgid="2403816283825579161">"Cambiar ao modo Fotografía esférica"</string>
<string name="mode_panorama_desc" msgid="6023020404237519590">"Cambiar ao modo de panorámica"</string>
<string name="mode_refocus_desc" msgid="6171183297515508465">"Cambiar ao modo Efecto de enfoque"</string>
- <string name="settings_open_desc" msgid="6914471293841793766">"Abrir a configuración"</string>
+ <string name="settings_open_desc" msgid="6914471293841793766">"Abrir configuración"</string>
<string name="settings_close_desc" msgid="3095831199632813127">"Pechar a configuración"</string>
<string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus desactivado"</string>
<string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus activado"</string>
@@ -357,9 +357,9 @@
<string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Alta"</string>
<string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
<string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
- <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480 p"</string>
- <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720 p"</string>
- <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080 p"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
<string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
<string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD de 4K"</string>
<string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s megapíxeles"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4c4159a..7680ecf 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -22,14 +22,14 @@
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
<string name="set_image" msgid="3969690281401045698">"फ़ोटो को इस रूप में सेट करें"</string>
<string name="delete" msgid="2714492172818940424">"हटाएं"</string>
- <string name="share" msgid="8581089487762243115">"साझा करें"</string>
- <string name="share_panorama" msgid="3558466186935359444">"पैनोरामा को साझा करें"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"फ़ोटो के रूप में साझा करें"</string>
+ <string name="share" msgid="8581089487762243115">"शेयर करें"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"पैनोरामा को शेयर करें"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"फ़ोटो के रूप में शेयर करें"</string>
<string name="deleted" msgid="2036165115527228127">"हटाया गया"</string>
<string name="undo" msgid="5110048345890050107">"वापस लाएं"</string>
<string name="details" msgid="4404020741542549488">"विवरण"</string>
<string name="close" msgid="4826166926297479820">"बंद करें"</string>
- <string name="show_on_map" msgid="8542853913632649160">"मानचित्र पर दिखाएं"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"मैप पर दिखाएं"</string>
<string name="rotate_left" msgid="2618440058490662604">"बाएं घुमाएं"</string>
<string name="rotate_right" msgid="4896096424267838355">"दाएं घुमाएं"</string>
<string name="edit" msgid="2776879395749004347">"संपादित करें"</string>
@@ -329,7 +329,7 @@
<string name="done_button_description" msgid="1334963435441544592">"पूर्ण"</string>
<string name="retake_button_description" msgid="4234613030674787714">"फिर से लें"</string>
<string name="review_button_description" msgid="7932122063748430080">"समीक्षा करें"</string>
- <string name="share_button_description" msgid="5108508790540832053">"साझा करें"</string>
+ <string name="share_button_description" msgid="5108508790540832053">"शेयर करें"</string>
<string name="view_button_description" msgid="4985768837891362075">"देखें"</string>
<string name="edit_button_description" msgid="98550816724901925">"संपादित करें"</string>
<string name="delete_button_description" msgid="2251065309677200911">"हटाएं"</string>
@@ -370,7 +370,7 @@
<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>
+ <string name="share_to" msgid="5144911209144798122">"इनसे शेयर करें:"</string>
<string name="edit_with" msgid="615569327230783971">"इससे संपादित करें:"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"आगे"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"ठीक है, समझ लिया"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7dbf7c1..63294dc 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -319,8 +319,8 @@
<string name="torch_off_desc" msgid="8304675202998742618">"Լապտերն անջատված է"</string>
<string name="camera_id_back_desc" msgid="3566327490758890635">"Հետևի տեսախցիկ"</string>
<string name="camera_id_front_desc" msgid="7497517948130254220">"Առջևի տեսախցիկ"</string>
- <string name="grid_lines_off_desc" msgid="2022385817190451353">"Ցանցային գծերն անջատված են"</string>
- <string name="grid_lines_on_desc" msgid="4601540461914364817">"Ցանցային գծերը միացված են"</string>
+ <string name="grid_lines_off_desc" msgid="2022385817190451353">"Ցանցագծերն անջատված են"</string>
+ <string name="grid_lines_on_desc" msgid="4601540461914364817">"Ցանցագծերը միացված են"</string>
<string name="countdown_timer_off" msgid="1663008439564495948">"Հետհաշվարկի ժամաչափն անջատված է"</string>
<string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Հետհաշվարկի ժամաչափի տևողությունը սահմանված է 3 վայրկյան"</string>
<string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Հետհաշվարկի ժամաչափի տևողությունը սահմանված է 10 վայրկյան"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 54a8add..1392a0d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"Kamera Default"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Bantuan & masukan"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Memproses HDR+ …"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"Lisensi sumber terbuka"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Lisensi open source"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Setelan Umum"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Resolusi & kualitas"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Tentang"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 64a6ba6..d4f65f6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -158,7 +158,7 @@
<string name="pref_camera_id_label_front" msgid="349308803062874842">"מצלמה אחורית"</string>
<string name="dialog_ok" msgid="774141340500181131">"אישור"</string>
<string name="dialog_cancel" msgid="692365061128351656">"בטל"</string>
- <string name="dialog_report" msgid="7616428760369876209">"דווח"</string>
+ <string name="dialog_report" msgid="7616428760369876209">"דיווח"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"סגור"</string>
<string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"הגעת למגבלת הגודל."</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b27004f..13b7f71 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -348,7 +348,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/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3f54fb1..7dc363e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -22,10 +22,10 @@
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
<string name="set_image" msgid="3969690281401045698">"चित्र या रूपात सेट करा"</string>
<string name="delete" msgid="2714492172818940424">"हटवा"</string>
- <string name="share" msgid="8581089487762243115">"सामायिक करा"</string>
- <string name="share_panorama" msgid="3558466186935359444">"पॅनोरामा सामायिक करा"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"फोटो म्हणून सामायिक करा"</string>
- <string name="deleted" msgid="2036165115527228127">"हटविला"</string>
+ <string name="share" msgid="8581089487762243115">"शेअर करा"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"पॅनोरामा शेअर करा"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"फोटो म्हणून शेअर करा"</string>
+ <string name="deleted" msgid="2036165115527228127">"हटवला"</string>
<string name="undo" msgid="5110048345890050107">"पूर्ववत करा"</string>
<string name="details" msgid="4404020741542549488">"तपशील"</string>
<string name="close" msgid="4826166926297479820">"बंद करा"</string>
@@ -62,13 +62,13 @@
<string name="flash_on" msgid="6573457197393807642">"फ्लॅश टाकला"</string>
<string name="flash_off" msgid="7889323512830926273">"फ्लॅश नाही"</string>
<string name="unknown" msgid="564184550182858146">"अज्ञात"</string>
- <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"हा आयटम स्थानिकरित्या संचयित केलेला आहे आणि ऑफलाइन उपलब्ध आहे."</string>
+ <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"हा आयटम स्थानिकरित्या स्टोअर केलेला आहे आणि ऑफलाइन उपलब्ध आहे."</string>
<string name="please_wait" msgid="1416313324505140068">"कृपया प्रतीक्षा करा"</string>
<string name="camera_error_title" msgid="6200558085072670067">"कॅमेरा एरर"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"कॅमेर्याशी कनेक्ट करु शकत नाही."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"सुरक्षा धोरणांमुळे कॅमेरा अक्षम केला गेला आहे."</string>
- <string name="error_media_storage_failure" msgid="7711687330673245629">"आपला फोटो किंवा व्हिडिओ जतन करण्यात समस्या आली."</string>
- <string name="error_permissions" msgid="3454167403425651254">"अॅपला चालविण्यासाठी आवश्यक गंभीर परवानग्या नाहीत. कृपया आपल्या परवानग्या सेटिंग्ज तपासा."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"तुमचा फोटो किंवा व्हिडिओ सेव्ह करण्यात समस्या आली."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"अॅपला चालविण्यासाठी आवश्यक गंभीर परवानग्या नाहीत. कृपया तुमच्या परवानग्या सेटिंग्ज तपासा."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"फोटो संचयन बिघाड."</string>
<string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा करा..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"कॅमेरा वापरण्यापूर्वी SD कार्ड घाला."</string>
@@ -76,14 +76,14 @@
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD कार्डमध्ये प्रवेश करु शकलो नाही."</string>
<string name="time_lapse_title" msgid="3267978566401228497">"वेळ समाप्ती रेकॉर्डिंग"</string>
<string name="feedback_description_camera_access" msgid="419090951070170132">"कॅमेर्याशी अॅप कनेक्ट करणे शक्य झाले नाही"</string>
- <string name="feedback_description_save_photo" msgid="8658767358989083228">"फोटो किंवा व्हिडिओ डिव्हाइस मध्ये जतन झाला नाही."</string>
+ <string name="feedback_description_save_photo" msgid="8658767358989083228">"फोटो किंवा व्हिडिओ डिव्हाइस मध्ये सेव्ह झाला नाही."</string>
<string name="capturing" msgid="5255164204641920893">"कॅप्चर करत आहे"</string>
<string name="pref_camera_id_title" msgid="4680648115225411185">"कॅमेरा निवडा"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"परत"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"समोर"</string>
<string name="pref_camera_save_location_title" msgid="2344235620113384017">"स्थान सेव्ह करा"</string>
<string name="pref_camera_location_label" msgid="8695441802378057719">"स्थान"</string>
- <string name="pref_camera_timer_title" msgid="4728838281741571323">"उलटगणती टाइमर"</string>
+ <string name="pref_camera_timer_title" msgid="4728838281741571323">"उलटगणती टायमर"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"उलटगणती दरम्यान बीप"</string>
@@ -141,7 +141,7 @@
<string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"रात्र"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"सूर्यास्त"</string>
<string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"पार्टी"</string>
- <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"टाइमर बंद"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"टायमर बंद"</string>
<string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 सेकंद"</string>
<string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 सेकंद"</string>
<string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 सेकंद"</string>
@@ -160,15 +160,15 @@
<string name="dialog_cancel" msgid="692365061128351656">"रद्द करा"</string>
<string name="dialog_report" msgid="7616428760369876209">"अहवाल द्या"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"डिसमिस करा"</string>
- <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"आपल्या SD कार्डावरील स्थान समाप्त झाले आहे. गुणवत्ता सेटिंग बदला किंवा काही इमेज किंवा इतर फायली हटवा."</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"तुमच्या SD कार्डावरील स्थान समाप्त झाले आहे. गुणवत्ता सेटिंग बदला किंवा काही इमेज किंवा इतर फायली हटवा."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"आकार मर्यादा गाठली."</string>
<string name="pano_too_fast_prompt" msgid="2503148095578052177">"खूप जलद"</string>
<string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"पॅनोरामा तयार करत आहे"</string>
- <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"पॅनोरामा जतन करु शकलो नाही."</string>
+ <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"पॅनोरामा सेव्ह करु शकलो नाही."</string>
<string name="pano_dialog_title" msgid="6662642763395425145">"पॅनोरामा"</string>
<string name="pano_capture_indication" msgid="4002128831255023954">"पॅनोरामा कॅप्चर करत आहे"</string>
<string name="pano_dialog_waiting_previous" msgid="2646847402743245320">"मागील पॅनोरामासाठी प्रतीक्षा करत आहे"</string>
- <string name="pano_review_saving_indication_str" msgid="4691771283450663293">"जतन करत आहे..."</string>
+ <string name="pano_review_saving_indication_str" msgid="4691771283450663293">"सेव्ह करत आहे..."</string>
<string name="pano_review_rendering" msgid="2743087719999377155">"पॅनोरामा प्रस्तुत करत आहे"</string>
<string name="tap_to_focus" msgid="3519718196270593468">"फोकस करण्यासाठी स्पर्श करा."</string>
<string name="pref_video_effect_title" msgid="594570613431209010">"प्रभाव"</string>
@@ -181,7 +181,7 @@
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"लहान डोळे"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"अंतराळात"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"सूर्यास्त"</string>
- <string name="effect_backdropper_gallery" msgid="2333888391153564920">"आपला व्हिडिओ"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"तुमचा व्हिडिओ"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"रेकॉर्डिंग करताना फोटो घेण्यासाठी स्पर्श करा."</string>
<string name="video_recording_started" msgid="3374878415050991030">"व्हिडिओ रेकॉर्डिंग सुरू झाले."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"व्हिडिओ रेकॉर्डिंग थांबविले."</string>
@@ -219,7 +219,7 @@
<string name="btn_mode_list_toggle" msgid="3986242443098400164">"मोड सूची"</string>
<string name="accessibility_filmstrip_toggle" msgid="6966978483643396442">"फिल्मस्ट्रीप टॉगल करा"</string>
<string name="btn_filmstrip_toggle" msgid="3666693972882351490">"फिल्मस्ट्रीप"</string>
- <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"झूम वाढवा"</string>
+ <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"झूम इन करा"</string>
<string name="btn_zoom_plus" msgid="4645138949375961656">"Z+"</string>
<string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"झूम कमी करा"</string>
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
@@ -276,13 +276,13 @@
<string name="set_duration" msgid="1638453882581604341">"कालावधी सेकंदांमध्ये सेट करा"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"फोटो घेण्यासाठी उलट गणना करत आहे"</string>
<string name="remember_location_title" msgid="3045040613094030429">"फोटो स्थान लक्षात ठेवायचे?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"आपले फोटो आणि व्हिडिओ जिथून घेतले त्या स्थानांसह ते टॅग करा."</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"तुमचे फोटो आणि व्हिडिओ जिथून घेतले त्या स्थानांसह ते टॅग करा."</string>
<string name="remember_location_no" msgid="4412802756840226925">"नाही, नको"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"होय"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"अधिक पर्याय"</string>
<string name="camera_menu_settings_label" msgid="3862756725328016822">"सेटिंग्ज"</string>
<string name="create_tiny_planet" msgid="5186918191372107343">"लहान ग्रह तयार करा"</string>
- <string name="saving_tiny_planet" msgid="8828265180177375494">"लहान प्लॅनेट जतन करत आहे …"</string>
+ <string name="saving_tiny_planet" msgid="8828265180177375494">"लहान प्लॅनेट सेव्ह करत आहे …"</string>
<string name="tiny_planet_zoom" msgid="2985522360577158474">"झूम करा"</string>
<string name="tiny_planet_rotate" msgid="5445336705705350004">"चक्राकृती फिरवा"</string>
<string name="photo_editor" msgid="1521994560971367225">"फोटो संपादक"</string>
@@ -329,7 +329,7 @@
<string name="done_button_description" msgid="1334963435441544592">"पूर्ण झाले"</string>
<string name="retake_button_description" msgid="4234613030674787714">"पुनःचित्रीकरण करा"</string>
<string name="review_button_description" msgid="7932122063748430080">"पुनरावलोकन"</string>
- <string name="share_button_description" msgid="5108508790540832053">"सामायिक करा"</string>
+ <string name="share_button_description" msgid="5108508790540832053">"शेअर करा"</string>
<string name="view_button_description" msgid="4985768837891362075">"पहा"</string>
<string name="edit_button_description" msgid="98550816724901925">"संपादित करा"</string>
<string name="delete_button_description" msgid="2251065309677200911">"हटवा"</string>
@@ -369,8 +369,8 @@
<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>
- <string name="share_to" msgid="5144911209144798122">"यावर सामायिक करा"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"तुम्ही हे नंतर सेटिंग्ज मध्ये बदलू शकता."</string>
+ <string name="share_to" msgid="5144911209144798122">"यावर शेअर करा"</string>
<string name="edit_with" msgid="615569327230783971">"सह संपादित करा"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"पुढील"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"ठीक आहे, समजले"</string>
@@ -378,5 +378,5 @@
<string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"क्रॉप केलेला सेन्सर \n(16:9)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
<string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
- <string name="session_saving_image" msgid="8932315404486416826">"जतन करत आहे..."</string>
+ <string name="session_saving_image" msgid="8932315404486416826">"सेव्ह करत आहे..."</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 7f6524b..9406b2b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -374,8 +374,8 @@
<string name="edit_with" msgid="615569327230783971">"...နှင့် တည်းဖြတ်ရန်"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"ရှေ့သို့"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"OK၊ ရပါပြီ"</string>
- <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"အာရုံခံပုံ အပြည့် \n(4:3)"</string>
- <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"အာရုံခံကိရိယာမှ ဖြတ်ထား\n(16:9)"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"အာရုံခံပုံ အပြည့် \n(၄x၃)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"အာရုံခံကိရိယာမှ ဖြတ်ထား\n(၁၆x၉)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"၀"</string>
<string name="pref_boolean_true" msgid="4131945223998878009">"၁"</string>
<string name="session_saving_image" msgid="8932315404486416826">"သိမ်းနေစဉ်…"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2028a69..c2c4aca 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -68,7 +68,7 @@
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"क्यामेरासँग जडान गर्न सक्दैन।"</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"सुरक्षा नीतिहरूका कारण क्यामरा निष्क्रिय गरिएको छ।"</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"तपाईँको तस्बिर वा भिडियो सुरक्षित गर्दा एउटा समस्या भयो।"</string>
- <string name="error_permissions" msgid="3454167403425651254">"सञ्चालन गर्नका लागि अनुप्रयोगसँग अति आवश्यकता अनुमति छैन। कृपया तपाईँको अनुमति सेटिङहरू जाँच गर्नुहोस्।"</string>
+ <string name="error_permissions" msgid="3454167403425651254">"सञ्चालन गर्नाका लागि अनुप्रयोगसँग अति आवश्यकता अनुमति छैन। कृपया तपाईँको अनुमति सेटिङहरू जाँच गर्नुहोस्।"</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"तस्बिर भण्डारण विफलता।"</string>
<string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा गर्नुहोस्..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"क्यामेराको उपयोग गर्नु अघि एउटा SD कार्ड भित्र राख्नुहोस्।"</string>
@@ -156,7 +156,7 @@
<string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONT CAMERA"</string>
<string name="pref_camera_id_label_front" msgid="349308803062874842">"BACK CAMERA"</string>
- <string name="dialog_ok" msgid="774141340500181131">"ठीक छ"</string>
+ <string name="dialog_ok" msgid="774141340500181131">"ठिक छ"</string>
<string name="dialog_cancel" msgid="692365061128351656">"रद्द गर्नुहोस्"</string>
<string name="dialog_report" msgid="7616428760369876209">"रिपोर्ट गर्नुहोस्"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"खारेज गर्नुहोस्"</string>
@@ -377,7 +377,7 @@
<string name="share_to" msgid="5144911209144798122">"साझेदारी गर्नुहोस्"</string>
<string name="edit_with" msgid="615569327230783971">"संग सम्पादन गर्नुहोस्"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"NEXT"</string>
- <string name="confirm_button_text" msgid="7389949384482206814">"ठीक छ, बुझे"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"ठिक छ, बुझे"</string>
<string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"पूर्ण सेन्सरर \n(४:३)"</string>
<string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"क्रप गरिएको सेन्सर \n(१६:९)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"०"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9ed674e..b12090c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -346,7 +346,7 @@
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Fotocamera voorzijde"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Videocamera voorzijde"</string>
<string name="setting_default_camera" msgid="6954076799301004779">"Standaardcamera"</string>
- <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Help en feedback"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Hulp en feedback"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ verwerken…"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Open-sourcelicenties"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Algemene instellingen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b1dd567..3dfd5fa 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -347,7 +347,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"Video ya kamera ya nyuma"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Picha ya kamera ya mbele"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Video ya kamera ya mbele"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguo-msingi"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguomsingi"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Usaidizi na maoni"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Inachakata HDR+ ..."</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Leseni za programu huria"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index b31a2e9..828edb1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -111,7 +111,7 @@
<string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"O‘chiq"</string>
<string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"AVTO CHAQNOQ"</string>
<string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"CHAQNOQ YONIQ"</string>
- <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"CHAQNOQ O‘CHIQ"</string>
+ <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"CHAQNOQ YOQILMAGAN"</string>
<string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"Oq rang muvozanati"</string>
<string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"OQ RANG MUVOZANATI"</string>
<string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Avto"</string>
@@ -129,9 +129,9 @@
<string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
<string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
<string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ YONIQ"</string>
- <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ O‘CHIQ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ YOQILMAGAN"</string>
<string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR YONIQ"</string>
- <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR O‘CHIQ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR YOQILMAGAN"</string>
<string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Harakat"</string>
<string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Tunda"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Quyosh botishi"</string>
@@ -141,7 +141,7 @@
<string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"TUN"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"QUYOSH BOTISHI"</string>
<string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"BAZM KECHASI"</string>
- <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TAYMER O‘CHIQ"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TAYMER YOQILMAGAN"</string>
<string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 SONIYA"</string>
<string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SONIYA"</string>
<string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SONIYA"</string>
@@ -225,7 +225,7 @@
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
<string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Miqyos qiymati – %.1f"</string>
<string name="capital_on" msgid="1118214824959797269">"YONIQ"</string>
- <string name="capital_off" msgid="3020696135020167263">"O‘CHIQ"</string>
+ <string name="capital_off" msgid="3020696135020167263">"YOQILMAGAN"</string>
<string name="video_control_play" msgid="6895236811408921715">"Videoni ijro etish"</string>
<string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"O‘chiq"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0.5 soniya"</string>
@@ -277,7 +277,7 @@
<string name="count_down_title_text" msgid="7586031110595513050">"Rasm suratga olish uchun ortga sanalmoqda"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Suratga olish joyi saqlansinmi?"</string>
<string name="remember_location_prompt" msgid="3006013504489919474">"Rasm va videolaringizga suratga olish joyi haqidagi ma’lumotni qo‘shing."</string>
- <string name="remember_location_no" msgid="4412802756840226925">"Yo‘q, kerak emas"</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"Kerak emas"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Ha"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"QO‘SHIMCHA MOSLAMALAR"</string>
<string name="camera_menu_settings_label" msgid="3862756725328016822">"Sozlamalar"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ab3a655..39b2e7e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -283,7 +283,7 @@
<string name="camera_menu_settings_label" msgid="3862756725328016822">"设置"</string>
<string name="create_tiny_planet" msgid="5186918191372107343">"创建小星球图片"</string>
<string name="saving_tiny_planet" msgid="8828265180177375494">"正在保存小星球图片…"</string>
- <string name="tiny_planet_zoom" msgid="2985522360577158474">"缩放"</string>
+ <string name="tiny_planet_zoom" msgid="2985522360577158474">"变焦"</string>
<string name="tiny_planet_rotate" msgid="5445336705705350004">"旋转"</string>
<string name="photo_editor" msgid="1521994560971367225">"照片编辑器"</string>
<string name="crop_save" msgid="2841974981340098579">"保存"</string>
diff --git a/src/com/android/camera/AccessibilityUtil.java b/src/com/android/camera/AccessibilityUtil.java
index 155a149..3b4c8f5 100644
--- a/src/com/android/camera/AccessibilityUtil.java
+++ b/src/com/android/camera/AccessibilityUtil.java
@@ -2,7 +2,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.Context;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
+import androidx.core.view.accessibility.AccessibilityManagerCompat;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Button;
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f08aae9..8efc25f 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -29,6 +29,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
@@ -158,6 +159,7 @@
import com.bumptech.glide.MemoryCategory;
import com.bumptech.glide.load.DecodeFormat;
import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor;
+import com.android.camera.exif.ExifInterface;
import com.google.common.base.Optional;
import com.google.common.logging.eventprotos;
@@ -1431,7 +1433,7 @@
mOnCreateTime = System.currentTimeMillis();
mAppContext = getApplicationContext();
mMainHandler = new MainHandler(this, getMainLooper());
- mLocationManager = new LocationManager(mAppContext);
+ mLocationManager = new LocationManager(mAppContext, shouldUseNoOpLocation());
mOrientationManager = new OrientationManagerImpl(this, mMainHandler);
mSettingsManager = getServices().getSettingsManager();
mSoundPlayer = new SoundPlayer(mAppContext);
@@ -1730,6 +1732,35 @@
}
/**
+ * Incase the calling package doesn't have ACCESS_FINE_LOCATION permissions, we should not pass
+ * it valid location information in exif.
+ */
+ private boolean shouldUseNoOpLocation () {
+ String callingPackage = getCallingPackage();
+ if (callingPackage == null) {
+ // Activity not started through startActivityForResult.
+ return false;
+ }
+ PackageInfo packageInfo = null;
+ try {
+ packageInfo = getPackageManager().getPackageInfo(callingPackage,
+ PackageManager.GET_PERMISSIONS);
+ } catch (Exception e) {
+ Log.w(TAG, "Unable to get PackageInfo for callingPackage " + callingPackage);
+ }
+ if (packageInfo != null) {
+ for (int i = 0; i < packageInfo.requestedPermissions.length; i++) {
+ if (packageInfo.requestedPermissions[i].equals(
+ Manifest.permission.ACCESS_FINE_LOCATION) &&
+ (packageInfo.requestedPermissionsFlags[i] &
+ PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+ /**
* Call this whenever the mode drawer or filmstrip change the visibility
* state.
*/
diff --git a/src/com/android/camera/SoundPlayer.java b/src/com/android/camera/SoundPlayer.java
index ff3f37f..6e76eb5 100644
--- a/src/com/android/camera/SoundPlayer.java
+++ b/src/com/android/camera/SoundPlayer.java
@@ -17,6 +17,7 @@
package com.android.camera;
import android.content.Context;
+import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.SoundPool;
import android.util.SparseIntArray;
@@ -39,8 +40,14 @@
*/
public SoundPlayer(Context appContext) {
mAppContext = appContext;
- final int audioType = getAudioTypeForSoundPool();
- mSoundPool = new SoundPool(1 /* max streams */, audioType, 0 /* quality */);
+ mSoundPool = new SoundPool.Builder()
+ .setMaxStreams(1)
+ .setAudioAttributes(new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+ .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
+ .build())
+ .build();
}
/**
@@ -86,10 +93,4 @@
public boolean isReleased() {
return mIsReleased;
}
-
- private static int getAudioTypeForSoundPool() {
- // STREAM_SYSTEM_ENFORCED is hidden API.
- return ApiHelper.getIntFieldIfExists(AudioManager.class,
- "STREAM_SYSTEM_ENFORCED", null, AudioManager.STREAM_RING);
- }
}
diff --git a/src/com/android/camera/app/NoOpLocationProvider.java b/src/com/android/camera/app/NoOpLocationProvider.java
new file mode 100644
index 0000000..1cdbda3
--- /dev/null
+++ b/src/com/android/camera/app/NoOpLocationProvider.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.camera.app;
+
+import android.content.Context;
+import android.location.Location;
+
+/**
+ * Dummy Location provider to be used when location information shouldn't be provided to the client.
+ */
+public class NoOpLocationProvider implements LocationProvider {
+
+ public NoOpLocationProvider(Context context) {
+ }
+
+ @Override
+ public Location getCurrentLocation() {
+ return null;
+ }
+
+ @Override
+ public void recordLocation(boolean recordLocation) {
+ }
+
+ @Override
+ public void disconnect() {
+ }
+}
diff --git a/src/com/android/camera/burst/RingBuffer.java b/src/com/android/camera/burst/RingBuffer.java
index 04fa7de..d5090c2 100644
--- a/src/com/android/camera/burst/RingBuffer.java
+++ b/src/com/android/camera/burst/RingBuffer.java
@@ -16,7 +16,7 @@
package com.android.camera.burst;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import com.android.camera.async.SafeCloseable;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
diff --git a/src/com/android/camera/captureintent/CaptureIntentSession.java b/src/com/android/camera/captureintent/CaptureIntentSession.java
index 6fb22c6..bdc0ea8 100644
--- a/src/com/android/camera/captureintent/CaptureIntentSession.java
+++ b/src/com/android/camera/captureintent/CaptureIntentSession.java
@@ -33,6 +33,8 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import javax.annotation.Nonnull;
/**
@@ -149,7 +151,15 @@
@Override
public synchronized ListenableFuture<Optional<Uri>> saveAndFinish(byte[] data, int width,
int height, int orientation, ExifInterface exif) {
- mSessionNotifier.notifySessionPictureDataAvailable(data, orientation);
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ try {
+ exif.writeExif(data, byteArrayOutputStream);
+ } catch (IOException e) {
+ Log.e(TAG, "exception while trying to append exif to jpeg data");
+ }
+ byte[] dataWithExif = byteArrayOutputStream.toByteArray();
+ //No need to close byteArrayOutputStream since that has no effect.
+ mSessionNotifier.notifySessionPictureDataAvailable(dataWithExif, orientation);
return Futures.immediateFuture(Optional.<Uri> absent());
}
diff --git a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
index a4b5a9b..031c610 100644
--- a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
+++ b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
@@ -34,6 +34,8 @@
import com.android.camera.util.ApiHelper;
import com.google.common.base.Optional;
+import java.util.Hashtable;
+
import javax.annotation.Nonnull;
/**
@@ -62,9 +64,19 @@
}
private final CameraManager mCameraManager;
+ private Hashtable<Facing, String> mCameraFacingCache = new Hashtable<Facing, String>();
public Camera2OneCameraManagerImpl(CameraManager cameraManger) {
mCameraManager = cameraManger;
+
+ //Camera facing queries depending on camera implementation can be
+ //expensive and involve additional IPC with side effects. Cache front&
+ //back camera ids as early as possible.
+ if (mCameraManager != null) {
+ mCameraFacingCache.clear();
+ findFirstCameraFacing(Facing.BACK);
+ findFirstCameraFacing(Facing.FRONT);
+ }
}
@Override
@@ -122,11 +134,19 @@
/** Returns the ID of the first camera facing the given direction. */
private String findCameraId(Facing facing) {
- if (facing == Facing.FRONT) {
- return findFirstFrontCameraId();
- } else {
- return findFirstBackCameraId();
+ String id = mCameraFacingCache.get(facing);
+ if (id != null) {
+ return id;
}
+
+ if (facing == Facing.FRONT) {
+ id = findFirstFrontCameraId();
+ } else {
+ id = findFirstBackCameraId();
+ }
+
+ mCameraFacingCache.put(facing, id);
+ return id;
}
/** Returns the ID of the first back-facing camera. */
diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index b431594..a35a6c1 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -39,7 +39,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.SystemClock;
-import android.support.v4.util.Pools;
+import androidx.core.util.Pools;
import android.view.Surface;
import com.android.camera.CaptureModuleUtil;
diff --git a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
index 95d2523..86721ac 100644
--- a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
+++ b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.autofocus;
import android.hardware.camera2.CaptureResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
index 4b8e8fc..cb4edd7 100644
--- a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
+++ b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.photo.zsl;
import android.hardware.camera2.CameraAccessException;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
import com.android.camera.async.BufferQueue;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/processing/ProcessingService.java b/src/com/android/camera/processing/ProcessingService.java
index c67ebd6..1e48095 100644
--- a/src/com/android/camera/processing/ProcessingService.java
+++ b/src/com/android/camera/processing/ProcessingService.java
@@ -27,7 +27,7 @@
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.Process;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.camera.app.CameraServices;
import com.android.camera.app.CameraServicesImpl;
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index edfcfac..c2e060a 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -31,7 +31,7 @@
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
import android.view.MenuItem;
import com.android.camera.FatalErrorHandler;
diff --git a/src/com/android/camera/util/AndroidContext.java b/src/com/android/camera/util/AndroidContext.java
index 6fc50c4..72f3478 100644
--- a/src/com/android/camera/util/AndroidContext.java
+++ b/src/com/android/camera/util/AndroidContext.java
@@ -17,7 +17,7 @@
package com.android.camera.util;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
* Initializable singleton for providing the application level context
diff --git a/src_pd/com/android/camera/app/LocationManager.java b/src_pd/com/android/camera/app/LocationManager.java
index 6a3440b..90839b0 100644
--- a/src_pd/com/android/camera/app/LocationManager.java
+++ b/src_pd/com/android/camera/app/LocationManager.java
@@ -31,10 +31,12 @@
LocationProvider mLocationProvider;
private boolean mRecordLocation;
- public LocationManager(Context context) {
- Log.d(TAG, "Using legacy location provider.");
- LegacyLocationProvider llp = new LegacyLocationProvider(context);
- mLocationProvider = llp;
+ public LocationManager(Context context, boolean NoOpLocationProvider) {
+ Log.d(TAG, "Using " +
+ (NoOpLocationProvider ? "NoOpLocationProvider" : "LegacyLocationProvider"));
+ LocationProvider lp = NoOpLocationProvider ? new NoOpLocationProvider(context) :
+ new LegacyLocationProvider(context);
+ mLocationProvider = lp;
}
/**
