summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 77412fb0: Merge "Allow reformatted timezone display name to show." into ↵Sam Blitzstein2013-04-272-4/+5
|\| | | | | | | | | | | | | | | | | | | | ics-ub-calendar-cream * commit '77412fb0c2e9dbab84abc2862697f93c17644339': Allow reformatted timezone display name to show.
| * | Allow reformatted timezone display name to show.Sam Blitzstein2013-04-262-4/+5
| |/ | | | | | | | | | | New timezone display name uses charsequence with spannables. Change-Id: Iab60cfeb3e0e6d55fa27e0fa12a12345e6f8ae23
* | don't support params we don't even implement.Chris Wren2013-04-263-7/+3
| | | | | | | | | | Bug: 8640246 Change-Id: I4f902e8cd0f92262bc46957314ef165840258eaa
* | am 2a7dd0c3: Added copyright noticesMichael Chan2013-04-233-0/+48
|\| | | | | | | | | * commit '2a7dd0c37ff0aa0378bb01e7230e106ea3c49656': Added copyright notices
| * Added copyright noticesMichael Chan2013-04-233-0/+48
| | | | | | | | Change-Id: Iec67fa4b10cc5918afa36211a861b65e83e71342
* | am aafaa5f3: Pluralizing recurrence picker interval stringsJames Kung2013-04-231-7/+17
|\| | | | | | | | | * commit 'aafaa5f3d4d94d193186df868a76aed484a14255': Pluralizing recurrence picker interval strings
| * Pluralizing recurrence picker interval stringsJames Kung2013-04-231-7/+17
| | | | | | | | | | Bug: 8696938 Change-Id: Ibbcac7452aa35fa3256f5ac99f19c532c954404c
* | am 7abe4067: Merge "Fix bug where monthly recurrence string was stale." into ↵Sam Blitzstein2013-04-221-4/+2
|\| | | | | | | | | | | | | ics-ub-calendar-cream * commit '7abe4067051ffc7de304f6eb2642f3c3b4206a8b': Fix bug where monthly recurrence string was stale.
| * Merge "Fix bug where monthly recurrence string was stale." into ↵Sam Blitzstein2013-04-221-4/+2
| |\ | | | | | | | | | ics-ub-calendar-cream
| | * Fix bug where monthly recurrence string was stale.Sam Blitzstein2013-04-221-4/+2
| | | | | | | | | | | | | | | Bug: 8685612 Change-Id: Iac759d20ba0083234d832113f50a2f607a32a99b
* | | am 236429f2: Fix for duplicate remindersJames Kung2013-04-221-1/+1
|\| | | | | | | | | | | | | | * commit '236429f2feef94aa34520f4ded34777061c36851': Fix for duplicate reminders
| * | Fix for duplicate remindersJames Kung2013-04-221-1/+1
| |/ | | | | | | | | Bug: 8669743 Change-Id: I454d198f2ec6138714b440d0ca649266675bd2ed
* | am 1851ecb4: Do not use backed up ringtone valuesMichael Chan2013-04-194-13/+79
|\| | | | | | | | | * commit '1851ecb450bbfa40ef375a914d1c31c793684894': Do not use backed up ringtone values
| * Do not use backed up ringtone valuesMichael Chan2013-04-194-13/+79
| | | | | | | | | | | | | | | | Ringtone uri is device specific so it should not be backed up. Restored value should not be used. Bug: 8633937 Change-Id: Ia0cd442635169f58455637b27057d74f99e0d671
* | Merge "GCM demands that everything be a String." into ics-ub-calendar-denimChris Wren2013-04-191-6/+7
|\ \
| * | GCM demands that everything be a String.Chris Wren2013-04-181-6/+7
| | | | | | | | | | | | | | | | | | | | | Also put prefixes on the keys, to avoid collisions. Bug: 8640246 Change-Id: I16771eb0427b20c315c011e7049f038d0bdab062
* | | Merge "return a result on the receiver." into ics-ub-calendar-denimChris Wren2013-04-181-0/+3
|\| |
| * | return a result on the receiver.Chris Wren2013-04-181-0/+3
| | | | | | | | | | | | Change-Id: I78844ac150a83357e23c19363f37b347e9ad42db
* | | am 2e760f90: Use default ringtone if nothing is found in preference.Sam Blitzstein2013-04-182-1/+4
|\ \ \ | |/ / |/| / | |/ | | * commit '2e760f909aac60f9db66bb293377f8fabad08e51': Use default ringtone if nothing is found in preference.
| * Use default ringtone if nothing is found in preference.Sam Blitzstein2013-04-182-1/+4
| | | | | | | | | | Bug: 8655634 Change-Id: I2fbab40b912996331b5eac77d8c918998a66e25b
* | Merge "add global dismiss to calendar, open source part" into ↵Chris Wren2013-04-177-4/+478
|\ \ | |/ |/| | | ics-ub-calendar-denim
| * add global dismiss to calendar, open source partChris Wren2013-04-167-4/+478
| | | | | | | | Change-Id: If179adc814a1da977712c9dc804e81a2cc726bce
* | Merge "Recurrence picker UI re-design" into ics-ub-calendar-creamJames Kung2013-04-171-6/+21
|\ \ | |/ |/|
| * Recurrence picker UI re-designJames Kung2013-04-161-6/+21
| | | | | | | | | | Bug: 8620727 Change-Id: If4f4cc2a05fa37315a7e902148d6dac4980b3bcb
* | Merge "Check to prevent index out of bounds exception" into ↵James Kung2013-04-151-1/+8
|\ \ | |/ |/| | | ics-ub-calendar-cream
| * Check to prevent index out of bounds exceptionJames Kung2013-04-151-1/+8
| | | | | | | | | | Bug: 8368385 Change-Id: I4246f3a70039288c91bf084cac4e2db631ca0a4a
* | Replacing long click listener with onLongPressJames Kung2013-04-153-19/+24
|/ | | | | | | | Replacing getActivity() with mActivity Bug: 8528570 Bug: 8568946 Change-Id: I6ed002b2bab778235da2ce59142e260c7c25203d
* Fixed the problem where the Home Time Zone may revert to GMT0.Michael Chan2013-04-121-5/+20
| | | | | | | | It turns out that the display name was saved to the provider instead of the time zone id. Bug: 8600537 Change-Id: Ifab27af1e89cc9aaa9fc2a858ca41b3fe2b0b74a
* Fix for duplicate icons in agenda viewJames Kung2013-04-111-2/+3
| | | | | Bug: 8568946 Change-Id: I7d200c40fc2230d811763bca7c5cdbe10bd8ce65
* Calling executePendingTransactions() before isAdded()James Kung2013-04-111-4/+3
| | | | | Bug: 8596504 Change-Id: I3b8c85a30c58045e261a73141776e5e9db9f6654
* Use pre-set timezone display names when default is low quality.Sam Blitzstein2013-04-112-3/+15
| | | | | Bug: 8569877 Change-Id: I6496a599365008ae4db07e4a60b38d480b138629
* Fixing possible bugs while showing TimePicker Dialog.Sam Blitzstein2013-04-081-6/+24
| | | | Change-Id: I69db077e943b011538ebc0d091dfd99953e417b5
* Max year should be 2036James Kung2013-04-081-1/+1
| | | | | Bug: 8566520 Change-Id: I8de385dac83807ba6c23eadecbed7fc2f5a12962
* Temporary fix for attendee concatenation error.James Kung2013-04-041-1/+7
| | | | | | | Please revert for MR2, with fix in ex/chips. Bug: 8420292 Change-Id: I184e963dc41d15fb5f56caa4d0a9a5a827a6d1a0
* Integrating time zone picker into settingsJames Kung2013-04-043-494/+60
| | | | Change-Id: Ie7099dc5ef1e4e21cf231eb7a452d882b6056cb3
* Hide color picker button if calendar cannot be modifiedJames Kung2013-04-032-5/+6
| | | | | Bug: 8537803 Change-Id: If7630e070b8502973ffa288c4202d5f2a14bf8ab
* Merge "Remove setTargetFragment calls on EventColorPickerDialog." into ↵James Kung2013-04-035-37/+72
|\ | | | | | | ics-ub-calendar-cream
| * Remove setTargetFragment calls on EventColorPickerDialog.James Kung2013-04-025-37/+72
| | | | | | | | | | Bug: 8310930 Change-Id: I2116bc05a8da31150b925361c91c222fbbdee2bd
* | New time zone pickerMichael Chan2013-04-031-77/+86
| | | | | | | | Change-Id: I88b34b92c03e14e1812536314f4e2b846ff18276
* | Fix for crashing on rotation with no reminders.Sam Blitzstein2013-04-021-1/+6
|/ | | | | Bug: 8424377 Change-Id: Idcfe8480226b42b100ae3ef6f49dd764f4149801
* Merge "Adding init state booleans for int color variables" into ↵James Kung2013-04-026-35/+108
|\ | | | | | | ics-ub-calendar-cream
| * Adding init state booleans for int color variablesJames Kung2013-03-076-35/+108
| | | | | | | | Change-Id: I5b4eb3e4f9180df4685b9ec11c6009464a719ab5
* | Merge "Quiet exception when extension files are not found" into ↵Michael Chan2013-04-021-3/+7
|\ \ | | | | | | | | | ics-ub-calendar-cream
| * | Quiet exception when extension files are not foundMichael Chan2013-04-011-3/+7
| | | | | | | | | | | | | | | | | | Capitalize Until Change-Id: If8c90bba5029c490ca4b96c63c857465f5c8f0b6
* | | Integrating new date picker into appJames Kung2013-04-014-140/+96
|/ / | | | | | | | | Bug: 7712637 Change-Id: I589988f355200e64ff97fb0cefd2b029c73c7641
* | Merge "Refactoring TimePicker packagename." into ics-ub-calendar-creamSam Blitzstein2013-03-291-4/+4
|\ \
| * | Refactoring TimePicker packagename.Sam Blitzstein2013-03-291-5/+4
| | | | | | | | | | | | Change-Id: I17a03c930fbd20cd3df2eaa9b81cd1f2569e4f53
* | | Merge "Recurrence picker update" into ics-ub-calendar-creamMichael Chan2013-03-252-60/+146
|\ \ \
| * | | Recurrence picker updateMichael Chan2013-03-252-60/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Increased recurrence and add-reminder touch targets in editevent - Updated recurrence dialog per ux design i.e. use circles, new end date button, etc. - Select all text entry fields upon click - Preserve focus upon rotation Bug: 8443583 Change-Id: I530616404b1b622bc65b9ffd0ac8b047d7e1a556
* | | | Merge "Don't focus on interval at launch." into ics-ub-calendar-creamMichael Chan2013-03-251-1/+0
|\| | |