aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-preview-6android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-mr1-iot-preview-6Paul Duffin
524cce0089 am: f40b38da25 am: 6db7eaee89 am: 886d7d1277 Change-Id: I9fc9b526e1ce01ecf07c04d2f12e6f5c59c732f4
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Paul Duffin
524cce0089 am: f40b38da25 am: 6db7eaee89 Change-Id: Ic239177bae70d78b29eb16acf3cc42e8f31983c3
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089Paul Duffin
am: f40b38da25 Change-Id: I2f3eee0caeb944a5b7962ab86e74ad2bb009caa9
2017-01-18Merge "Prepare for removal of legacy-test from default targets"Paul Duffin
am: 524cce0089 Change-Id: I3345eaf0c2d4c7cdfcf46258919cc450252e7bc7
2017-01-18Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot
2017-01-17Prepare for removal of legacy-test from default targetsPaul Duffin
In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Bug: 30188076 Test: make checkbuild Change-Id: Ic37712e161ed1daeff800fb10e21c9f59682efe7
2016-09-19Fix inconsistencies in RecurrenceSet.Sudheer Shanka
- Handle multi-line EXRULE and RDATE. - Fix existing tests. - Add more tests. Fixes: 31054618 Test: adb shell am instrument -w com.android.calendarcommon2.tests/android.test.InstrumentationTestRunner Change-Id: I73eb8dc876adb253e093d68685deefcc9b02953e
2013-04-03am 8d85c6c7: Split EXDATE with a Newline Delimiterandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-cts-4.4_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3.1_r1tools_r22.2nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-iot-preview-2master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaselollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewkitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devjb-mr2.0.0-releasejb-mr2-devidea133-weekly-releaseidea133Alon Albert
* commit '8d85c6c7a7f853ff25554dea9bc6403a75fb68ef': Split EXDATE with a Newline Delimiter
2013-04-03Split EXDATE with a Newline DelimiterAlon Albert
So we can support multiple exdate values. Bug: 8331334 Change-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f
2013-03-06Split EXDATE with a Newline Delimiterandroid-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9kitkat-releasekitkat-cts-releasejb-mr2.0-releasejb-mr2-releaseAlon Albert
So we can support multiple exdate values. Bug: 8331334 Change-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f
2013-02-25Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchupMichael Chan
2013-02-06Fix issue with invisible recurring appointmentsFredrik Hellén-Halme
Fixes that recurring appointments goes invisible when hit by the failsafe limit. There is still a hard limit in RecurrenceProcessor, but at least this limit is applied on a per-event basis, meaning that it's always possible to create new recurring appointments without them going invisible. Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
2013-02-06Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchupMichael Chan
2012-12-20Make this build in EclipseMichael Chan
Change-Id: Ib34de4361aaa93c5ee9d573557931f9e24905dd6
2012-11-19Fix issue with invisible recurring appointmentstools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospFredrik Hellén-Halme
Fixes that recurring appointments goes invisible when hit by the failsafe limit. There is still a hard limit in RecurrenceProcessor, but at least this limit is applied on a per-event basis, meaning that it's always possible to create new recurring appointments without them going invisible. Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
2012-09-06am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM ↵android-sdk-support_r11android-cts-4.2_r2jb-mr1.1-devjb-mr1-devMichael Chan
silliness * commit '504844526f1b7afec048c6d2976ffb332670d5ba': Rename calendarcommon to calendarcommon2 to workaround OEM silliness
2012-09-06am eb95cfa4: (-s ours) Merge remote-tracking branch \'goog/master\' into HEADIsaac Katzenelson
* commit 'eb95cfa41925d2c286075236688d6473999c954e':
2012-08-30Merge commit '501c5d48' into manualmergeandroid-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1-releaseYing Wang
Conflicts: Android.mk Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43
2012-08-15Rename calendarcommon to calendarcommon2 to workaround OEM sillinessMichael Chan
Change-Id: I5bd618866d6484037671376e192ee3217c42c366
2012-06-26Rename calendarcommon to calendarcommon2 to workaround OEM sillinessMichael Chan
Change-Id: I5bd618866d6484037671376e192ee3217c42c366
2012-06-21Merge remote-tracking branch 'goog/master' into HEADIsaac Katzenelson
Conflicts: Android.mk Change-Id: Ibf661a0b8c1d198ee01998405b81bb7919c17aaf
2012-05-18Reconcile with jb-release nakasi-factoryrom-releasetools_r21The Android Open Source Project
Change-Id: I46443846579ecb49a3af90fc2065ba249840c007
2012-05-17merge in jb-release history after reset to jb-devandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releaseThe Android Automerger
2012-05-16am 18428249: Add README fileAlice Yang
* commit '184282491e4dce14515afe22b0a6efbf2cc608ed': Add README file
2012-05-16Add README fileandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devAlice Yang
For instructions on how to build and run the calendar-common unit tests. Change-Id: I70d5ac33e80cce230dd4694a1061a84423332f7a
2012-05-16am a991358d: Allow ";;"Alice Yang
* commit 'a991358d94947cc0dbd6a8d75dd77b5fd377734b': Allow ";;"
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: I60b68feb036d2d484b705490d68113c856a611b9
2012-05-15Allow ";;"Alice Yang
Allow for consecutive ";" in rules for recurring events. Bug 6312732 Change-Id: I3bd82b7818cd755eec7129ca6497746a91cb6653
2012-04-18merge in jb-release history after reset to masterThe Android Automerger
2012-04-17Make some methods publicAlon Albert
Bug: 6276478 Change-Id: I6725b01b14881347e3324c403e099217ab6e2057
2012-03-21merge in jb-release history after reset to masterThe Android Automerger
2012-03-20merge in jb-release history after reset to masterThe Android Automerger
2012-03-19Move Duration class from CalendarProviderAlon Albert
Change-Id: I9a354fe360376c43da2290535a038bd6ab4facd3
2012-01-19am 90c6616a: am bbcfb960: Catch exception when parsing event\'s dataIsaac Katzenelson
* commit '90c6616a33c0d1f948d309cf6c5cf0c64483bd0a': Catch exception when parsing event's data
2012-01-18am bbcfb960: Catch exception when parsing event\'s dataandroid-sdk-adt_r20tools_r20ics-plus-aospIsaac Katzenelson
* commit 'bbcfb96060e9b518b810015984081a25c8ae2c26': Catch exception when parsing event's data
2012-01-18Catch exception when parsing event's dataandroid-cts-4.0.3_r2android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1ics-mr1-releaseics-mr1Isaac Katzenelson
Bug: 5876746 Android calendar syncing broken by certain repeated events Change-Id: Ia0b2bc610148302b1cc3d751c47a958950abfb46
2012-01-13am 33df4ea6: am 996f1256: Allow lowercase in rruleMichael Chan
* commit '33df4ea6d936ee17377ad03fe456843262eac97b': Allow lowercase in rrule
2012-01-13am 996f1256: Allow lowercase in rruleMichael Chan
* commit '996f12565f11ea0130cbdc570c0853ae53073f18': Allow lowercase in rrule
2012-01-11Allow lowercase in rruleMichael Chan
Bug: 5822997 Change-Id: I5f309cd0f854f8ac27326e7c16f9b637b24cd604
2012-01-05am b9a152ec: am 0335d9f5: Fix rrules with bad count and interval during parsingMichael Chan
* commit 'b9a152ecd47d1b26f045e1cdef1ab40e36a63999': Fix rrules with bad count and interval during parsing
2012-01-05am 0335d9f5: Fix rrules with bad count and interval during parsingMichael Chan
* commit '0335d9f524da1da1f4d15bba37a1576a9480a36d': Fix rrules with bad count and interval during parsing
2012-01-03Fix rrules with bad count and interval during parsingMichael Chan
Specifically If count < 0, assume 1 If interval < 1, assume 1 Bug: 5676414 Change-Id: I942cdaffcfb98a922c5867c9d08be322c64a0f94
2011-12-21am 74b1b5b0: ICaldendar.START/END -> package-privateConley Owens
* commit '74b1b5b02ac2022e01167d9cb5cbec02d3877fa7': ICaldendar$Compenent.START/END -> package-private
2011-12-21ICaldendar$Compenent.START/END -> package-privateConley Owens
Make ICaldendar$Compenent.START and ICaldendar$Compenent.END package-private instead of private. This makes a little more sense since they are accessed outside of the class that they are defined in. In addition, this fixes errors created by proguard when building with OpenJDK. Change-Id: I3ffa4d8807c1f00e89b414f3adba39cd9e799c47
2011-12-20Build calendar-common against SDK 15.Ying Wang
Change-Id: Ia004f7bf624e9a940c0f596df558cc7f3e0d1b51
2011-11-15Stop including libphonenumberAndy McFadden
No longer used by Calendar app. Bug 5578068 Change-Id: I7d7b51ac334f7dee7fbca7748a3c461f04f6b126
2011-10-28Add CleanSpecAndy McFadden
Probably needed this with previous commit -- clears out directory so jarjar will run even though no sources have changed. Change-Id: Ibe8d5822a016b44c5a0ab847596764bf7544c4ad
2011-10-28Rename libphonenumber packageAndy McFadden
We're including a static copy of libphonenumber for the benefit of the unbundled Calendar app. We need to rename the package to avoid a conflict with the (non-public) copy in ext.jar. Bug 5532441 Change-Id: I6563c924809f936d8f04e081f0159a7fa1a907be
2011-10-21Support WKST in recurrence rulesandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r1android-4.0.3_r1.1android-4.0.3_r1Andy McFadden
RFC 5545 says WKST is significant in weekly rules with nonzero intervals and BYDAY rules, and also in yearly rules with a BYWEEKNO part. Yearly with BYWEEKNO seems to be generally broken, so this only attempts to correct weekly recurrences. Bug 1641249 Change-Id: Icad8762be4685036fc50bed0cc75970e774a21a8
2011-08-26Include libphonenumberandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseAndy McFadden
Pull the external/libphonenumber sources into the Calendar lib. Bug 4969832 Change-Id: Id59fac7fbfae488aa79d05520a60d4c4c3473f17
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:25:38 +0000