Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3bd9b8f0: Fix build breakage.

Browse Source 
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
This commit is contained in:
Daisuke Miyakawa
2010-09-02 13:46:55 -07:00
committed by Android Git Automerger
parent 22a17ce60b 3bd9b8f04c
commit b2b973d13e
8 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tests/coretests/res/raw/v21_im.vcf Normal file
View File

@@ -0,0 +1,5 @@
BEGIN:VCARD
VERSION:2.1
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nick;1;;;;;;;;;;;;;
X-GOOGLE-TALK:hhh@gmail.com
END:VCARD

7
core/tests/coretests/res/raw/v21_invalid_multiple_line.vcf Normal file
View File

@@ -0,0 +1,7 @@
BEGIN:VCARD
VERSION:2.1
N:;Omega;;;
EMAIL;INTERNET:"Omega"
<omega@example.com>
FN:Omega
END:VCARD

4
core/tests/coretests/res/raw/v30_comma_separated.vcf
View File

@@ -1,5 +1,5 @@
BEGIN:VCARD
VERSION:3.0
N:F;G;M;;
TEL;TYPE=PAGER,WORK,MSG:6101231234@pagersample.com
N;TYPE=PREF,HOME:F;G;M;;
TEL;TYPE="COMMA,SEPARATED:INSIDE.DQUOTE",PREF:1
END:VCARD

5
core/tests/coretests/res/raw/v30_pager.vcf Normal file
View File

@@ -0,0 +1,5 @@
BEGIN:VCARD
VERSION:3.0
N:F;G;M;;
TEL;TYPE=PAGER,WORK,MSG:6101231234@pagersample.com
END:VCARD

6
core/tests/coretests/res/raw/v40_sort_as.vcf Normal file
View File

@@ -0,0 +1,6 @@
BEGIN:VCARD
VERSION:4.0
FN:安藤 ロイド
N;SORT-AS="あんどう;ろいど":安藤;ロイド;;;
ORG;TYPE=WORK;SORT-AS="ぐーぐる;けんさくぶもん":グーグル;検索部門
END:VCARD

5
core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java
View File

@@ -15,10 +15,13 @@
*/
package android.pim.vcard;
import com.android.internal.R;
import com.android.frameworks.coretests.R;
import android.content.ContentValues;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet;
import android.pim.vcard.test_utils.VCardTestsBase;
import android.pim.vcard.test_utils.ContentValuesVerifier;
import android.pim.vcard.test_utils.ContentValuesVerifierElem;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.Im;

4
core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java
View File

@@ -16,7 +16,11 @@
package android.pim.vcard;
import android.content.ContentValues;
import android.pim.vcard.test_utils.ContactEntry;
import android.pim.vcard.test_utils.ContentValuesBuilder;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet;
import android.pim.vcard.test_utils.VCardTestsBase;
import android.provider.ContactsContract.CommonDataKinds.Nickname;
import android.provider.ContactsContract.CommonDataKinds.Note;
import android.provider.ContactsContract.CommonDataKinds.Phone;

3
core/tests/coretests/src/android/pim/vcard/VCardTestUtilsTests.java
View File

@@ -15,8 +15,9 @@
*/
package android.pim.vcard;
import com.android.internal.R;
import com.android.frameworks.coretests.R;
import android.pim.vcard.test_utils.VCardVerifier;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.test.AndroidTestCase;