OSDN Git Service

android-x86/packages-apps-Calendar.git
14 years agoam e2ae1ef8: b/2224837 Changed the plumbing of how alerts/notifications work.
Michael Chan [Tue, 15 Dec 2009 23:27:38 +0000 (15:27 -0800)]
am e2ae1ef8: b/2224837 Changed the plumbing of how alerts/notifications work.

Merge commit 'e2ae1ef8decfddcc4e5802483e92cab93c6fc67c' into eclair-mr2-plus-aosp

* commit 'e2ae1ef8decfddcc4e5802483e92cab93c6fc67c':
  b/2224837 Changed the plumbing of how alerts/notifications work.

14 years agob/2224837 Changed the plumbing of how alerts/notifications work.
Michael Chan [Thu, 19 Nov 2009 02:37:09 +0000 (18:37 -0800)]
b/2224837 Changed the plumbing of how alerts/notifications work.

Cut down on the number db queries when process alerts
Fixed a cursor leak
Flash the event name and location in the notification bar
b/2205255 Show the latest event in the notification. Prioritize based on your acceptance response.
b/1544909 Flash green LED for when there's a calendar notifications.
b/2224837 Cleanup alert/notification plumbing in Calendar
b/1735201 Calendar notifications are not updated when locale is changed

Change-Id: I86b6904607b0236fb04719f5782f43674ac6d2bc

14 years agoam 941c3a22: Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 18:40:48 +0000 (10:40 -0800)]
am 941c3a22: Changed class paths for classes moved in unbundling effort

Merge commit '941c3a226d77a36ea43b8946d3f6b667449d13a8' into eclair-mr2-plus-aosp

* commit '941c3a226d77a36ea43b8946d3f6b667449d13a8':
  Changed class paths for classes moved in unbundling effort

14 years agoChanged class paths for classes moved in unbundling effort
Paul Westbrook [Fri, 11 Dec 2009 23:37:52 +0000 (15:37 -0800)]
Changed class paths for classes moved in unbundling effort

14 years agoam fb2b0ca2: am 9616fc15: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:53:31 +0000 (17:53 -0800)]
am fb2b0ca2: am 9616fc15: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'fb2b0ca2dc2f8b2a6a14d2204e8d5e408432a5f3' into eclair-mr2-plus-aosp

* commit 'fb2b0ca2dc2f8b2a6a14d2204e8d5e408432a5f3':
  Import revised translations.  DO NOT MERGE

14 years agoam 9616fc15: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:43:06 +0000 (17:43 -0800)]
am 9616fc15: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9616fc15195c4670c8b513bc6b8cd1f08469d086' into eclair-mr2

* commit '9616fc15195c4670c8b513bc6b8cd1f08469d086':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:24:56 +0000 (17:24 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 93058fbd: Removed usage of Gmail.java from the Calendar
Paul Westbrook [Wed, 9 Dec 2009 23:50:43 +0000 (15:50 -0800)]
am 93058fbd: Removed usage of Gmail.java from the Calendar

Merge commit '93058fbdb0f15f089554c567be970b3af2288e98' into eclair-mr2-plus-aosp

* commit '93058fbdb0f15f089554c567be970b3af2288e98':
  Removed usage of Gmail.java from the Calendar

14 years agoRemoved usage of Gmail.java from the Calendar
Paul Westbrook [Tue, 8 Dec 2009 20:01:42 +0000 (12:01 -0800)]
Removed usage of Gmail.java from the Calendar

This is a temporary fix, until the Calendar has been switched to
use the AccountManagerService to look for an account that hase
the calendar service bit

http://b/issue?id=2313182

14 years agoam f5ab8ba0: am 3531081b: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:21:08 +0000 (15:21 -0800)]
am f5ab8ba0: am 3531081b: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'f5ab8ba0b04eb4f1777f92991905b1820c84b6e5' into eclair-mr2-plus-aosp

* commit 'f5ab8ba0b04eb4f1777f92991905b1820c84b6e5':
  Import revised translations.  DO NOT MERGE

14 years agoam 3531081b: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:11:46 +0000 (15:11 -0800)]
am 3531081b: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '3531081b3d74333cae485ec5be2b58375e950a84' into eclair-mr2

