am 8b08754f: am 5f78d4ef: Merge "Update BT folder icon." into gingerbread
Merge commit '8b08754fe9d87d6f6f3b19b81330622889ac8264'
* commit '8b08754fe9d87d6f6f3b19b81330622889ac8264':
Update BT folder icon.
diff --git a/Android.mk b/Android.mk
index 0efe204..12f4db5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,7 @@
LOCAL_PACKAGE_NAME := Bluetooth
LOCAL_JAVA_LIBRARIES := javax.obex
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard
LOCAL_CERTIFICATE := platform
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 820a008..20d5088 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -96,7 +96,7 @@
<string name="status_unknown_error" msgid="7441602228720350817">"Erro desconhecido"</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recebido"</string>
<string name="download_success" msgid="7036160438766730871">"Recepção completa de <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
- <string name="upload_success" msgid="4014469387779648949">"Envio de <xliff:g id="FILE_SIZE">%1$s</xliff:g> concluído"</string>
+ <string name="upload_success" msgid="4014469387779648949">"Envio de <xliff:g id="FILE_SIZE">%1$s</xliff:g> concluído "</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Transferências de entrada"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Transferências de saída"</string>
<string name="no_transfers" msgid="3482965619151865672">"O histórico de transferências está vazio."</string>
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
index 74fefc8..cccbd0d 100755
--- a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
@@ -22,17 +22,18 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
import android.net.Uri;
-import android.pim.vcard.VCardBuilder;
-import android.pim.vcard.VCardConfig;
-import android.pim.vcard.VCardConstants;
-import android.pim.vcard.VCardUtils;
-import android.pim.vcard.VCardComposer.OneEntryHandler;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
import android.text.TextUtils;
import android.text.format.Time;
import android.util.Log;
+import com.android.vcard.VCardBuilder;
+import com.android.vcard.VCardConfig;
+import com.android.vcard.VCardConstants;
+import com.android.vcard.VCardUtils;
+import com.android.vcard.VCardComposer.OneEntryHandler;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index 8db1503..dc206a9 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -36,9 +36,6 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.pim.vcard.VCardComposer;
-import android.pim.vcard.VCardConfig;
-import android.pim.vcard.VCardComposer.OneEntryHandler;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
import android.provider.ContactsContract.CommonDataKinds;
@@ -49,6 +46,9 @@
import android.util.Log;
import com.android.bluetooth.R;
+import com.android.vcard.VCardComposer;
+import com.android.vcard.VCardConfig;
+import com.android.vcard.VCardComposer.OneEntryHandler;
import java.io.IOException;
import java.io.OutputStream;