diff options
| -rw-r--r-- | res/values-ar/strings.xml | 12 | ||||
| -rw-r--r-- | src/com/android/nfc/NfcDispatcher.java | 5 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 5eceaf8..d7ec39f 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -8,14 +8,14 @@ <string name="outbound_me_profile_title" msgid="2523625031572784769">"اكتمل تفاعل NFC"</string> <string name="outbound_me_profile_text" msgid="5594998841143667989">"المس لمنح هذا الشخص معلومات اتصالك."</string> <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"تم تمكين NFC."</string> - <string name="touch" msgid="4727218133711188355">"المس لتبادل البيانات"</string> - <string name="beam_progress" msgid="7453634884807323920">"بيانات واردة..."</string> - <string name="beam_complete" msgid="477026736424637435">"اكتمل تبادل البيانات"</string> - <string name="beam_failed" msgid="5116241718189888630">"لم يكتمل تبادل البيانات"</string> - <string name="beam_canceled" msgid="5425192751826544741">"تم إلغاء تبادل البيانات"</string> + <string name="touch" msgid="4727218133711188355">"المس لرسم شعاع"</string> + <string name="beam_progress" msgid="7453634884807323920">"شعاع وارد..."</string> + <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="beam_touch_to_view" msgid="7853129156831642630">"المس ليتم العرض"</string> - <string name="beam_handover_not_supported" msgid="4083165921751489015">"جهاز المستلم لا يوفر نقل ملفات كبيرة عبر تبادل البيانات."</string> + <string name="beam_handover_not_supported" msgid="4083165921751489015">"جهاز المستلم لا يوفر نقل ملفات كبيرة عبر الشعاع."</string> <string name="connecting_headset" msgid="3929250919225573008">"جارٍ الاتصال..."</string> <string name="connected_headset" msgid="4047751837023241955">"متصل"</string> <string name="connect_headset_failed" msgid="7500801585498094863">"تعذر الاتصال"</string> diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java index b3ab97c..f628dea 100644 --- a/src/com/android/nfc/NfcDispatcher.java +++ b/src/com/android/nfc/NfcDispatcher.java @@ -305,7 +305,10 @@ public class NfcDispatcher { if (message == null) { return false; } - dispatch.setNdefIntent(); + Intent intent = dispatch.setNdefIntent(); + + // Bail out if the intent does not contain filterable NDEF data + if (intent == null) return false; // Try to start AAR activity with matching filter List<String> aarPackages = extractAarPackages(message); diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index 23602c9..c54f54e 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -183,7 +183,7 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, // We're only allowed to use hardware acceleration if // isHighEndGfx() returns true - otherwise, we're too limited // on resources to do it. - mHardwareAccelerated = ActivityManager.isHighEndGfx(mDisplay); + mHardwareAccelerated = ActivityManager.isHighEndGfx(); int hwAccelerationFlags = mHardwareAccelerated ? WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED : 0; |