* commit '3531081b3d74333cae485ec5be2b58375e950a84':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:55:47 +0000 (14:55 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 042de1dd: am 8b091b9c: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:29:53 +0000 (17:29 -0800)]
am 042de1dd: am 8b091b9c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '042de1ddbe398dd17d0cabb70e07c76c7e83bbe6' into eclair-mr2-plus-aosp

* commit '042de1ddbe398dd17d0cabb70e07c76c7e83bbe6':
  Import revised translations.  DO NOT MERGE

14 years agoam 8b091b9c: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:10:27 +0000 (17:10 -0800)]
am 8b091b9c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '8b091b9c7e336695de5acf08a25eb5cb0fe081b7' into eclair-mr2

* commit '8b091b9c7e336695de5acf08a25eb5cb0fe081b7':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:35:09 +0000 (11:35 -0800)]
Import revised translations.  DO NOT MERGE

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:23 +0000 (14:55 -0800)]
merge from open-source master

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:27 +0000 (14:03 -0800)]
merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:27 +0000 (14:03 -0800)]
merge from open-source master

Merge commit 'goog/stage-korg-master^' into HEAD

14 years agorevive a hack that creates a local calendar if the google account authenticator is...
Fred Quintana [Thu, 12 Nov 2009 20:29:47 +0000 (12:29 -0800)]
revive a hack that creates a local calendar if the google account authenticator is not present

14 years agomerge from eclair
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:44 +0000 (12:06 -0800)]
merge from eclair

14 years agoam ef98d583: am 196895b9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:52:20 +0000 (17:52 -0800)]
am ef98d583: am 196895b9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'ef98d583e00474a07b2dd8ccdca420ade60d9fe2' into eclair-mr2-plus-aosp

* commit 'ef98d583e00474a07b2dd8ccdca420ade60d9fe2':
  Import revised translations.  DO NOT MERGE

14 years agoam 196895b9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:48:50 +0000 (17:48 -0800)]
am 196895b9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '196895b9ac299206e5a5d3eb92e955a08cca379d' into eclair-mr2

* commit '196895b9ac299206e5a5d3eb92e955a08cca379d':
  Import revised translations.  DO NOT MERGE

14 years agoam 196895b9: Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:47:51 +0000 (17:47 -0800)]
am 196895b9: Import revised translations.  DO NOT MERGE

Merge commit '196895b9ac299206e5a5d3eb92e955a08cca379d' into eclair-plus-aosp

* commit '196895b9ac299206e5a5d3eb92e955a08cca379d':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:15:28 +0000 (17:15 -0800)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoeclair snapshot
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:08 +0000 (18:46 -0800)]
eclair snapshot

14 years agoam e15d871c: b/2238048 Don\'t capitalize every word in the event title
Michael Chan [Wed, 11 Nov 2009 22:31:53 +0000 (14:31 -0800)]
am e15d871c: b/2238048 Don\'t capitalize every word in the event title

Merge commit 'e15d871c1b64e96bd65bfcb01ca57b2e39983fb7' into eclair-mr2-plus-aosp

* commit 'e15d871c1b64e96bd65bfcb01ca57b2e39983fb7':
  b/2238048 Don't capitalize every word in the event title

14 years agob/2238048 Don't capitalize every word in the event title
Michael Chan [Tue, 10 Nov 2009 23:39:12 +0000 (15:39 -0800)]
b/2238048 Don't capitalize every word in the event title

Change-Id: Ia982b50a44d10de729589147bad1d3cf260c9ee9

14 years agoam 9d734422: Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:10:38 +0000 (16:10 -0800)]
am 9d734422: Import revised translations.  DO NOT MERGE

Merge commit '9d734422b101454007e422d2aaf8521d641511e6' into eclair-mr2-plus-aosp

* commit '9d734422b101454007e422d2aaf8521d641511e6':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:26:29 +0000 (15:26 -0800)]
Import revised translations.  DO NOT MERGE

14 years agomerge from open-source master
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:09:31 +0000 (14:09 -0800)]
merge from open-source master

14 years agomerge from open-source master
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:00:59 +0000 (14:00 -0800)]
merge from open-source master

14 years agoam ea9538d8: am 0e7235b0: b/2194249 Prevent Calendar from playing multiple notificati...
Michael Chan [Fri, 30 Oct 2009 03:00:12 +0000 (20:00 -0700)]
am ea9538d8: am 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.

