OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Michael Chan [Tue, 9 Jun 2009 01:39:46 +0000 (18:39 -0700)]
am
6ed13804: Modified to allow launching of Maps where the Where field of an Calendar event is clicked upon.
Merge commit '
6ed13804c270e48540ddb7a955446a37a307811e'
* commit '
6ed13804c270e48540ddb7a955446a37a307811e':
Modified to allow launching of Maps where the Where field of an Calendar event is clicked upon.
Michael Chan [Mon, 8 Jun 2009 23:36:02 +0000 (16:36 -0700)]
Modified to allow launching of Maps where the Where field of an Calendar event is clicked upon.
Michael Chan [Thu, 14 May 2009 23:09:13 +0000 (16:09 -0700)]
findbug fixes
modified: src/com/android/calendar/AgendaActivity.java
modified: src/com/android/calendar/AgendaAdapter.java
modified: src/com/android/calendar/CalendarActivity.java
modified: src/com/android/calendar/CalendarApplication.java
modified: src/com/android/calendar/CalendarView.java
modified: src/com/android/calendar/DeleteEventHelper.java
modified: src/com/android/calendar/EditEvent.java
modified: src/com/android/calendar/Event.java
modified: src/com/android/calendar/EventInfoActivity.java
modified: src/com/android/calendar/IcsImportActivity.java
modified: src/com/android/calendar/MonthActivity.java
modified: tests/src/com/android/calendar/FormatDateRangeTest.java
modified: tests/src/com/android/calendar/WeekNumberTest.java
Eric Fischer [Wed, 13 May 2009 23:42:39 +0000 (16:42 -0700)]
am
8004ba0: Eradicate another list of the days of the week, from Calenda
Merge commit '
8004ba063168e29503161c58d36becf10846cf9d'
* commit '
8004ba063168e29503161c58d36becf10846cf9d':
Eradicate another list of the days of the week, from Calendar.
Eric Fischer [Wed, 13 May 2009 22:33:37 +0000 (15:33 -0700)]
Eradicate another list of the days of the week, from Calendar.
Michael Chan [Tue, 5 May 2009 17:39:03 +0000 (10:39 -0700)]
am
b3866cb: Flatten the Agenda view hierarchy down to one level deep. b/
Merge commit '
b3866cbd69a2688d0cb165f18f133e73f0243c8e'
* commit '
b3866cbd69a2688d0cb165f18f133e73f0243c8e':
Flatten the Agenda view hierarchy down to one level deep. b/
1791496
Michael Chan [Mon, 4 May 2009 23:15:40 +0000 (16:15 -0700)]
Flatten the Agenda view hierarchy down to one level deep. b/
1791496
Android (Google) Code Review [Fri, 1 May 2009 19:00:36 +0000 (12:00 -0700)]
am
405626a: Merge change 813 into donut
Merge commit '
405626ac892f2ceee19ba1a6ff696287641ef171'
* commit '
405626ac892f2ceee19ba1a6ff696287641ef171':
Speed up calendar by caching various resources
Android (Google) Code Review [Fri, 1 May 2009 17:28:04 +0000 (10:28 -0700)]
Merge change 813 into donut
* changes:
Speed up calendar by caching various resources
Eric Fischer [Fri, 1 May 2009 01:12:57 +0000 (18:12 -0700)]
am
70912f0: am
84fa35c: AI 148147: Import lots of zh_TW translation chan
Merge commit '
70912f06f3c9555ab6ca4f4ba2aaafebae9335c1'
* commit '
70912f06f3c9555ab6ca4f4ba2aaafebae9335c1':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:37:30 +0000 (17:37 -0700)]
am
84fa35c: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
84fa35c2c4802b7cd1e315016c0027f96c5801ea' into donut
* commit '
84fa35c2c4802b7cd1e315016c0027f96c5801ea':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
Michael Chan [Wed, 29 Apr 2009 23:12:59 +0000 (16:12 -0700)]
Speed up calendar by caching various resources
Speed up Calendar by caching strings and color
Eric Fischer [Wed, 29 Apr 2009 20:43:15 +0000 (13:43 -0700)]
am
6e6359e: am
ad608c4: AI 147962: Import updated zh_TW translations.
Merge commit '
6e6359e40ff8fbf3f8e87747df0606b384f4a419'
* commit '
6e6359e40ff8fbf3f8e87747df0606b384f4a419':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 04:57:22 +0000 (21:57 -0700)]
am
ad608c4: AI 147962: Import updated zh_TW translations.
Merge commit '
ad608c41db84a9459639726eff09ccd29f62b5dd' into donut
* commit '
ad608c41db84a9459639726eff09ccd29f62b5dd':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:39 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
Fred Quintana [Thu, 23 Apr 2009 20:36:28 +0000 (13:36 -0700)]
change the sync framework and users to understand Account
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:18 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:36 +0000 (17:12 -0700)]
Merge donut into master
Fred Quintana [Mon, 20 Apr 2009 23:05:11 +0000 (16:05 -0700)]
adding concept of features to accounts
Eric Fischer [Wed, 15 Apr 2009 20:30:19 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
Eric Fischer [Tue, 14 Apr 2009 19:10:43 +0000 (12:10 -0700)]
AI 146175: Import updated translations.
Automated import of CL 146175
Eric Fischer [Fri, 10 Apr 2009 17:45:19 +0000 (10:45 -0700)]
AI 145711: Import a few changed translations.
DO NOT MERGE
Automated import of CL 145711
Eric Fischer [Thu, 9 Apr 2009 01:43:29 +0000 (18:43 -0700)]
AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
Eric Fischer [Wed, 8 Apr 2009 07:31:51 +0000 (00:31 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Wed, 8 Apr 2009 07:30:38 +0000 (00:30 -0700)]
AI 144913: am: CL 144912 Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Original author: enf
Automated import of CL 144913
Eric Fischer [Wed, 8 Apr 2009 01:15:15 +0000 (18:15 -0700)]
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
Eric Fischer [Tue, 7 Apr 2009 20:55:06 +0000 (13:55 -0700)]
AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Automated import of CL 144912
Eric Fischer [Tue, 7 Apr 2009 18:48:29 +0000 (11:48 -0700)]
AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
Jeffrey Sharkey [Thu, 2 Apr 2009 17:23:57 +0000 (10:23 -0700)]
Merge branch 'readonly-p4-master'
Jeffrey Sharkey [Thu, 2 Apr 2009 17:22:44 +0000 (10:22 -0700)]
AI 144202: am: CL 144137 am: CL 144136 Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 144202
Jeffrey Sharkey [Wed, 1 Apr 2009 23:07:48 +0000 (16:07 -0700)]
AI 144137: am: CL 144136 Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
Original author: jsharkey
Merged from: //branches/cupcake/...
Automated import of CL 144137
Jeffrey Sharkey [Wed, 1 Apr 2009 23:06:21 +0000 (16:06 -0700)]
AI 144136: Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
BUG=
1752489
Automated import of CL 144136
The Android Open Source Project [Wed, 1 Apr 2009 04:34:26 +0000 (21:34 -0700)]
Merge commit 'goog/readonly-p4-master'
Jack Veenstra [Wed, 1 Apr 2009 02:28:36 +0000 (19:28 -0700)]
AI 143922: am: CL 143921 am: CL 143920 Fixed a bug with reminders not getting saved if a single instance of a
recurring event was changed.
Original author: veenstra
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143922
Jack Veenstra [Wed, 1 Apr 2009 02:28:29 +0000 (19:28 -0700)]
AI 143921: am: CL 143920 Fixed a bug with reminders not getting saved if a single instance of a
recurring event was changed.
Original author: veenstra
Merged from: //branches/cupcake/...
Automated import of CL 143921
Jack Veenstra [Wed, 1 Apr 2009 02:25:25 +0000 (19:25 -0700)]
AI 143920: Fixed a bug with reminders not getting saved if a single instance of a
recurring event was changed.
BUG=
1740579
Automated import of CL 143920
The Android Open Source Project [Tue, 31 Mar 2009 23:19:18 +0000 (16:19 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
Dianne Hackborn [Sat, 28 Mar 2009 02:19:20 +0000 (19:19 -0700)]
AI 143364: am: CL 143214 am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143364
Eric Fischer [Sat, 28 Mar 2009 01:58:23 +0000 (18:58 -0700)]
AI 143346: am: CL 143195 am: CL 142959 Adjust formatting in the week view of the Calendar for Japanese.
In the Japanese Calendar week view, show the equivalent of "21 Mon"
instead of "Mon 21".
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143346
Dianne Hackborn [Sat, 28 Mar 2009 01:26:13 +0000 (18:26 -0700)]
AI 143214: am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Automated import of CL 143214
Eric Fischer [Sat, 28 Mar 2009 00:24:46 +0000 (17:24 -0700)]
AI 143195: am: CL 142959 Adjust formatting in the week view of the Calendar for Japanese.
In the Japanese Calendar week view, show the equivalent of "21 Mon"
instead of "Mon 21".
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143195
The Android Open Source Project [Fri, 27 Mar 2009 22:31:12 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Dianne Hackborn [Thu, 26 Mar 2009 23:28:26 +0000 (16:28 -0700)]
Automated import from //branches/cupcake/...@143009,143009
Eric Fischer [Thu, 26 Mar 2009 19:08:50 +0000 (12:08 -0700)]
Automated import from //branches/cupcake/...@142959,142959
Michael Chan [Wed, 25 Mar 2009 22:33:56 +0000 (15:33 -0700)]
Automated import from //branches/master/...@142681,142681
Michael Chan [Wed, 25 Mar 2009 22:32:32 +0000 (15:32 -0700)]
Automated import from //branches/master/...@142680,142680
Michael Chan [Wed, 25 Mar 2009 22:16:51 +0000 (15:16 -0700)]
Automated import from //branches/donutburger/...@142626,142626
Michael Chan [Wed, 25 Mar 2009 22:12:37 +0000 (15:12 -0700)]
Automated import from //branches/donutburger/...@142619,142619
Eric Fischer [Wed, 25 Mar 2009 04:06:32 +0000 (21:06 -0700)]
Automated import from //branches/master/...@141869,141869
Eric Fischer [Wed, 25 Mar 2009 04:02:50 +0000 (21:02 -0700)]
Automated import from //branches/donutburger/...@141868,141868
Michael Chan [Wed, 25 Mar 2009 02:30:19 +0000 (19:30 -0700)]
Automated import from //branches/donutburger/...@141092,141092
Michael Chan [Wed, 25 Mar 2009 02:30:02 +0000 (19:30 -0700)]
Automated import from //branches/master/...@141093,141093
Michael Chan [Wed, 25 Mar 2009 02:26:36 +0000 (19:26 -0700)]
Automated import from //branches/donutburger/...@141076,141076
Michael Chan [Wed, 25 Mar 2009 02:26:33 +0000 (19:26 -0700)]
Automated import from //branches/master/...@141077,141077
Eric Fischer [Wed, 25 Mar 2009 01:33:42 +0000 (18:33 -0700)]
Automated import from //branches/cupcake/...@141866,141866
Romain Guy [Wed, 25 Mar 2009 01:10:16 +0000 (18:10 -0700)]
Automated import from //branches/master/...@140651,140651
Romain Guy [Wed, 25 Mar 2009 01:08:40 +0000 (18:08 -0700)]
Automated import from //branches/donutburger/...@140648,140648
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:48 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:46 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Fri, 13 Mar 2009 20:04:24 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Thu, 5 Mar 2009 23:45:11 +0000 (15:45 -0800)]
auto import from //depot/cupcake/@136620
The Android Open Source Project [Thu, 5 Mar 2009 22:34:37 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:32:18 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:49 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:30 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:39 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:33 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:35 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:53 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:44:04 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:16:11 +0000 (00:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:44 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:05:38 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:59 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:16:05 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:13 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:25 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:05:53 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution