OSDN Git Service
Patrick Scott [Thu, 19 Nov 2009 14:13:48 +0000 (09:13 -0500)]
Allow picking ringtones as alarm alerts.
The original request was for just a few of the ringtones but that really isn't
possible with the current framework. Media files are classified by what folder
they are transferred to during the build. It would be nice to have a way to
specify what media files should be allowed in the list of ringtones but for now,
I think it is ok to allow selecting any of the built-in ringtones.
Daniel Sandler [Wed, 18 Nov 2009 19:21:01 +0000 (14:21 -0500)]
Myriad fixes & cleanups in DeskClock.
- Force the weather widget to actually fetch new data at
the moment the device is docked, or when the screensaver
disappears (if the device is plugged in).
- Use Intent.FLAG_ACTIVITY_CLEAR_TOP to launch weather,
music, and gallery to avoid jumping into the middle of
their task stacks (http://b/
2267831)
- Fix layout issues with weather, particularly when the
Genie widget is unavailable. (relates to
http://b/
2254472)
- Internationalize the error message shown when Genie
malfunctions.
- Clean up weather & time displays to match UX specs more
closely (fonts, shadow crop issues).
- Remove some tabs in XML.
- Internal cleanup: use "query" in the name of functions &
variables related to getting updated weather from Genie;
use "fetch" to refer to downloading new weather data from
the network
Patrick Scott [Wed, 18 Nov 2009 14:53:03 +0000 (09:53 -0500)]
UI tweaks to meet Jeff's spec.
Colors and text sizes are exactly how Jeff specified in the pdf. I tried to
match the size of everything based on looks but I might be a little off in
padding. The shadow effect on the bottom clock has been left out for now since
there are no specifics in the spec for each of the shadow components and I
cannot figure it out based on the drawing.
Patrick Scott [Mon, 16 Nov 2009 21:11:32 +0000 (16:11 -0500)]
Finish the UI improvements for the alarm list.
Android (Google) Code Review [Mon, 16 Nov 2009 19:10:02 +0000 (11:10 -0800)]
Merge change Ic31f08c3 into eclair
* changes:
Make the default ringtone selected in the list.
Patrick Scott [Mon, 16 Nov 2009 16:56:04 +0000 (11:56 -0500)]
Make the default ringtone selected in the list.
Bug:
2260622
Patrick Scott [Mon, 16 Nov 2009 12:50:20 +0000 (07:50 -0500)]
New UI for the list of alarms.
Still need to put the "Add alarm" item at the top and the clock at the bottom.
Android (Google) Code Review [Sat, 14 Nov 2009 01:45:25 +0000 (17:45 -0800)]
Merge change Ia9f7e629 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:21:12 +0000 (17:21 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daniel Sandler [Fri, 13 Nov 2009 20:02:08 +0000 (12:02 -0800)]
Fine-tuning the DeskClock UI.
Date format used is the new full_wday_month_day_no_year,
which should fix http://b/
2254472 and http://b/
2247356 .
Font sizes and colors tweaked to match latest spec.
Eric Fischer [Fri, 13 Nov 2009 03:47:57 +0000 (19:47 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daniel Sandler [Thu, 12 Nov 2009 21:40:19 +0000 (13:40 -0800)]
Fix http://b/
2249983 .
Place the other activities in Clock in their own task
affinity and hide them from the recent apps list.
Additionally, launch other apps with the new task flag
(since we're behaving like a launcher).
Android (Google) Code Review [Thu, 12 Nov 2009 13:40:00 +0000 (05:40 -0800)]
Merge change Ic7edd6ea into eclair
* changes:
Cancel the snooze if the user sets an alarm for before the snooze fires.
Daniel Sandler [Thu, 12 Nov 2009 07:09:28 +0000 (23:09 -0800)]
Fix b/
2235284 by putting the next alarm in the Clock screen saver mode.
TBR.
Daniel Sandler [Thu, 12 Nov 2009 01:33:13 +0000 (17:33 -0800)]
Add text descriptions for icons in DeskClock.
Fixes http://b/
2249982 (these icons were inaccessible to TTS).
Daniel Sandler [Wed, 11 Nov 2009 19:27:00 +0000 (11:27 -0800)]
Fix http://b/
2232909 .
Rather than being fancy and firing off the NOW_PLAYING
activity (which doesn't like to be launched if nothing's
playing), we just launch the Music app as if it were
starting from Launcher.
Daniel Sandler [Wed, 11 Nov 2009 19:03:10 +0000 (11:03 -0800)]
Use an alarm to refresh the date at midnight.
Fixes http://b/
2251125 (we were detecting user-initiated
date changes but not the natural rolling of one day into the
next).
Daniel Sandler [Wed, 11 Nov 2009 18:20:12 +0000 (10:20 -0800)]
Fix http://b/
2246758 (new icon for slideshow)
Daniel Sandler [Tue, 10 Nov 2009 19:05:42 +0000 (11:05 -0800)]
Preserve dim status when pausing.
Fixes http://b/
2251135 (snoozing an alarm leaves the clock
in painfully-bright mode).
Patrick Scott [Mon, 9 Nov 2009 19:59:05 +0000 (14:59 -0500)]
Cancel the snooze if the user sets an alarm for before the snooze fires.
If the alarm is enabled, check the snooze time to see if it needs to be
cancelled. Remove the preference and notification if cancelled. Return the
calculated time from setAlarm to avoid another calculation.
Bug:
2139162
Daniel Sandler [Fri, 6 Nov 2009 19:45:45 +0000 (14:45 -0500)]
More UI tweaks:
- Add an options menu to the main Clock activity.
(The only item is "Alarms" to switch to the Alarm
activity; no icon yet.)
- Now showing current temperature as well as high/low temps.
- Remove year from the displayed date.
- Tidy layouts.
Daniel Sandler [Fri, 6 Nov 2009 16:27:27 +0000 (11:27 -0500)]
DeskClock UI fixes.
- darker shade on the user's background
- stop clipping the left-hand side of the time (was moving
it over to accommodate Clockopia's generous tracking, but
it's causing drawing issues)
- AM/PM now in Droid Sans
- calmer green in screen-saver mode
Android (Google) Code Review [Fri, 6 Nov 2009 01:21:30 +0000 (20:21 -0500)]
Merge change I7ea1d183 into eclair
* changes:
Alarm Clock is now simply Clock.
Daniel Sandler [Fri, 6 Nov 2009 01:18:38 +0000 (20:18 -0500)]
Alarm Clock is now simply Clock.
Daniel Sandler [Thu, 5 Nov 2009 21:19:26 +0000 (16:19 -0500)]
Launch the Genie widget when the weather is tapped.
Fixes: http://b/
2240161
Daniel Sandler [Thu, 5 Nov 2009 14:37:37 +0000 (09:37 -0500)]
Fix trackball focus issues on orientation change.
http://b/
2232758
Daniel Sandler [Thu, 5 Nov 2009 04:17:15 +0000 (23:17 -0500)]
Integrate final button artwork for DeskClock.
Daniel Sandler [Wed, 4 Nov 2009 15:13:26 +0000 (10:13 -0500)]
Start Gallery in slideshow mode from DeskClock.
Android (Google) Code Review [Wed, 4 Nov 2009 14:03:25 +0000 (09:03 -0500)]
Merge change I0a267d0f into eclair
* changes:
More tweaks per spec.
Daniel Sandler [Tue, 3 Nov 2009 20:38:39 +0000 (15:38 -0500)]
More tweaks per spec.
- Synchronize screensaver jumping to the second
- Turn on the display when this app is launched (by docking
the device)
- Show DeskClock on top of the keyguard
- Use Math.round() to compute Fahrenheit (sync up with Genie
widget)
- Stop moving the screensaver while the display is off.
(http://b/
2234698)
- Minor code cleanups.
Patrick Scott [Tue, 3 Nov 2009 17:52:31 +0000 (12:52 -0500)]
Change default sort order to sort by alarm time.
Will make the same change to AlarmClock in mr2.
Bug:
2228476
Daniel Sandler [Mon, 2 Nov 2009 21:23:52 +0000 (16:23 -0500)]
AlarmClock tweaks.
- No more layout jumps when switching between dim/undim
modes
- Now registers itself as the "dock home"---that is, it
hijacks the home softkey away from Launcher while the
device is docked
- Shows "on top" of the keyguard; all exits, however, will
return to the keyguard before completing
- Now uses the WindowManager to hold a wakelock when
necessary
- Tweaked weather display (bringing the weather icon size
under control)
Daniel Sandler [Fri, 30 Oct 2009 18:54:16 +0000 (14:54 -0400)]
Completed weather support; new screen-saving mode.
Now pulls high and low temperatures, as well as an icon (in
the form of a drawable resource), from the Genie widget,
periodically. Known issues: artwork is mdpi and fuzzy (bug
in Genie).
Preliminary support for a new screen-saving mode (subject to
change) specifically for OLEDs with short B/R subpixel
lifetime. Text is drawn in green on a black background; the
text also randomly jumps around the screen. Any user input
(touch, trackball/keypress, etc.) will restore the previous
view.
Screen saver mode kicks in after a delay (or, for debugging,
a longpress on "Dim"). Honors the current dimness setting,
so if the clock is currently in nightstand mode, the screen
saver will be very dim; otherwise (viz., desk mode) the
saver will be brighter.
Daniel Sandler [Fri, 30 Oct 2009 13:06:20 +0000 (09:06 -0400)]
Rename Desk Clock (back) to Alarm Clock.
Rationale: Users looking for alarms won't know where to go
otherwise. Desk-clock functionality is unchanged, however;
the main activity is still the full-screen clock with
wallpaper and weather.
Android (Google) Code Review [Thu, 29 Oct 2009 15:42:24 +0000 (11:42 -0400)]
Merge change I2763ab4c into eclair
* changes:
Show weather forecast in DeskClock.
Daniel Sandler [Tue, 27 Oct 2009 20:46:57 +0000 (16:46 -0400)]
Show weather forecast in DeskClock.
Currently querying the GenieWidget; if it's not present, no
weather is shown or even hinted at in the UI. If GenieWidget
is available but fails to respond to the query, we show
"Weather unavailable." (needs i18n)
Note that Genie's WeatherProvider is currently broken, so
for now you'll always see "Weather unavailable."
Other changes:
- Fix dimming/flashing on rotation.
- Fix other layout problems & inefficiencies.
Android (Google) Code Review [Wed, 28 Oct 2009 18:00:42 +0000 (14:00 -0400)]
Merge change Ia21b2db5 into eclair
* changes:
The snooze notification must be clicked to be cleared.
Patrick Scott [Wed, 28 Oct 2009 16:36:06 +0000 (12:36 -0400)]
The snooze notification must be clicked to be cleared.
Change all the notifications to ongoing. This means they cannot be cleared
unless clicked. If the alarm is killed after 10 minutes, the notification is
changed to a vanilla notification and can be cleared with the "Clear All"
button.
This change will be merged to the MR2 branch of AlarmClock.
Bug:
2220016
Mike Cleron [Wed, 28 Oct 2009 08:00:57 +0000 (01:00 -0700)]
New launcher icon, and placeholder for new widget icon
Android (Google) Code Review [Tue, 27 Oct 2009 19:46:31 +0000 (15:46 -0400)]
Merge change Iacb94df8 into eclair
* changes:
New widget assets
Daniel Sandler [Tue, 27 Oct 2009 13:46:05 +0000 (09:46 -0400)]
Landscape layout for DeskClock.
Created several new sub-layouts that are shared between the
two orientations.
Known issue: the activity currently re-starts (forgetting
the dim state) between orientations.
Mike Cleron [Tue, 27 Oct 2009 06:18:09 +0000 (23:18 -0700)]
New widget assets
Daniel Sandler [Fri, 23 Oct 2009 20:11:08 +0000 (16:11 -0400)]
Wiring up gallery & music buttons.
Daniel Sandler [Fri, 23 Oct 2009 17:41:19 +0000 (13:41 -0400)]
UI improvements to DeskClock.
Fixes:
- "Dim" button moved to TR corner per spec.
- Next Alarm moved to TL corner per spec.
- Launcher button added (not yet wired).
- Battery indicator added to BR corner per spec.
- Drop shadow added to all text per spec.
- Layout now fills the portrait display vertically.
Known problems:
- No landscape layout
- Layout jumps when status bar disappears for dim mode
- No artwork yet
- Weather is a big orange box instead of, you know, weather
Daniel Sandler [Fri, 23 Oct 2009 14:02:16 +0000 (10:02 -0400)]
Reduce size of digital clock display.
Clockopia has substantially different glyph widths across
[0..9], and a pathologically wide time (e.g. "12:55") was
nudging "AM" onto two lines.
Daniel Sandler [Thu, 22 Oct 2009 13:42:27 +0000 (09:42 -0400)]
Wire up date & next alarm displays.
Change-Id: I367e0dcdb3fdfa7256dfd5ce54097c8206806f51
Patrick Scott [Thu, 22 Oct 2009 15:13:13 +0000 (11:13 -0400)]
Show AM/PM in the same spot on the clock.
Make the alarm list, main screen, and alert consistent. Have DigitalClock deal
with the AM/PM strings. Put a little padding above and below the clock in the
alert.
Patrick Scott [Thu, 22 Oct 2009 14:30:53 +0000 (10:30 -0400)]
Replace AlarmClock with DeskClock.
Product files need to specify DeskClock to trigger this.
Daniel Sandler [Tue, 20 Oct 2009 20:51:32 +0000 (16:51 -0400)]
New DeskClock activity, now the main app entry point.
UI not yet wired up for the most part, but Alarms should
take you to the AlarmClock activity, and there's a
functional implementation of screen dimming ("nightstand
mode").
Patrick Scott [Tue, 20 Oct 2009 20:30:55 +0000 (16:30 -0400)]
Remove the menu and replace with buttons.
Change the layout to allow two buttons at the bottom of the list. Update the
"Add alarm" button when adding/removing alarms to change enabled state.
Patrick Scott [Tue, 20 Oct 2009 15:10:33 +0000 (11:10 -0400)]
Use Clockopia as the typeface for the digital clock.
Patrick Scott [Mon, 19 Oct 2009 20:15:39 +0000 (16:15 -0400)]
Change the default alarms.
8:30 am MTWThF
9:00 am SatSun
Patrick Scott [Mon, 19 Oct 2009 12:52:35 +0000 (08:52 -0400)]
Remove the clock face from the alarm list.
Remove all the clock layouts except the digital. Remove the clock picker and any
settings related to change the clock face.
Next step: Move the settings and add alarm menu items to buttons.
Daniel Sandler [Fri, 16 Oct 2009 20:12:30 +0000 (16:12 -0400)]
Moving things around a little in the new DeskClock.
- Package is now com.android.deskclock
- Launches in response to insertion in desk dock or
DESK dialercode
TODO next: split the AlarmClock activity into a DeskClock
and AlarmList (or similar).
Patrick Scott [Fri, 16 Oct 2009 17:28:58 +0000 (13:28 -0400)]
Fix the build.
Eric Fischer [Thu, 8 Oct 2009 22:00:21 +0000 (15:00 -0700)]
am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
eecd5bff15281c7feec9c9cb9b86157ec5e7d46e' into eclair
* commit '
eecd5bff15281c7feec9c9cb9b86157ec5e7d46e':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 2 Oct 2009 14:43:25 +0000 (10:43 -0400)]
Merge change If8d2e944 into eclair
* changes:
Icons again
Mike Cleron [Fri, 2 Oct 2009 07:28:57 +0000 (00:28 -0700)]
Icons again
Daniel Sandler [Thu, 1 Oct 2009 15:11:46 +0000 (11:11 -0400)]
Remove superfluous icon.
Use old Cupcake icon as mdpi until we get a proper mdpi version of the new
icon.
Change-Id: I5bbd624a77ab5b37570f10b2159198683b09f3a3
Dianne Hackborn [Thu, 1 Oct 2009 04:04:44 +0000 (21:04 -0700)]
Fix issue #
2154688: when alarm rings ,device does not wake up...
...and can't see Dismiss and Snooze button if the device is on dock
Change-Id: Ib76b54f0a65930e142a3da1e1152f70d7f3ad3c7
Explanation: only the fullscreen alarm activity had the flags set to turn on
the screen and dismiss the lock screen. The app picks whether to show
that one or the non-fullscreen one based on whether device is currently
locked, which is correct, but with the introduction of docks, locked
!= screen off. In particular, the desk dock keeps the keyguard dismissed
while the device is in it.
The fix is to just set these flags for both alert activities. That seems
generally right for many reasons.
Android (Google) Code Review [Wed, 30 Sep 2009 19:23:13 +0000 (15:23 -0400)]
Merge change I7495b004 into eclair
* changes:
Pressing back will now save the alarm similar to how donut behaves.
Patrick Scott [Wed, 30 Sep 2009 19:05:55 +0000 (15:05 -0400)]
Pressing back will now save the alarm similar to how donut behaves.
Do not pop the toast unless the alarm is enabled. Keep the enabled state when
saving the alarm unless the time has changed.
Android (Google) Code Review [Wed, 30 Sep 2009 16:05:31 +0000 (12:05 -0400)]
Merge change Ie77b0e71 into eclair
* changes:
Newer icons
Daniel Sandler [Wed, 30 Sep 2009 12:55:05 +0000 (08:55 -0400)]
Updated AlarmClock hdpi graphics.
Change-Id: Icd93c45ac7431434328d9a737979e057285e0e40
Mike Cleron [Wed, 30 Sep 2009 08:08:16 +0000 (01:08 -0700)]
Newer icons
Eric Fischer [Tue, 29 Sep 2009 23:40:14 +0000 (16:40 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Tue, 29 Sep 2009 18:19:46 +0000 (14:19 -0400)]
Merge change I3105cddf into eclair
* changes:
Use onStartCommand since onStart is deprecated.
Patrick Scott [Tue, 29 Sep 2009 15:21:24 +0000 (11:21 -0400)]
Use onStartCommand since onStart is deprecated.
If the intent is non-null and contains a valid alarm, return
START_STICKY.
Mike Cleron [Tue, 29 Sep 2009 06:42:54 +0000 (23:42 -0700)]
New icon
Dianne Hackborn [Tue, 22 Sep 2009 20:44:12 +0000 (13:44 -0700)]
Update to use new unlock APIs, new wallpaper theme.
Also don't allow the user to press back when in the full screen alarm.
Change-Id: Ic0c9658c75d3a2b3f49028f432fe226b1a0d8e9e
Patrick Scott [Fri, 18 Sep 2009 20:02:09 +0000 (16:02 -0400)]
Fix a couple race conditions with expired alarms.
Log the alarm time in a pretty format for easier debugging. Disable expired
alarms when calculating the next alert. This solves 2 problems: an expired alarm
remains checked in the UI and the expired alarm is sent to the alarm manager. I
believe the second problem is causing bug
2080160.
Eric Fischer [Thu, 17 Sep 2009 21:28:38 +0000 (14:28 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Wed, 16 Sep 2009 05:58:50 +0000 (22:58 -0700)]
Use new window manager flag for turning on the screen.
This allows the alert to no longer deal with a full wake lock itself,
and allows the window manager to take care of not turning it on until
the activity's window is actually displayed.
Change-Id: I2c3529c3d12a5a9c9add71636ce958d3205832e8
Patrick Scott [Tue, 15 Sep 2009 13:37:57 +0000 (09:37 -0400)]
Prevent leaking windows by listening for config changes.
Remove the old database sanity check as it will not happen. Remove the strings
associated with the db error as well. Update the layout of the AlarmClock
activity during configuration changes so that the activity is no longer
destroyed and leaking the delete alert.
Patrick Scott [Tue, 15 Sep 2009 12:00:09 +0000 (08:00 -0400)]
Revert the AlarmAlert to a rotatable activity.
Remove the orientation from the manifest. Edit the alarm_alert.xml layout to be
more accommodating to landscape. Add circle#_drawable.xml files that are
BitmapDrawables for the circle animation. This prevents the background animation
from being stretched to the view size.
Eric Fischer [Tue, 8 Sep 2009 23:24:23 +0000 (16:24 -0700)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Fri, 4 Sep 2009 15:37:37 +0000 (11:37 -0400)]
Restore alpha channel on clock hand.
Fixes http://b/
2091179 .
Patrick Scott [Thu, 3 Sep 2009 20:13:26 +0000 (16:13 -0400)]
Fix a permission typo.
Patrick Scott [Thu, 3 Sep 2009 18:18:13 +0000 (14:18 -0400)]
Kill the alarm when a call comes in.
If the alarm fires while in a call, remember the call state since registering
for call state changes triggers onCallStateChanged and we don't want to kill the
alarm in that case.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for AlarmClock.
Ed Heyl [Thu, 20 Aug 2009 23:52:31 +0000 (16:52 -0700)]
Ed Heyl [Thu, 20 Aug 2009 23:41:05 +0000 (16:41 -0700)]
Eric Fischer [Thu, 20 Aug 2009 23:00:34 +0000 (16:00 -0700)]
am
7c65f0df: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7c65f0df157dd1e0a6dfba9c21057b8caa8cb2bc' into eclair
* commit '
7c65f0df157dd1e0a6dfba9c21057b8caa8cb2bc':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Aug 2009 21:07:36 +0000 (14:07 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Wed, 19 Aug 2009 21:30:27 +0000 (14:30 -0700)]
am
8d58816a: (-s ours) Do not merge. Revert "Do not merge."
Merge commit '
8d58816a7f2cf3b4de4c1932bbde39be7a489b82' into eclair
* commit '
8d58816a7f2cf3b4de4c1932bbde39be7a489b82':
Do not merge.
Patrick Scott [Wed, 19 Aug 2009 20:34:21 +0000 (16:34 -0400)]
Do not merge.
Revert "Do not merge."
This reverts commit
372cbb5437b209f6d909ea247080da6a48c3a590.
Patrick Scott [Wed, 19 Aug 2009 20:19:15 +0000 (16:19 -0400)]
Fix some copy-paste errors and acquire locks before launching the Activity.
Acquiring the locks before launching the Activity prevents some strange pausing
behavior in ActivityManager. If the screen is off, the ActivityManager attempts
to pause the Activity before resuming it.
Patrick Scott [Wed, 19 Aug 2009 18:12:27 +0000 (11:12 -0700)]
am
372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.
Merge commit '
372cbb5437b209f6d909ea247080da6a48c3a590' into eclair
* commit '
372cbb5437b209f6d909ea247080da6a48c3a590':
Do not merge.
Patrick Scott [Wed, 19 Aug 2009 18:07:02 +0000 (14:07 -0400)]
Do not merge.
Wake the screen before launching the AlarmAlert.
This ensures that if an alarm has already been killed due to the timeout, a
second alarm will wake the device and play the alert. The ActivityManager will
not resume the top activity if the device is sleeping (meaning the screen is
off).
Eric Fischer [Tue, 18 Aug 2009 18:00:24 +0000 (11:00 -0700)]
am
9229d3f6: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9229d3f66c7550f9c51ecb69b1fca739051e7f48' into eclair
* commit '
9229d3f66c7550f9c51ecb69b1fca739051e7f48':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 17 Aug 2009 20:13:59 +0000 (13:13 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Tue, 11 Aug 2009 17:39:40 +0000 (13:39 -0400)]
Fix the clock face preference.
I was clearing all the preferences when removing the snooze and that was
clearing the clock face and visibility preference as well. Instead, remove the
snooze preferences. Also, use the constant PREF_CLOCK_FACE instead of the
literal string.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Mon, 3 Aug 2009 23:40:01 +0000 (16:40 -0700)]
am
a50bd6df: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a50bd6dff1e8e17515fcb93c2769d4f9acbead15'
* commit '
a50bd6dff1e8e17515fcb93c2769d4f9acbead15':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:07:19 +0000 (16:07 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Eric Fischer [Wed, 22 Jul 2009 18:48:58 +0000 (11:48 -0700)]
resolved conflicts for merge of
1bc128fd to master