Merge commit 'ea9538d8cf21aa542235854deb8caadeac746f44' into eclair-mr2-plus-aosp

* commit 'ea9538d8cf21aa542235854deb8caadeac746f44':
  b/2194249 Prevent Calendar from playing multiple notification tones around the same time.

14 years agoam fa31dd93: am 84f61027: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 03:00:07 +0000 (20:00 -0700)]
am fa31dd93: am 84f61027: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'fa31dd93ca69f1ba058c82f34fe56f60badf50c3' into eclair-mr2-plus-aosp

* commit 'fa31dd93ca69f1ba058c82f34fe56f60badf50c3':
  Import revised translations.  DO NOT MERGE

14 years agoam 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones...
Michael Chan [Fri, 30 Oct 2009 02:28:06 +0000 (19:28 -0700)]
am 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.

Merge commit '0e7235b00fdf47c773592a324c4a62ef95d1dcf4' into eclair-mr2

* commit '0e7235b00fdf47c773592a324c4a62ef95d1dcf4':
  b/2194249 Prevent Calendar from playing multiple notification tones around the same time.

14 years agoam 84f61027: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 02:23:58 +0000 (19:23 -0700)]
am 84f61027: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '84f61027e16cf75567bd9fd3fa591931158981bf' into eclair-mr2

* commit '84f61027e16cf75567bd9fd3fa591931158981bf':
  Import revised translations.  DO NOT MERGE

14 years agoam 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones...
Michael Chan [Thu, 29 Oct 2009 18:04:54 +0000 (11:04 -0700)]
am 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.

Merge commit '0e7235b00fdf47c773592a324c4a62ef95d1dcf4' into eclair-plus-aosp

* commit '0e7235b00fdf47c773592a324c4a62ef95d1dcf4':
  b/2194249 Prevent Calendar from playing multiple notification tones around the same time.

14 years agob/2194249 Prevent Calendar from playing multiple notification tones around the same...
Michael Chan [Thu, 29 Oct 2009 07:17:21 +0000 (00:17 -0700)]
b/2194249 Prevent Calendar from playing multiple notification tones around the same time.
This is a safe but temp fix for overlapping ringtones playing at the same time.

Change-Id: I8d8bc976837c0ef036626fd991bfcd2c91772c64

14 years agoam 84f61027: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 06:34:08 +0000 (23:34 -0700)]
am 84f61027: Import revised translations.  DO NOT MERGE

Merge commit '84f61027e16cf75567bd9fd3fa591931158981bf' into eclair-plus-aosp

* commit '84f61027e16cf75567bd9fd3fa591931158981bf':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:17:50 +0000 (21:17 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoCreate a default calendar if there's none from GLS.
Jean-Baptiste Queru [Mon, 26 Oct 2009 18:10:55 +0000 (11:10 -0700)]
Create a default calendar if there's none from GLS.

14 years agoam debb3028: am 7204b269: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:35:37 +0000 (09:35 -0700)]
am debb3028: am 7204b269: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'debb302865348492aeb20e9b9b309ba0e24a559a' into eclair-mr2-plus-aosp

* commit 'debb302865348492aeb20e9b9b309ba0e24a559a':
  Import revised translations.  DO NOT MERGE

14 years agoam 7204b269: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:46:37 +0000 (06:46 -0700)]
am 7204b269: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '7204b26927cc95945521607e4e771c6164473a01' into eclair-mr2

* commit '7204b26927cc95945521607e4e771c6164473a01':
  Import revised translations.  DO NOT MERGE

14 years agoam 7204b269: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 19:15:37 +0000 (12:15 -0700)]
am 7204b269: Import revised translations.  DO NOT MERGE

Merge commit '7204b26927cc95945521607e4e771c6164473a01' into eclair-plus-aosp

* commit '7204b26927cc95945521607e4e771c6164473a01':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:43:08 +0000 (10:43 -0700)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoam 72c62c39: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:09:07 +0000 (17:09 -0700)]
am 72c62c39: Import revised translations.  DO NOT MERGE

Merge commit '72c62c39fe83a2e6a72c95c14c4bb3bd0bef8281' into eclair-mr2-plus-aosp

