Merge N-MR1 to remote branch.

Change-Id: Ie3013b799b1b8ca2ce11b9e2d7c1d07d5f22668a

7 files changed, 24 insertions, 35 deletions

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index c80e07ec2..6b845514d 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -361,7 +361,7 @@
     <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_qvga" msgid="342600517453781430">"QVGA"</string>
-    <string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD de 4 K"</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>
     <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s megapíxeles"</string>
     <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Para volver enfocar, toca aquí"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 3b2ea82d7..7a4116bde 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -23,7 +23,7 @@
     <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_panorama" msgid="3558466186935359444">"Կիսվել համայնապատկերով"</string>
     <string name="share_as_photo" msgid="4831213580709167218">"Տարածել որպես լուսանկար"</string>
     <string name="deleted" msgid="2036165115527228127">"Ջնջված է"</string>
     <string name="undo" msgid="5110048345890050107">"ՀԵՏԱՐԿԵԼ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 776a66c7e..377d23161 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -32,7 +32,7 @@
     <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>
+    <string name="edit" msgid="2776879395749004347">"ಎಡಿಟ್"</string>
     <string name="crop_action" msgid="6933589718464132714">"ಕತ್ತರಿಸಿ"</string>
     <string name="trim_action" msgid="4736803320203951827">"ಟ್ರಿಮ್"</string>
     <string name="set_as" msgid="5469055085024870081">"ಹೀಗೆ ಹೊಂದಿಸಿ"</string>
@@ -285,7 +285,7 @@
     <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>
+    <string name="photo_editor" msgid="1521994560971367225">"ಫೋಟೋ ಎಡಿಟರ್"</string>
     <string name="crop_save" msgid="2841974981340098579">"ಉಳಿಸು"</string>
     <string name="cannot_load_image" msgid="4100136187076585580">"ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"ಫಿಲ್ಮ್‌ಸ್ಟ್ರಿಪ್ ವೀಕ್ಷಣೆ"</string>
@@ -331,7 +331,7 @@
     <string name="review_button_description" msgid="7932122063748430080">"ಪರಿಶೀಲಿಸು"</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="edit_button_description" msgid="98550816724901925">"ಎಡಿಟ್"</string>
     <string name="delete_button_description" msgid="2251065309677200911">"ಅಳಿಸು"</string>
     <string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"ಮ್ಯಾನುಯಲ್ ಮಾನ್ಯತೆ ಪರಿಹಾರ"</string>
     <string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"ಮಾನ್ಯತೆ ಪರಿಹಾರ -2"</string>
@@ -371,7 +371,7 @@
     <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="edit_with" msgid="615569327230783971">"ಇವರ ಜೊತೆಗೆ ಸಂಪಾದಿಸಿ"</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>
     <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"ಪೂರ್ಣ ಸೆನ್ಸಾರ್ \n(4:3)"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0fcc80cf7..412af6eb2 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="1175086483881127797">"Фотоапарат"</string>
+    <string name="app_name" msgid="1175086483881127797">"Камера"</string>
     <string name="video_camera_label" msgid="1723708322021743770">"Видео камера"</string>
     <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
     <string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
@@ -188,7 +188,7 @@
     <string name="clear_effects" msgid="6192797848995967992">"Отстрани ефекти"</string>
     <string name="effect_silly_faces" msgid="7952713419757286453">"ГЛУПАВИ ЛИЦА"</string>
     <string name="effect_background" msgid="1358432220077975015">"ЗАДНИНА"</string>
-    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Бленда"</string>
+    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Експозиција"</string>
     <string name="accessibility_cancel_button" msgid="5679989494636116448">"Откажи"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"Копче „Мени“"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"Поле за избор %1$s"</string>
@@ -207,7 +207,7 @@
     <string name="media_accessibility_peek" msgid="234540330161031946">"Успешно снимено"</string>
     <string name="photo_accessibility_peek" msgid="5934133371001677250">"Фотографирано"</string>
     <string name="video_accessibility_peek" msgid="7845916149291383132">"Снимено е видео"</string>
-    <string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"Отклучи кон Фотоапарат"</string>
+    <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>
@@ -291,7 +291,7 @@
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Приказ на филмска лента"</string>
     <string name="setting_wallpaper" msgid="2397759659347872725">"Поставување тапет"</string>
     <string name="mode_settings" msgid="2021937261522670921">"Поставки"</string>
-    <string name="mode_camera" msgid="279763925715250603">"Фотоапарат"</string>
+    <string name="mode_camera" msgid="279763925715250603">"Камера"</string>
     <string name="mode_video" msgid="8633929034048169139">"Видео"</string>
     <string name="mode_photosphere" msgid="5082338476237291833">"Фотосфера"</string>
     <string name="mode_timelapse" msgid="1517168724627815453">"Забрзано снимање"</string>
@@ -309,9 +309,9 @@
     <string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Плус е вклучено"</string>
     <string name="hdr_off_desc" msgid="7921924739852874675">"HDR исклучено"</string>
     <string name="hdr_on_desc" msgid="4591284110249047558">"HDR е вклучено"</string>
-    <string name="flash_off_desc" msgid="7151559466286106797">"Блицот е исклучен"</string>
+    <string name="flash_off_desc" msgid="7151559466286106797">"Без блиц"</string>
     <string name="flash_auto_desc" msgid="3009043125539675717">"Автоматски блиц"</string>
