am f7a151e2: Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1
* commit 'f7a151e2fe02af5026d6aad37447f13bff60c56a':
Remove static background image from Beam when no hw-acceleration.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ceb2128..42b76e2 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,23 +4,23 @@
<string name="nfcUserLabel">Nfc</string>
<!-- The label for the NFC admin permission -->
- <string name="permlab_nfcAdmin">control Near Field Communication secure hardware</string>
+ <string name="permlab_nfcAdmin">control NFC secure hardware</string>
<!-- The description for the NFC admin permission -->
- <string name="permdesc_nfcAdmin">Allows this application to control the secure hardware used with Near Field Communication,
+ <string name="permdesc_nfcAdmin">Allows the app to control the secure hardware used with NFC,
for example, to modify payment credentials.</string>
<!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
<string name="inbound_me_profile_title">Contact received over NFC</string>
<!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
- <string name="inbound_me_profile_text">Tap to add this person as a contact</string>
+ <string name="inbound_me_profile_text">Touch to add this person as a contact.</string>
<!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
<string name="outbound_me_profile_title">NFC interaction complete</string>
<!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
- <string name="outbound_me_profile_text">Tap to give this person your contact info</string>
+ <string name="outbound_me_profile_text">Touch to give this person your contact info.</string>
<!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_nfc_enabled">NFC enabled.</string>
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 337930e..f46f144 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -601,7 +601,7 @@
@Override
public boolean isNdefPushEnabled() throws RemoteException {
synchronized (NfcService.this) {
- return mIsNdefPushEnabled;
+ return mState == NfcAdapter.STATE_ON && mIsNdefPushEnabled;
}
}
diff --git a/tests/Android.mk b/tests/Android.mk
index 3ba329b..be8dff1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,4 +1,4 @@
-# Copyright 2008, The Android Open Source Project
+# Copyright 2011, 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.
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 035bb4c..8d5ef35 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -27,8 +27,8 @@
<!--
This declares that this app uses the instrumentation test runner targeting
- the package of com.android.email. To run the tests use the command:
- "adb shell am instrument -w com.android.email.tests/android.test.InstrumentationTestRunner"
+ the package of com.android.nfc3. To run the tests use the command:
+ "adb shell am instrument -w com.android.nfc.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.nfc3"