* commit '72c62c39fe83a2e6a72c95c14c4bb3bd0bef8281':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:05:03 +0000 (16:05 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoam 59b2307e: am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translation...
Eric Fischer [Fri, 9 Oct 2009 00:54:09 +0000 (17:54 -0700)]
am 59b2307e: am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '59b2307edb692344d8a05002172858d15638e8c3' into eclair-mr2-plus-aosp

* commit '59b2307edb692344d8a05002172858d15638e8c3':

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
Dianne Hackborn [Fri, 9 Oct 2009 00:54:09 +0000 (17:54 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp

14 years agoam ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Fri, 9 Oct 2009 00:35:25 +0000 (17:35 -0700)]
am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'ea63133466ed5deff1151e2878bfb8e7c908c431' into eclair-mr2

* commit 'ea63133466ed5deff1151e2878bfb8e7c908c431':
  Import revised translations.  DO NOT MERGE

14 years agoam ea631334: am 92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:15:55 +0000 (15:15 -0700)]
am ea631334: am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'ea63133466ed5deff1151e2878bfb8e7c908c431' into eclair-plus-aosp

* commit 'ea63133466ed5deff1151e2878bfb8e7c908c431':
  Import revised translations.  DO NOT MERGE

14 years agoam 92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:35 +0000 (15:02 -0700)]
am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '92a90a31c8842b89793771784719c52950c9237e' into eclair

* commit '92a90a31c8842b89793771784719c52950c9237e':
  Import revised translations.  DO NOT MERGE

14 years agoam 5da28cdc: am 9d1c2039: Fix issue #2171460: Turn off background blurring of power...
Dianne Hackborn [Thu, 8 Oct 2009 00:44:57 +0000 (17:44 -0700)]
am 5da28cdc: am 9d1c2039: Fix issue #2171460: Turn off background blurring of power dialog

Merge commit '5da28cdcc08500eb9574d80c9973715e40b16e76' into eclair-mr2-plus-aosp

* commit '5da28cdcc08500eb9574d80c9973715e40b16e76':

14 years agoam 31f472ca: am 9b168fae: b/2167301 Guests were dropped when creating an exception...
Michael Chan [Thu, 8 Oct 2009 00:44:53 +0000 (17:44 -0700)]
am 31f472ca: am 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring event.

Merge commit '31f472caed0618ab2d15aa7b493fada2c0abf846' into eclair-mr2-plus-aosp