-    <string name="flash_on_desc" msgid="930372145324854699">"Блицот е вклучен"</string>
+    <string name="flash_on_desc" msgid="930372145324854699">"Со блиц"</string>
     <string name="hdr_plus_flash_off_desc" msgid="5335888906983788789">"Блицот ХДР+ е исклучен"</string>
     <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"Блицот ХДР+ е автоматски"</string>
     <string name="hdr_plus_flash_on_desc" msgid="8323389161987561284">"Блицот ХДР+ е вклучен"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 415b1fba4..681de9ffd 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -21,7 +21,7 @@
     <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
     <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="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>
@@ -157,7 +157,7 @@
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"အရှေ့ကင်မရာ"</string>
     <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_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>
@@ -189,7 +189,7 @@
     <string name="effect_silly_faces" msgid="7952713419757286453">"အသုံးမကျသောမျက်နှာများ"</string>
     <string name="effect_background" msgid="1358432220077975015">"နောက်ခံ"</string>
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"ရှပ်တာ"</string>
-    <string name="accessibility_cancel_button" msgid="5679989494636116448">"မလုပ်တော့ပါ"</string>
+    <string name="accessibility_cancel_button" msgid="5679989494636116448">"မလုပ်တော့"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"မီနူးခလုတ်"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"%1$s မှတ်သားကွက်"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"ဓာတ်ပုံသို့ပြောင်းရန်"</string>
@@ -278,7 +278,7 @@
     <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="remember_location_yes" msgid="4339424460683531388">"Yes"</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">"Tiny Planet ဖန်တီးရန်"</string>
@@ -286,7 +286,7 @@
     <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>
+    <string name="crop_save" msgid="2841974981340098579">"သိမ်းရန်"</string>
     <string name="cannot_load_image" msgid="4100136187076585580">"ပုံတင်လို့မရပါ!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip မြင်ကွင်း"</string>
     <string name="setting_wallpaper" msgid="2397759659347872725">"နောက်ခံ ရွေးနေစဉ်"</string>
@@ -325,14 +325,14 @@
     <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"အချိန်စေ့ တိုင်မား ကြာချိန်ကို ၃ စက္ကန့်မှာ သတ်မှတ်ထား"</string>
     <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"အချိန်စေ့ တိုင်မား ကြာချိန်ကို ၁၀ စက္ကန့်မှာ သတ်မှတ်ထား"</string>
     <string name="more_options_desc" msgid="4628738800610478353">"ပိုမိုရွေးချယ်စရာများ"</string>
-    <string name="cancel_button_description" msgid="3801167024006905033">"မလုပ်တော့ပါ"</string>
+    <string name="cancel_button_description" msgid="3801167024006905033">"မလုပ်တော့"</string>
     <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="view_button_description" msgid="4985768837891362075">"မြင်ကွင်း"</string>
     <string name="edit_button_description" msgid="98550816724901925">"ပြင်ဆင်ရန်"</string>
-    <string name="delete_button_description" msgid="2251065309677200911">"ဖျက်ပစ်ရန်"</string>
+    <string name="delete_button_description" msgid="2251065309677200911">"ဖျက်ရန်"</string>
     <string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"လက်ဖြင့် အလင်းဖွင့်ပေးမှုကို အစားထိုးပေးခြင်း"</string>
     <string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"အလင်းဖွင့်ပေးမှုကို အစားထိုးပေးခြင်း -၂"</string>
     <string name="exposure_compensation_desc_n1" msgid="3035027224866688267">"အလင်းဖွင့်ပေးမှုကို အစားထိုးပေးခြင်း -၁"</string>
@@ -372,7 +372,7 @@
     <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="startup_dialog_button_next" msgid="1011831256978228993">"ရှေ့သို့"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"အိုကေ၊ ရပါပြီ"</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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e7c4246a5..d9327fa2e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -362,8 +362,8 @@
     <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 4K"</string>
-    <string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s MP"</string>
-    <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s Mpx"</string>
+    <string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s Mpix"</string>
+    <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s Mpix"</string>
     <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Aby zmienić ostrość, dotknij tutaj"</string>
     <string name="pref_category_advanced" msgid="5921085080077574872">"Zaawansowane"</string>
     <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Ekspozycja ręczna"</string>
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 34659533f..9a941c73e 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1323,25 +1323,14 @@ public class VideoModule extends CameraModule
         // Store current ringer mode so we can set it once video recording is
         // finished.
         mOriginalRingerMode = mAudioManager.getRingerMode();
-        // Make sure no system sounds and vibrations happen during video
-        // recording.
-        try {
-            mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
-        } catch (SecurityException e) {
-            Log.e(TAG, "Error: " + e);
-        }
+        // TODO: Use new DND APIs to properly silence device
     }
 
     private void restoreRingerMode() {
         // First check if ringer mode was changed during the recording. If not,
         // re-set the mode that was set before video recording started.
         if (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT) {
-            // Set the original ringer mode back.
-            try {
-                mAudioManager.setRingerMode(mOriginalRingerMode);
-            } catch (SecurityException e) {
-                Log.e(TAG, "Error: " + e);
-            }
+            // TODO: Use new DND APIs to properly restore device notification/alarm settings
         }
     }