OSDN Git Service
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:20 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:07 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Eric Fischer [Thu, 10 Dec 2009 01:24:14 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:55:28 +0000 (14:55 -0800)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Mon, 30 Nov 2009 19:54:57 +0000 (11:54 -0800)]
Merge change Iec0c9b13 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:34:49 +0000 (11:34 -0800)]
Import revised translations. DO NOT MERGE
Eric Laurent [Fri, 27 Nov 2009 13:09:58 +0000 (05:09 -0800)]
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Do not play alarms if alarm stream volume is 0.
Eric Fischer [Sat, 14 Nov 2009 01:14:37 +0000 (17:14 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:07 +0000 (18:46 -0800)]
eclair snapshot
Eric Fischer [Thu, 29 Oct 2009 04:17:28 +0000 (21:17 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:42:10 +0000 (10:42 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
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
Eric Fischer [Tue, 21 Jul 2009 23:28:30 +0000 (16:28 -0700)]
Make the "This alarm is set for N hours from now" message more localizable.
It was concatenating the days/minutes/seconds segments together with an
"and" string, which works OK in English but not so well in other languages.
Bug
1973471
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:12:49 +0000 (17:12 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Patrick Scott [Tue, 14 Jul 2009 17:47:39 +0000 (13:47 -0400)]
resolved conflicts for merge of
439d5bd5 to master
Patrick Scott [Tue, 14 Jul 2009 12:50:14 +0000 (08:50 -0400)]
Change the time format to show 2 digits for 24-hour mode.
This will show 09 instead of 9 for all hours before 10 am.
Eric Fischer [Tue, 14 Jul 2009 00:13:37 +0000 (17:13 -0700)]
Fix build breakage from automerge.
Eric Fischer [Mon, 13 Jul 2009 23:54:57 +0000 (16:54 -0700)]
resolved conflicts for merge of
f30a09a7 to master
Eric Fischer [Mon, 13 Jul 2009 22:43:19 +0000 (15:43 -0700)]
Import new translations
Patrick Scott [Wed, 8 Jul 2009 14:58:06 +0000 (10:58 -0400)]
Add a setting to change the behavior of the side buttons during an alarm.
The default behavior is to dismiss the alarm but the setting allows for snoozing
the alarm or to do nothing.
Also changed some of the strings to be more consistent.
Patrick Scott [Fri, 26 Jun 2009 18:52:56 +0000 (14:52 -0400)]
Huge rewrite of the AlarmClock to play the Alarm in a service.
The AlarmKlaxon has been converted to a service that plays the alarm and
vibrates the device. The AlarmAlert now just shows the UI for the alarm and
allows the user to snooze or dismiss the alarm. The snooze button must be
pressed in order to snooze the alarm. Volume and Camera buttons dismiss the
alarm while other buttons have their original behavior.
Each alarm triggers a notification that the alarm has fired. This allows another
activity (say, the Calendar alert #
1908616) to play on top of the AlarmAlert.
The AlarmKlaxon service will continue to play even though the alert has been
dismissed. The user can get back to the UI through the notification.
If the user snoozes the alarm, the notification reflects that choice (#
1691034)
and allows the user to cancel the snooze by clicking the notification. The
snoozed alarm takes priority over any other alarm (#
1693155) so that it will
play unless the notification is clicked.
The database interaction has also been rewritten to use a Parcelable Alarm class
for sending and receiving the alarm data in a much simpler manner. This allows
for fewer database lookups since each activity no longer has to lookup the alarm
info.
The alarm silenced text has been removed from the AlarmAlert UI and moved to the
notification area. When an alarm is killed, the alert is dismissed and the
notification reflects the state. Clicking the notification launches the SetAlarm
activity so the user can see which alarm was killed.
Patrick Scott [Thu, 18 Jun 2009 13:47:46 +0000 (09:47 -0400)]
resolved conflicts for merge of
e2285895 to master
Patrick Scott [Thu, 18 Jun 2009 13:25:48 +0000 (09:25 -0400)]
Merge the fullscreen change from master to donut for security.
Rework the AlarmAlert dialog layout.
Make the layout portrait only to make it more uniform and nicer looking. Update
all the clock layouts to have the same size. The alert will have a larger clock
than the AlarmClock screen.
Remove the old hack to make the alert a dialog.
Inflate the views with a root so the layout params will be fill_parent. Use the
animate_circle resource in setBackgroundResource to clean up the code.
Add a new AlarmAlertFullScreen activity which makes the alert fullscreen with
the current wallpaper as the background. Query the keyguard manager during the
alarm broadcast to decide which activity to launch. The regular alert activity
shows above the current activity but the fullscreen activity will not show the
previous activity for security reasons.
Add the alarm_alert style that mimics the Theme.Dialog.Alert style but does not
rely on a private resource. Add dialog.9.png for the same reason.
Add a LinearLayout surrounding the alert layout to hold the background
wallpaper.
Eric Fischer [Thu, 11 Jun 2009 00:20:43 +0000 (17:20 -0700)]
Update Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 23:31:43 +0000 (16:31 -0700)]
am
01b9b5ba: Update Portuguese translations.
Merge commit '
01b9b5baace6a45a7a4d45ba041b271662960aa4'
* commit '
01b9b5baace6a45a7a4d45ba041b271662960aa4':
Update Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 22:32:40 +0000 (15:32 -0700)]
am
64155a59: am
12afe3b7: AI 149721: Import Portuguese translations.
Merge commit '
64155a59144339e73361c1bfb2441b8baedc9fa9'
* commit '
64155a59144339e73361c1bfb2441b8baedc9fa9':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 22:08:34 +0000 (15:08 -0700)]
Update Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:31:40 +0000 (12:31 -0700)]
am
12afe3b7: AI 149721: Import Portuguese translations.
Merge commit '
12afe3b7e280aebde65f5113b794b78625a7117c' into donut
* commit '
12afe3b7e280aebde65f5113b794b78625a7117c':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:26:01 +0000 (12:26 -0700)]
AI 149721: Import Portuguese translations.
Automated import of CL 149721
Patrick Scott [Wed, 13 May 2009 12:27:34 +0000 (08:27 -0400)]
Rework the AlarmAlert dialog layout.
Make the layout portrait only to make it more uniform and nicer looking. Update
all the clock layouts to have the same size. The alert will have a larger clock
than the AlarmClock screen.
Remove the old hack to make the alert a dialog.
Inflate the views with a root so the layout params will be fill_parent. Use the
animate_circle resource in setBackgroundResource to clean up the code.
Add a new AlarmAlertFullScreen activity which makes the alert fullscreen with
the current wallpaper as the background. Query the keyguard manager during the
alarm broadcast to decide which activity to launch. The regular alert activity
shows above the current activity but the fullscreen activity will not show the
previous activity for security reasons.
Add the alarm_alert style that mimics the Theme.Dialog.Alert style but does not
rely on a private resource. Add dialog.9.png for the same reason.
Add a LinearLayout surrounding the alert layout to hold the background
wallpaper.
Patrick Scott [Tue, 19 May 2009 23:20:18 +0000 (19:20 -0400)]
Acquire the lock in onCreate again.
Remove releaseLocks since it only releases the wake lock.
Suchi Amalapurapu [Mon, 18 May 2009 20:44:40 +0000 (13:44 -0700)]
am
01dee6ee: use the new window manager flag FLAG_SHOW_WHEN_LOCKED to hide/show the keyguard window through the window manager rather than enabling or disabling the keyguard
Merge commit '
01dee6eedd37dd50961584a7c717c85f00131401'
* commit '
01dee6eedd37dd50961584a7c717c85f00131401':
use the new window manager flag FLAG_SHOW_WHEN_LOCKED to
Suchi Amalapurapu [Fri, 15 May 2009 01:11:28 +0000 (18:11 -0700)]
use the new window manager flag FLAG_SHOW_WHEN_LOCKED to
hide/show the keyguard window through the window manager
rather than enabling or disabling the keyguard
Patrick Scott [Fri, 15 May 2009 14:11:23 +0000 (10:11 -0400)]
Dismiss the alarm when hitting the camera button.
Patrick Scott [Thu, 14 May 2009 15:12:54 +0000 (11:12 -0400)]
Allow the alert to be silent.
Turn on the silent item in the ringtone picker. Detect the null alert and use a
special "silent" string as the alert to detect a silent alert. Update the
summary of the alert to show Silent as the ringtone.
Change the SetAlarm manifest to get config changes for orientation and keyboard.
This prevents the settings from resetting when changing the orientation.
Patrick Scott [Thu, 14 May 2009 14:07:45 +0000 (10:07 -0400)]
Add a setting to change the alarm volume.
Patrick Scott [Thu, 30 Apr 2009 12:23:05 +0000 (08:23 -0400)]
Cleanup the preference code for editing an alarm.
Add a save and cancel bar at the bottom similar to the contacts application.
Rather than updating the alarm in the database for every change in the settings,
the user must hit 'save' to save the changes.
Update AlarmPreference and RepeatPreference to manage their own summary instead
of having callbacks. When saving the alarm, retrieve all the values from the
preference widgets.
Make each preference non-persistent to avoid saving them to the shared
preferences.
In order to get the save/cancel buttons flush on the bottom, I have to undo
what the PreferenceActivity does in onCreate. I then build my own LinearLayout
to hold the ListView and the two buttons.
Eric Fischer [Fri, 1 May 2009 01:12:53 +0000 (18:12 -0700)]
am
5a8fa64: am
6ac4649: AI 148147: Import lots of zh_TW translation chan
Merge commit '
5a8fa64b0901a2a6961251c16f21d55c2f579c71'
* commit '
5a8fa64b0901a2a6961251c16f21d55c2f579c71':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:37:28 +0000 (17:37 -0700)]
am
6ac4649: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
6ac46491b23ebdcf99c134ab312075c231d52532' into donut
* commit '
6ac46491b23ebdcf99c134ab312075c231d52532':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:15 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
The Android Open Source Project [Wed, 29 Apr 2009 20:43:12 +0000 (13:43 -0700)]
am
9433391: Merge commit \'
405572e\' into donut
Merge commit '
9433391f73eadbccf44d170b76d675666a0fb05e'
* commit '
9433391f73eadbccf44d170b76d675666a0fb05e':
AI 147962: Import updated zh_TW translations.
The Android Open Source Project [Wed, 29 Apr 2009 20:43:12 +0000 (13:43 -0700)]
am
c37043f: Merge commit \'
4c73a7b\' into donut
Merge commit '
c37043fb692c922dd8f45ce135c040913192d58a'
* commit '
c37043fb692c922dd8f45ce135c040913192d58a':
AI 147492: Update zh_TW translations.
Patrick Scott [Tue, 28 Apr 2009 20:37:04 +0000 (16:37 -0400)]
Add a setting to change the snooze duration.
Add a ListPreference to the SettingsActivity that has entries for 5, 10, 15, 20,
25, and 30 minutes. Use the entry value as the summary so the user knows the
current setting. Use the preference value or the default of 10 in AlarmAlert.
The Android Open Source Project [Wed, 29 Apr 2009 04:55:58 +0000 (21:55 -0700)]
Merge commit '
405572e' into donut
The Android Open Source Project [Wed, 29 Apr 2009 04:55:51 +0000 (21:55 -0700)]
Merge commit '
4c73a7b' into donut
Eric Fischer [Tue, 28 Apr 2009 22:48:38 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
The Android Open Source Project [Fri, 24 Apr 2009 20:55:02 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
Eric Fischer [Thu, 23 Apr 2009 18:59:14 +0000 (11:59 -0700)]
AI 147492: Update zh_TW translations.
Automated import of CL 147492
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +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:35 +0000 (17:12 -0700)]
Merge donut into master
Eric Fischer [Thu, 16 Apr 2009 00:13:18 +0000 (17:13 -0700)]
Don't maintain separate translations in Alarm Clock for days of the week.
Use DateFormatSymbols instead to get the strings for the names of the
days the week and for "AM" and "PM".
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
Patrick Scott [Tue, 14 Apr 2009 20:55:10 +0000 (16:55 -0400)]
Extend the ListView selection behind the checkbox.
Extend the selection behind the checkbox and change the behavior of selecting an
alarm item. Long pressing the item now brings up a context menu that can enable
or disable the alarm in addition to deleting the alarm.
The context menu header now contains the label of the alarm if it exists and
it mimics the standard dialog header view.
Updated some of the layout code to ensure that the default three Alarms do not
show a scrollbar.
BUG=
1438269
The Android Open Source Project [Wed, 15 Apr 2009 01:18:15 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'