* commit '31f472caed0618ab2d15aa7b493fada2c0abf846':

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
Eric Laurent [Thu, 8 Oct 2009 00:44:53 +0000 (17:44 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp

14 years agoam 9d1c2039: Fix issue #2171460: Turn off background blurring of power dialog
Dianne Hackborn [Thu, 8 Oct 2009 00:41:31 +0000 (17:41 -0700)]
am 9d1c2039: Fix issue #2171460: Turn off background blurring of power dialog

Merge commit '9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d' into eclair-plus-aosp

* commit '9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d':
  Fix issue #2171460: Turn off background blurring of power dialog

14 years agoam 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring...
Michael Chan [Thu, 8 Oct 2009 00:41:28 +0000 (17:41 -0700)]
am 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring event.

Merge commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-plus-aosp

* commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34':
  b/2167301 Guests were dropped when creating an exception to a recurring event.

14 years agoam 9d1c2039: Fix issue #2171460: Turn off background blurring of power dialog
Dianne Hackborn [Thu, 8 Oct 2009 00:39:32 +0000 (17:39 -0700)]
am 9d1c2039: Fix issue #2171460: Turn off background blurring of power dialog

Merge commit '9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d' into eclair-mr2

* commit '9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d':
  Fix issue #2171460: Turn off background blurring of power dialog

14 years agoam 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring...
Michael Chan [Thu, 8 Oct 2009 00:39:29 +0000 (17:39 -0700)]
am 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring event.

Merge commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-mr2

* commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34':
  b/2167301 Guests were dropped when creating an exception to a recurring event.

14 years agoFix issue #2171460: Turn off background blurring of power dialog
Dianne Hackborn [Wed, 7 Oct 2009 23:14:29 +0000 (16:14 -0700)]
Fix issue #2171460: Turn off background blurring of power dialog

The calendar alert dialog was also using background dimming, but
this is a complete waste since it is full screen.

Change-Id: I59efb00b23f184251e706212bc94f75a04438d6e

14 years agoam 1450d5ca: account manager api review changes
Fred Quintana [Wed, 7 Oct 2009 18:46:32 +0000 (11:46 -0700)]
am 1450d5ca: account manager api review changes

Merge commit '1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc' into eclair-plus-aosp

* commit '1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc':
  account manager api review changes

14 years agoam 8dcd2932: set the attendee email when changing your own attendance in the attendee...
Debajit Ghosh [Wed, 7 Oct 2009 18:40:10 +0000 (11:40 -0700)]
am 8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.

Merge commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b' into eclair-plus-aosp

* commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b':
  set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.

14 years agoam 003962ad: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 7 Oct 2009 18:36:31 +0000 (11:36 -0700)]
am 003962ad: Import revised translations.  DO NOT MERGE

Merge commit '003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4' into eclair-plus-aosp

* commit '003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4':
  Import revised translations.  DO NOT MERGE

14 years agob/2167301 Guests were dropped when creating an exception to a recurring event.
Michael Chan [Mon, 5 Oct 2009 23:35:10 +0000 (16:35 -0700)]
b/2167301 Guests were dropped when creating an exception to a recurring event.

Change-Id: I7edb7db58eedc48c953d69cf3f2693e1c4d4a452

14 years agoam 57d431e9: am 1450d5ca: account manager api review changes
Fred Quintana [Mon, 5 Oct 2009 18:40:59 +0000 (11:40 -0700)]
am 57d431e9: am 1450d5ca: account manager api review changes

Merge commit '57d431e928fbf9419fc7b0d87c34aa8472ae0d11' into eclair-mr2-plus-aosp

* commit '57d431e928fbf9419fc7b0d87c34aa8472ae0d11':
  account manager api review changes

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
Fred Quintana [Mon, 5 Oct 2009 18:40:59 +0000 (11:40 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp

14 years agoam 1450d5ca: account manager api review changes
Fred Quintana [Mon, 5 Oct 2009 18:34:51 +0000 (11:34 -0700)]
am 1450d5ca: account manager api review changes

Merge commit '1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc' into eclair-mr2

* commit '1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc':
  account manager api review changes

14 years agoaccount manager api review changes
Fred Quintana [Sat, 3 Oct 2009 00:19:17 +0000 (17:19 -0700)]
account manager api review changes

14 years agoam 8dcd2932: set the attendee email when changing your own attendance in the attendee...
Debajit Ghosh [Sun, 4 Oct 2009 22:19:19 +0000 (15:19 -0700)]
am 8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.

Merge commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b' into eclair-mr2

* commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b':
  set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.

14 years agoam 003962ad: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sun, 4 Oct 2009 22:16:16 +0000 (15:16 -0700)]
am 003962ad: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4' into eclair-mr2

* commit '003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4':
  Import revised translations.  DO NOT MERGE

14 years agoset the attendee email when changing your own attendance in the attendees table,...
Debajit Ghosh [Fri, 2 Oct 2009 19:37:51 +0000 (12:37 -0700)]
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 1 Oct 2009 23:56:02 +0000 (16:56 -0700)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoam be7b0ac4: Merge change I30c38243 into eclair
Michael Chan [Thu, 1 Oct 2009 13:42:41 +0000 (06:42 -0700)]
am be7b0ac4: Merge change I30c38243 into eclair

Merge commit 'be7b0ac43ad46dd7525f4e1b50aebde035bbd1c6' into eclair-plus-aosp

* commit 'be7b0ac43ad46dd7525f4e1b50aebde035bbd1c6':
  b/1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.

14 years agoam 6e9faeff: Merge change I6148797f into eclair
Michael Chan [Thu, 1 Oct 2009 13:42:37 +0000 (06:42 -0700)]
am 6e9faeff: Merge change I6148797f into eclair

Merge commit '6e9faeff151307482ff5696eaea391ea4e75685e' into eclair-plus-aosp

* commit '6e9faeff151307482ff5696eaea391ea4e75685e':
  Round off new events created from the month view... if the user previously did "Go to Today"

14 years agoMerge change I30c38243 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 13:38:19 +0000 (09:38 -0400)]
Merge change I30c38243 into eclair

* changes:
  b/1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.

14 years agoMerge change I6148797f into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 13:37:48 +0000 (09:37 -0400)]
Merge change I6148797f into eclair

