diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-21 16:03:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-21 16:03:37 -0800 |
| commit | e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d (patch) | |
| tree | 7361948fd1adad57aba0f40e11958c906f139528 /src | |
| parent | 806a78272a812f274309bd902b319590a254a896 (diff) | |
| parent | 37bb7b23886d7c058f7e9589ee5522b4a467b1b0 (diff) | |
| download | packages_apps_nfc-e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d.zip packages_apps_nfc-e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d.tar.gz packages_apps_nfc-e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d.tar.bz2 | |
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
Diffstat (limited to 'src')
| -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 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index f94f5b0..03e39c2 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; |