diff options
| -rwxr-xr-x | AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | migrate_nfc.txt | 6 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 1 | ||||
| -rw-r--r-- | src/com/android/nfc/P2pEventManager.java | 2 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 |
8 files changed, 8 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3ce49b8..b896e07 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.nfc3" + package="com.android.nfc" android:sharedUserId="android.uid.nfc" android:sharedUserLabel="@string/nfcUserLabel" > @@ -20,7 +20,7 @@ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.VIBRATE" /> - <application android:name="com.android.nfc.NfcService" + <application android:name=".NfcService" android:icon="@drawable/icon" android:label="@string/app_name" android:persistent="true" @@ -29,13 +29,13 @@ <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIEXGvR1H2lq6SEOC7O7rGHoAmAf-GHCR_EhLqzg" /> - <activity android:name="com.android.nfc.TechListChooserActivity" + <activity android:name=".TechListChooserActivity" android:theme="@*android:style/Theme.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:multiprocess="true" /> - <activity android:name="com.android.nfc.NfcRootActivity" + <activity android:name=".NfcRootActivity" android:theme="@*android:style/Theme.Translucent.NoTitleBar" android:excludeFromRecents="true" android:noHistory="true" diff --git a/CleanSpec.mk b/CleanSpec.mk index c236495..fc12f05 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -49,3 +49,5 @@ # ************************************************ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/app/Nfc.apk) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/app/NfcGoogle.apk) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/NfcGoogle_intermediates) diff --git a/migrate_nfc.txt b/migrate_nfc.txt index 6db107c..00e0d12 100644 --- a/migrate_nfc.txt +++ b/migrate_nfc.txt @@ -1,7 +1,3 @@ -# Migrate the mytag file from the old pacakge name -com.android.nfc3:com.android.nfc - files - # Migrate the prefs from the old package name -com.android.nfc3:com.android.nfc +com.android.nfc:com.android.nfc3 shared_prefs diff --git a/res/values/strings.xml b/res/values/strings.xml index 903103a..8732476 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name">Nfc Service</string> - <string name="nfcUserLabel">Nfc</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> diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 1fd5d69..dcbebf3 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -23,7 +23,6 @@ import com.android.nfc.DeviceHost.NfcDepEndpoint; import com.android.nfc.DeviceHost.TagEndpoint; import com.android.nfc.nxp.NativeNfcManager; import com.android.nfc.nxp.NativeNfcSecureElement; -import com.android.nfc3.R; import android.app.Application; import android.app.KeyguardManager; diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java index 6a00b43..5677a6f 100644 --- a/src/com/android/nfc/P2pEventManager.java +++ b/src/com/android/nfc/P2pEventManager.java @@ -23,8 +23,6 @@ import android.os.Handler; import android.os.Message; import android.os.Vibrator; -import com.android.nfc3.R; - /** * Manages vibration, sound and animation for P2P events. */ diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index 37ac6e0..6fc24d5 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -16,8 +16,6 @@ package com.android.nfc; -import com.android.nfc3.R; - import android.animation.Animator; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 8d5ef35..fa2380c 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -31,7 +31,7 @@ "adb shell am instrument -w com.android.nfc.tests/android.test.InstrumentationTestRunner" --> <instrumentation android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.android.nfc3" + android:targetPackage="com.android.nfc" android:label="Tests for Nfc."/> </manifest> |