* changes:
  Round off new events created from the month view... if the user previously did "Go to Today"

14 years agob/1972231 A tweak to improve on going to a specific time in the agenda view e.g....
Michael Chan [Thu, 1 Oct 2009 07:21:59 +0000 (00:21 -0700)]
b/1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.

The root problem is that ListView ignores my setSelection() call if
notifyDataSetChange is called before it has a chance to redraw.  This can happen
when Agenda view starts up and fires off multiple queries.

Change-Id: I30c382432961dbf2d7788723343764b51a665657

14 years agoRound off new events created from the month view... if the user previously did "Go...
Michael Chan [Thu, 1 Oct 2009 07:16:42 +0000 (00:16 -0700)]
Round off new events created from the month view... if the user previously did "Go to Today"

Change-Id: I6148797f9d8c36c65828738fb5ad236577556bcd

14 years agoam 9a4774c1: Merge change I710d4ade into eclair
Ken Shirriff [Thu, 1 Oct 2009 06:36:58 +0000 (23:36 -0700)]
am 9a4774c1: Merge change I710d4ade into eclair

Merge commit '9a4774c1516acb621dbd6be7b31dbabf56b39f3d' into eclair-plus-aosp

* commit '9a4774c1516acb621dbd6be7b31dbabf56b39f3d':
  Add hasAttendeeData for new events.

14 years agoMerge change I710d4ade into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 06:32:33 +0000 (02:32 -0400)]
Merge change I710d4ade into eclair

* changes:
  Add hasAttendeeData for new events.

14 years agoAdd hasAttendeeData for new events.
Ken Shirriff [Thu, 1 Oct 2009 06:17:05 +0000 (23:17 -0700)]
Add hasAttendeeData for new events.

This is necessary for the guests field to be editable before the event is synced.

14 years agoam 82103d23: Merge change Iddaa2885 into eclair
Michael Chan [Thu, 1 Oct 2009 04:53:56 +0000 (21:53 -0700)]
am 82103d23: Merge change Iddaa2885 into eclair

Merge commit '82103d230a79eca84ba4357962b2a4e4eccaee7d' into eclair-plus-aosp

* commit '82103d230a79eca84ba4357962b2a4e4eccaee7d':
  b/2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.

14 years agoMerge change Iddaa2885 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 04:46:07 +0000 (00:46 -0400)]
Merge change Iddaa2885 into eclair

* changes:
  b/2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.

14 years agob/2158629 Fixed the problem where inviting attendees with pretty display names do...
Michael Chan [Thu, 1 Oct 2009 04:37:22 +0000 (21:37 -0700)]
b/2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.

Change-Id: Iddaa2885be1a89479e06e336c902b53461414dac

14 years agoam 8eb32a5e: Fasttrack->QuickContact
Evan Millar [Thu, 1 Oct 2009 04:19:50 +0000 (21:19 -0700)]
am 8eb32a5e: Fasttrack->QuickContact

Merge commit '8eb32a5e9eac16bbd5a1671bd98ec70c8688503d' into eclair-plus-aosp

* commit '8eb32a5e9eac16bbd5a1671bd98ec70c8688503d':
  Fasttrack->QuickContact

14 years agoam c89f750e: Merge change I161a5026 into eclair
Michael Chan [Thu, 1 Oct 2009 04:14:58 +0000 (21:14 -0700)]
am c89f750e: Merge change I161a5026 into eclair

Merge commit 'c89f750e654ce04c22bea56ccb8cddcf634b986b' into eclair-plus-aosp

* commit 'c89f750e654ce04c22bea56ccb8cddcf634b986b':
  b/2157070 Fixed the Calendar event reminder alert.

14 years agoFasttrack->QuickContact
Evan Millar [Thu, 1 Oct 2009 02:29:25 +0000 (19:29 -0700)]
Fasttrack->QuickContact

Change-Id: I78c9166f01511172f2ba72fc2d595014e7690bd7

