Merge "Change Bluetooth HID Profile Name (5/6)"
am: 42c5395d6f
Change-Id: I37879c26d7ed1670e48a00ecbc9b07c9c9af8edf
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 267e6ac..b9eb7be 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,6 +54,7 @@
<uses-permission android:name="android.permission.DISPATCH_NFC_MESSAGE" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
+ <uses-permission android:name="android.permission.ACCESS_VR_MANAGER"/>
<uses-permission android:name="android.permission.USER_ACTIVITY" />
<uses-permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE" />
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index cf5474a..7dc5f07 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -9,7 +9,7 @@
<string name="beam_outgoing" msgid="4679536649779123495">"বীম হচ্ছে..."</string>
<string name="beam_complete" msgid="477026736424637435">"বীম সম্পূর্ণ"</string>
<string name="beam_failed" msgid="5116241718189888630">"বীম সস্পূর্ণ হয়নি"</string>
- <string name="beam_canceled" msgid="5425192751826544741">"বীম বাতিল হয়েছে"</string>
+ <string name="beam_canceled" msgid="5425192751826544741">"বিম বাতিল হয়েছে"</string>
<string name="cancel" msgid="61873902552555096">"বাতিল"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"দেখতে আলতো চাপ দিন"</string>
<string name="beam_handover_not_supported" msgid="4083165921751489015">"রিসিভার এর ডিভাইস বীমের মাধ্যমে বড় ফাইল স্থানান্তর সমর্থন করে না।"</string>
@@ -21,19 +21,19 @@
<string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> সংযোগ করা যায়নি"</string>
<string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন করা হচ্ছে"</string>
<string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন হয়েছে"</string>
- <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা হচ্ছে"</string>
- <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা যায়নি"</string>
+ <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> চেনানো হচ্ছে"</string>
+ <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> চেনানো যায়নি"</string>
<string name="failed_to_enable_bt" msgid="7229153323594758077">"ব্লুটুথ সক্ষম করা যায়নি"</string>
<string name="confirm_pairing" msgid="4112568077038265363">"আপনি কি <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ব্লুটুথ ডিভাইসটি যুক্ত করার ব্যাপারে নিশ্চিত?"</string>
<string name="pair_yes" msgid="3525614878559994448">"হ্যাঁ"</string>
<string name="pair_no" msgid="5022308368904055020">"না"</string>
- <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> এর মাধ্যমে অর্থ প্রদানের জন্য আবার আলতো চাপুন"</string>
+ <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> এর মাধ্যমে পেমেন্টের জন্য আবার আলতো চাপুন"</string>
<string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> এর মাধ্যমে সম্পূর্ণ করতে আবার আলতো চাপুন"</string>
<string name="transaction_failure" msgid="7828102078637936513">"<xliff:g id="APP">%1$s</xliff:g> এর সঙ্গে লেনদেন সম্পন্ন করা যায়নি।"</string>
<string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> ব্যবহার করা যায়নি।"</string>
<string name="pay_with" msgid="5531545488795798945">"এর মাধ্যমে অর্থ পরিশোধ করুন"</string>
<string name="complete_with" msgid="6797459104103012992">"এর সঙ্গে সম্পূর্ণ করুন"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"আপনার পছন্দের “আলতো চাপুন ও অর্থ প্রদান করুন” পরিষেবা সরানো হয়েছে। অন্য কিছু চয়ন করবেন?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"আপনার পছন্দের “আলতো চাপুন ও পেমেন্ট করুন” পরিষেবা সরানো হয়েছে। অন্য কিছু চয়ন করবেন?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"সম্পূর্ণ করতে অন্য ডিভাইস আলতো চাপুন"</string>
<string name="wifi_connect" msgid="6250727951843550671">"সংযুক্ত করুন"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"নেটওয়ার্কের সাথে সংযুক্ত হওয়া যায়নি"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b416876..7d8b777 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -33,7 +33,7 @@
<string name="could_not_use_app" msgid="8137587876138569083">"Aplikaci <xliff:g id="APP">%1$s</xliff:g> nelze použít."</string>
<string name="pay_with" msgid="5531545488795798945">"Platební metoda"</string>
<string name="complete_with" msgid="6797459104103012992">"Dokončit pomocí"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu dotykem telefonu byla odstraněna. Chcete vybrat jinou?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu přiložením telefonu byla odstraněna. Chcete vybrat jinou?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"Akci dokončíte tím, že se zařízením dotknete jiného zařízení"</string>
<string name="wifi_connect" msgid="6250727951843550671">"Připojit"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"K síti se nelze připojit."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bbe141f..f17f7e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -4,7 +4,7 @@
<string name="app_name" msgid="78565911793142902">"NFC-Dienst"</string>
<string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
<string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC aktiviert"</string>
- <string name="tap_to_beam" msgid="5819197866281059878">"Zum Übertragen tippen"</string>
+ <string name="tap_to_beam" msgid="5819197866281059878">"Zum Beamen tippen"</string>
<string name="beam_progress" msgid="7453634884807323920">"Beam wird empfangen..."</string>
<string name="beam_outgoing" msgid="4679536649779123495">"Beamen..."</string>
<string name="beam_complete" msgid="477026736424637435">"Beamen abgeschlossen"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4b80460..ee9eedb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -23,8 +23,8 @@
<string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ડિસ્કનેક્ટ કર્યું"</string>
<string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ની જોડી કરી રહ્યું છે"</string>
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ની જોડી કરી શકાઈ નથી"</string>
- <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth સક્ષમ કરી શકાયું નથી"</string>
- <string name="confirm_pairing" msgid="4112568077038265363">"શું તમે ખરેખર Bluetooth ની ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરવા માંગો છો?"</string>
+ <string name="failed_to_enable_bt" msgid="7229153323594758077">"બ્લૂટૂથ સક્ષમ કરી શકાયું નથી"</string>
+ <string name="confirm_pairing" msgid="4112568077038265363">"શું તમે ખરેખર બ્લૂટૂથ ની ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરવા માંગો છો?"</string>
<string name="pair_yes" msgid="3525614878559994448">"હા"</string>
<string name="pair_no" msgid="5022308368904055020">"નહીં"</string>
<string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> થી ચૂકવણી કરવા માટે ફરીથી ટેપ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7494945..765a844 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -10,11 +10,11 @@
<string name="beam_complete" msgid="477026736424637435">"बीम करना पूर्ण"</string>
<string name="beam_failed" msgid="5116241718189888630">"बीम पूर्ण नहीं हुआ"</string>
<string name="beam_canceled" msgid="5425192751826544741">"बीम रद्द"</string>
- <string name="cancel" msgid="61873902552555096">"अभी नहीं"</string>
+ <string name="cancel" msgid="61873902552555096">"रद्द करें"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"देखने के लिए टैप करें"</string>
<string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ता का डिवाइस, बीम द्वारा बड़ी फ़ाइल के स्थानांतरण का समर्थन नहीं करता."</string>
<string name="beam_try_again" msgid="3364677301009783455">"डिवाइस को पुन: एक साथ लाएं"</string>
- <string name="beam_busy" msgid="5253335587620612576">"Beam वर्तमान में व्यस्त है. पिछला ट्रांसफर पूर्ण हो जाने पर पुन: प्रयास करें."</string>
+ <string name="beam_busy" msgid="5253335587620612576">"बीम अभी व्यस्त है. पिछला ट्रांसफर पूरा हो जाने पर फिर से कोशिश करें."</string>
<string name="device" msgid="4459621591392478151">"डिवाइस"</string>
<string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को कनेक्ट किया जा रहा है"</string>
<string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को कनेक्ट किया गया"</string>
@@ -40,6 +40,6 @@
<string name="status_wifi_connected" msgid="5893022897732105739">"कनेक्ट किया गया"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"नेटवर्क से कनेक्ट करें"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> नेटवर्क से कनेक्ट करें?"</string>
- <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam के लिए NFC को सक्षम किया जाना आवश्यक है. क्या आप उसे सक्षम करना चाहते हैं?"</string>
- <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
+ <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android बीम के लिए नियर फ़ील्ड कम्यूनिकेशन (NFC) को सक्षम करना ज़रूरी है. क्या आप इसे सक्षम करना चाहते हैं?"</string>
+ <string name="android_beam" msgid="1666446406999492763">"Android बीम"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1d3b0a1..d6b395a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -4,7 +4,7 @@
<string name="app_name" msgid="78565911793142902">"Layanan Nfc"</string>
<string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
<string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC diaktifkan."</string>
- <string name="tap_to_beam" msgid="5819197866281059878">"Ketuk untuk memancarkan"</string>
+ <string name="tap_to_beam" msgid="5819197866281059878">"Tap untuk beam"</string>
<string name="beam_progress" msgid="7453634884807323920">"Pancaran yang masuk..."</string>
<string name="beam_outgoing" msgid="4679536649779123495">"Memancarkan..."</string>
<string name="beam_complete" msgid="477026736424637435">"Beam selesai"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 533c147..c2306d2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -24,7 +24,7 @@
<string name="pairing_peripheral" msgid="6983626861540899365">"מבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"לא ניתן לבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="failed_to_enable_bt" msgid="7229153323594758077">"לא ניתן להפעיל Bluetooth"</string>
- <string name="confirm_pairing" msgid="4112568077038265363">"האם אתה בטוח שברצונך להתאים את מכשיר ה-Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+ <string name="confirm_pairing" msgid="4112568077038265363">"בטוח שברצונך להתאים את מכשיר ה-Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="pair_yes" msgid="3525614878559994448">"כן"</string>
<string name="pair_no" msgid="5022308368904055020">"לא"</string>
<string name="tap_again_to_pay" msgid="5754988005412859897">"הקש שוב כדי לשלם באמצעות <xliff:g id="APP">%1$s</xliff:g>"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0001a2f..9396153 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -35,7 +35,7 @@
<string name="complete_with" msgid="6797459104103012992">"ഇതുപയോഗിച്ച് പൂർത്തിയാക്കുക"</string>
<string name="default_pay_app_removed" msgid="4108250545457437360">"\'ടാപ്പുചെയ്ത് പണമടയ്ക്കുക\' എന്നതിനായി നിങ്ങൾ തിരഞ്ഞെടുത്ത സേവനം നീക്കംചെയ്തു. മറ്റൊന്ന് തിരഞ്ഞെടുക്കണോ?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"പൂർത്തിയാക്കുന്നതിന് മറ്റൊരു ഉപകരണം ടാപ്പുചെയ്യുക"</string>
- <string name="wifi_connect" msgid="6250727951843550671">"കണക്റ്റുചെയ്യുക"</string>
+ <string name="wifi_connect" msgid="6250727951843550671">"കണക്റ്റ് ചെയ്യുക"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"നെറ്റ്വർക്കിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല"</string>
<string name="status_wifi_connected" msgid="5893022897732105739">"കണക്റ്റുചെയ്തു"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"നെറ്റ്വർക്കിൽ കണക്റ്റുചെയ്യുക"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8175f3a..4070a39 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -12,7 +12,7 @@
<string name="beam_canceled" msgid="5425192751826544741">"बीम रद्द"</string>
<string name="cancel" msgid="61873902552555096">"रद्द करा"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"पाहण्यासाठी टॅप करा"</string>
- <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्त्याचे डिव्हाइस बीमद्वारे मोठी फाईल स्थानांतरीत करण्यास समर्थन देत नाही."</string>
+ <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्त्याचे डिव्हाइस बीमद्वारे मोठी फाईल स्थानांतरीत करण्यास सपोर्ट करत नाही."</string>
<string name="beam_try_again" msgid="3364677301009783455">"डिव्हाइसेस पुन्हा एकत्र आणा"</string>
<string name="beam_busy" msgid="5253335587620612576">"बीम करणे सध्या व्यस्त आहे. मागील स्थानांतरीत करणे पूर्ण झाल्यानंतर पुन्हा प्रयत्न करा."</string>
<string name="device" msgid="4459621591392478151">"डिव्हाइस"</string>
@@ -21,10 +21,10 @@
<string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> कनेक्ट करणे शक्य झाले नाही"</string>
<string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करीत आहे"</string>
<string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट केले"</string>
- <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडणी करीत आहे"</string>
+ <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> पेअर करत आहे"</string>
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडणे शक्य झाले नाही"</string>
- <string name="failed_to_enable_bt" msgid="7229153323594758077">"ब्लूटुथ सक्षम करू शकलो नाही"</string>
- <string name="confirm_pairing" msgid="4112568077038265363">"आपण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटुथ डिव्हाइस जोडू इच्छिता याची आपल्याला खात्री आहे?"</string>
+ <string name="failed_to_enable_bt" msgid="7229153323594758077">"ब्लूटूथ सक्षम करू शकलो नाही"</string>
+ <string name="confirm_pairing" msgid="4112568077038265363">"तुम्ही <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ डिव्हाइस जोडू इच्छिता याची तुम्हाला खात्री आहे?"</string>
<string name="pair_yes" msgid="3525614878559994448">"होय"</string>
<string name="pair_no" msgid="5022308368904055020">"नाही"</string>
<string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> सह देय देण्यासाठी पुन्हा टॅप करा"</string>
@@ -33,8 +33,8 @@
<string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> वापरू शकलो नाही."</string>
<string name="pay_with" msgid="5531545488795798945">"यासह देय द्या"</string>
<string name="complete_with" msgid="6797459104103012992">"यासह पूर्ण करा"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"टॅप करा आणि देय द्या साठीची आपली प्राधान्यकृत सेवा काढली. दुसरी निवडायची?"</string>
- <string name="ask_nfc_tap" msgid="2925239870458286340">"पूर्ण करण्यासाठी दुसरा डिव्हाइस टॅप करा"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"टॅप आणि पे साठीची आपली अग्रमानांकित सेवा काढली. दुसरी निवडायची?"</string>
+ <string name="ask_nfc_tap" msgid="2925239870458286340">"पूर्ण करण्यासाठी दुसरे डिव्हाइस टॅप करा"</string>
<string name="wifi_connect" msgid="6250727951843550671">"कनेक्ट करा"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"नेटवर्कशी कनेक्ट करण्यात अक्षम"</string>
<string name="status_wifi_connected" msgid="5893022897732105739">"कनेक्ट केले"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4f937e5..bce7686 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -11,8 +11,8 @@
<string name="beam_failed" msgid="5116241718189888630">"ਬੀਮ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ"</string>
<string name="beam_canceled" msgid="5425192751826544741">"ਬੀਮ ਰੱਦ ਕੀਤਾ"</string>
<string name="cancel" msgid="61873902552555096">"ਰੱਦ ਕਰੋ"</string>
- <string name="beam_tap_to_view" msgid="7430394753262448349">"ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
- <string name="beam_handover_not_supported" msgid="4083165921751489015">"ਰਿਸੀਵਰ ਦੀ ਡੀਵਾਈਸ ਬੀਮ ਰਾਹੀਂ ਵੱਡੀ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ।"</string>
+ <string name="beam_tap_to_view" msgid="7430394753262448349">"ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
+ <string name="beam_handover_not_supported" msgid="4083165921751489015">"ਪ੍ਰਾਪਤਕਰਤਾ ਦਾ ਡੀਵਾਈਸ ਬੀਮ ਰਾਹੀਂ ਵੱਡੀ ਫ਼ਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ।"</string>
<string name="beam_try_again" msgid="3364677301009783455">"ਡਿਵਾਈਸਾਂ ਨੂੰ ਦੁਬਾਰਾ ਇਕੱਠੇ ਨਾਲ ਲਿਆਓ"</string>
<string name="beam_busy" msgid="5253335587620612576">"ਬੀਮ ਇਸ ਵੇਲੇ ਰੁੱਝਾ ਹੋਇਆ ਹੈ। ਜਦੋਂ ਪਿਛਲਾ ਟ੍ਰਾਂਸਫਰ ਪੂਰਾ ਹੋ ਜਾਏ ਤਾਂ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
<string name="device" msgid="4459621591392478151">"ਡੀਵਾਈਸ"</string>
@@ -23,8 +23,8 @@
<string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</string>
<string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
- <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth ਨੂੰ ਸਮਰੱਥ ਨਹੀਂ ਬਣਾ ਸਕਿਆ"</string>
- <string name="confirm_pairing" msgid="4112568077038265363">"ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ ਤੇ Bluetooth ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+ <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
+ <string name="confirm_pairing" msgid="4112568077038265363">"ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ ਤੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
<string name="pair_yes" msgid="3525614878559994448">"ਹਾਂ"</string>
<string name="pair_no" msgid="5022308368904055020">"ਨਹੀਂ"</string>
<string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਪੇ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
@@ -34,12 +34,12 @@
<string name="pay_with" msgid="5531545488795798945">"ਇਸ ਨਾਲ ਪੇ ਕਰੋ"</string>
<string name="complete_with" msgid="6797459104103012992">"ਇਸ ਨਾਲ ਪੂਰਾ ਕਰੋ"</string>
<string name="default_pay_app_removed" msgid="4108250545457437360">"ਟੈਪ ਕਰੋ & ਪੇ ਕਰੋ ਲਈ ਤੁਹਾਡੀ ਤਰਜੀਹੀ ਸੇਵਾ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ। ਕੀ ਦੂਜੀ ਚੁਣਨੀ ਹੈ?"</string>
- <string name="ask_nfc_tap" msgid="2925239870458286340">"ਪੂਰਾ ਕਰਨ ਲਈ ਦੂਜੀ ਡੀਵਾਈਸ ਨੂੰ ਟੈਪ ਕਰੋ।"</string>
+ <string name="ask_nfc_tap" msgid="2925239870458286340">"ਪੂਰਾ ਕਰਨ ਲਈ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਟੈਪ ਕਰੋ।"</string>
<string name="wifi_connect" msgid="6250727951843550671">"ਕਨੈਕਟ ਕਰੋ"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"</string>
<string name="status_wifi_connected" msgid="5893022897732105739">"ਕਨੈਕਟ ਕੀਤਾ"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"ਕੀ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
- <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android ਬੀਮ ਲਈ NFC ਨੂੰ ਸਮਰਥਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+ <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android ਬੀਮ ਲਈ NFC ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਾਲੂ ਕਰਨ ਚਾਹੁੰਦੇ ਹੋ?"</string>
<string name="android_beam" msgid="1666446406999492763">"Android ਬੀਮ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 56fd1ea..7d146d2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,7 +31,7 @@
<string name="tap_again_to_complete" msgid="5423640945118279123">"Kliknij ponownie, by wykonać w <xliff:g id="APP">%1$s</xliff:g>"</string>
<string name="transaction_failure" msgid="7828102078637936513">"Tej transakcji nie można wykonać w <xliff:g id="APP">%1$s</xliff:g>."</string>
<string name="could_not_use_app" msgid="8137587876138569083">"Nie można użyć <xliff:g id="APP">%1$s</xliff:g>."</string>
- <string name="pay_with" msgid="5531545488795798945">"Zapłać w"</string>
+ <string name="pay_with" msgid="5531545488795798945">"Forma płatności"</string>
<string name="complete_with" msgid="6797459104103012992">"Wykonaj w"</string>
<string name="default_pay_app_removed" msgid="4108250545457437360">"Twoja preferowana usługa systemu Zbliż i zapłać została usunięta. Wybrać inną?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"Dotknij innego urządzenia, by zakończyć"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7d48d3f..7a4c939 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -33,7 +33,7 @@
<string name="could_not_use_app" msgid="8137587876138569083">"Haikuweza kutumia <xliff:g id="APP">%1$s</xliff:g>."</string>
<string name="pay_with" msgid="5531545488795798945">"Lipa kwa"</string>
<string name="complete_with" msgid="6797459104103012992">"Kamilisha kwa"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"Huduma unayopendelea ya kugonga na kulipa iliondolewa. Ungependa kuchagua nyingine?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"Huduma unayokuwa umechagua ya kugusisha ili ulipe imeondolewa. Ungependa kuchagua nyingine?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"Gonga kifaa kingine ili kukamilisha"</string>
<string name="wifi_connect" msgid="6250727951843550671">"Unganisha"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"Haiwezi kuunganisha kwenye mtandao"</string>
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 73e6e40..31a62f6 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -73,6 +73,8 @@
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.provider.Settings;
+import android.service.vr.IVrManager;
+import android.service.vr.IVrStateCallbacks;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
@@ -279,6 +281,9 @@
boolean mIsLiveCaseEnabled; // whether live cases are enabled
int mLiveCaseTechnology; // Technology mask of accepted NFC tags
+ private IVrManager vrManager;
+ boolean mIsVrModeEnabled;
+
public static NfcService getInstance() {
return sService;
}
@@ -484,6 +489,17 @@
new EnableDisableTask().execute(TASK_BOOT); // do blocking boot tasks
mHandler.sendEmptyMessageDelayed(MSG_UPDATE_STATS, STATS_UPDATE_INTERVAL_MS);
+
+ IVrManager mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
+ mContext.VR_SERVICE));
+ if (mVrManager != null) {
+ try {
+ mVrManager.registerListener(mVrStateCallbacks);
+ mIsVrModeEnabled = mVrManager.getVrModeState();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to register VR mode state listener: " + e);
+ }
+ }
}
void initSoundPool() {
@@ -727,6 +743,11 @@
Log.w(TAG, "Not playing sound when NFC is disabled");
return;
}
+
+ if (mIsVrModeEnabled) {
+ Log.d(TAG, "Not playing NFC sound when Vr Mode is enabled");
+ return;
+ }
switch (sound) {
case SOUND_START:
mSoundPool.play(mStartSound, 1.0f, 1.0f, 0, 0, 1.0f);
@@ -2403,6 +2424,15 @@
}
};
+ private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() {
+ @Override
+ public void onVrStateChanged(boolean enabled) {
+ synchronized (this) {
+ mIsVrModeEnabled = enabled;
+ }
+ }
+ };
+
/**
* for debugging only - no i18n
*/
diff --git a/src/com/android/nfc/snep/SnepMessenger.java b/src/com/android/nfc/snep/SnepMessenger.java
index 5cdab1d..5078fe8 100644
--- a/src/com/android/nfc/snep/SnepMessenger.java
+++ b/src/com/android/nfc/snep/SnepMessenger.java
@@ -202,9 +202,9 @@
}
if (NfcService.sIsDtaMode) {
- if (!mIsClient && (requestField == SnepMessage.RESPONSE_CONTINUE || // added for TC_S_BIT_B1_01_X
+ if (!mIsClient && (requestField == SnepMessage.RESPONSE_CONTINUE)|| // added for TC_S_BIT_B1_01_X
requestField == SnepMessage.RESPONSE_SUCCESS ||
- requestField == SnepMessage.RESPONSE_NOT_FOUND)) {
+ requestField == SnepMessage.RESPONSE_NOT_FOUND) {
if (DBG) Log.d(TAG, "errorneous response received, disconnecting client");
close();
}