14 years agoMerge change I161a5026 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 00:55:13 +0000 (20:55 -0400)]
Merge change I161a5026 into eclair

* changes:
  b/2157070 Fixed the Calendar event reminder alert.

14 years agob/2157070 Fixed the Calendar event reminder alert.
Michael Chan [Wed, 30 Sep 2009 18:44:16 +0000 (11:44 -0700)]
b/2157070 Fixed the Calendar event reminder alert.

Change-Id: I161a5026307717209f98e3e14394e13ab6a592cf

14 years agoam 08816769: Change FasttrackBadgeWidget->QuickContactBadge
Evan Millar [Wed, 30 Sep 2009 17:09:16 +0000 (10:09 -0700)]
am 08816769: Change FasttrackBadgeWidget->QuickContactBadge

Merge commit '08816769d1e4f2d417cbc812ad04e9294dd83a3c' into eclair-plus-aosp

* commit '08816769d1e4f2d417cbc812ad04e9294dd83a3c':
  Change FasttrackBadgeWidget->QuickContactBadge

14 years agoChange FasttrackBadgeWidget->QuickContactBadge
Evan Millar [Wed, 30 Sep 2009 01:08:53 +0000 (18:08 -0700)]
Change FasttrackBadgeWidget->QuickContactBadge

Change-Id: Ib2c1fa93fe92833b4dd13ab4552816ed12904765

14 years agoam c56f2e4a: Newer icons
Mike Cleron [Wed, 30 Sep 2009 08:40:57 +0000 (01:40 -0700)]
am c56f2e4a: Newer icons

Merge commit 'c56f2e4acd59590d2065778e39dc50d547331b7e' into eclair-plus-aosp

* commit 'c56f2e4acd59590d2065778e39dc50d547331b7e':
  Newer icons

14 years agoNewer icons
Mike Cleron [Wed, 30 Sep 2009 08:11:42 +0000 (01:11 -0700)]
Newer icons

14 years agoam 350ec551: Merge change Ie7acf3bd into eclair
Daniel Sandler [Wed, 30 Sep 2009 04:40:30 +0000 (21:40 -0700)]
am 350ec551: Merge change Ie7acf3bd into eclair

Merge commit '350ec5513f49b60dac5275fe40621edf59cf25f0' into eclair-plus-aosp

* commit '350ec5513f49b60dac5275fe40621edf59cf25f0':
  New hdpi assets.

14 years agoMerge change Ie7acf3bd into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 04:35:38 +0000 (00:35 -0400)]
Merge change Ie7acf3bd into eclair

* changes:
  New hdpi assets.

14 years agoNew hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:32:02 +0000 (00:32 -0400)]
New hdpi assets.

Drop dated 29-Sep-2009.

Change-Id: Ie7acf3bddad2b09087458ad23ed96031e00b3ab8

14 years agoam 9b67695b: Merge change I404f895f into eclair
Michael Chan [Wed, 30 Sep 2009 01:15:42 +0000 (18:15 -0700)]
am 9b67695b: Merge change I404f895f into eclair

Merge commit '9b67695b8a70a018493fa01924d67dbdb9560bd3' into eclair-plus-aosp

* commit '9b67695b8a70a018493fa01924d67dbdb9560bd3':
  b/2078757 Validate the authority of the intent.

14 years agoMerge change I404f895f into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 01:10:42 +0000 (21:10 -0400)]
Merge change I404f895f into eclair

* changes:
  b/2078757 Validate the authority of the intent.

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Sep 2009 23:40:55 +0000 (16:40 -0700)]
Import revised translations.  DO NOT MERGE

14 years agob/2078757 Validate the authority of the intent.
Michael Chan [Tue, 29 Sep 2009 21:46:44 +0000 (14:46 -0700)]
b/2078757 Validate the authority of the intent.

Change-Id: I404f895fc17f522c53b43e6a6e76eb8e175f7aa2

14 years agoam 4f90aa9f: New icons
Mike Cleron [Tue, 29 Sep 2009 07:06:23 +0000 (00:06 -0700)]
am 4f90aa9f: New icons

Merge commit '4f90aa9f94f2d4512fe438964f83aa278d29cc0e' into eclair-plus-aosp

* commit '4f90aa9f94f2d4512fe438964f83aa278d29cc0e':
  New icons