OSDN Git Service

android-x86/packages-apps-DeskClock.git
14 years agoUse new window manager flag for turning on the screen.
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

14 years agoPrevent leaking windows by listening for config changes.
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.

14 years agoRevert the AlarmAlert to a rotatable activity.
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.

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

14 years agoRestore alpha channel on clock hand.
Daniel Sandler [Fri, 4 Sep 2009 15:37:37 +0000 (11:37 -0400)]
Restore alpha channel on clock hand.

Fixes http://b/2091179 .

14 years agoFix a permission typo.
Patrick Scott [Thu, 3 Sep 2009 20:13:26 +0000 (16:13 -0400)]
Fix a permission typo.

14 years agoKill the alarm when a call comes in.
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.

14 years agoHigh-resolution (hdpi) artwork from TAT for AlarmClock.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for AlarmClock.

14 years agoam 1ecee6c1: (-s ours) please do not merge again; This reverts commit 8d58816a7f2cf3b...
Ed Heyl [Thu, 20 Aug 2009 23:52:31 +0000 (16:52 -0700)]
am 1ecee6c1: (-s ours) please do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82

Merge commit '1ecee6c11e40de8c9b8644a868f88bbc4ac69aec' into eclair

* commit '1ecee6c11e40de8c9b8644a868f88bbc4ac69aec':
  please do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82

14 years agoplease do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82
Ed Heyl [Thu, 20 Aug 2009 23:41:05 +0000 (16:41 -0700)]
please do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82

By reverting 8d58816a7f2cf3b4de4c1932bbde39be7a489b82, we are putting the second alarm fix
(372cbb5437b209f6d909ea247080da6a48c3a590) back in.

14 years agoam 7c65f0df: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Aug 2009 21:07:36 +0000 (14:07 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoam 8d58816a: (-s ours) Do not merge. Revert "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.

14 years agoDo 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.

14 years agoFix some copy-paste errors and acquire locks before launching the Activity.
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.

14 years agoam 372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.
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.

14 years agoDo 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).

14 years agoam 9229d3f6: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 17 Aug 2009 20:13:59 +0000 (13:13 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoFix the clock face preference.
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.

14 years agomerge from open-source master
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master

14 years agoam a50bd6df: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:07:19 +0000 (16:07 -0700)]
Import revised translations.  DO NOT MERGE

14 years agomerge from donut
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut

14 years agomerge from donut
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut

14 years agoreconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master

14 years agoMerge korg/donut into korg/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master

14 years agoresolved conflicts for merge of 1bc128fd to master
Eric Fischer [Wed, 22 Jul 2009 18:48:58 +0000 (11:48 -0700)]
resolved conflicts for merge of 1bc128fd to master

14 years agoMake the "This alarm is set for N hours from now" message more localizable.
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

14 years agoMerge commit 'goog/readonly-korg-master' into merge_korg_master
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:12:49 +0000 (17:12 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master

14 years agoresolved conflicts for merge of 439d5bd5 to master
Patrick Scott [Tue, 14 Jul 2009 17:47:39 +0000 (13:47 -0400)]
resolved conflicts for merge of 439d5bd5 to master

14 years agoChange the time format to show 2 digits for 24-hour mode.
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.

14 years agoFix build breakage from automerge.
Eric Fischer [Tue, 14 Jul 2009 00:13:37 +0000 (17:13 -0700)]
Fix build breakage from automerge.

14 years agoresolved conflicts for merge of f30a09a7 to master
Eric Fischer [Mon, 13 Jul 2009 23:54:57 +0000 (16:54 -0700)]
resolved conflicts for merge of f30a09a7 to master

14 years agoImport new translations
Eric Fischer [Mon, 13 Jul 2009 22:43:19 +0000 (15:43 -0700)]
Import new translations

14 years agoAdd a setting to change the behavior of the side buttons during an alarm.
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.

14 years agoHuge rewrite of the AlarmClock to play the Alarm in a service.
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.

14 years agoresolved conflicts for merge of e2285895 to master
Patrick Scott [Thu, 18 Jun 2009 13:47:46 +0000 (09:47 -0400)]
resolved conflicts for merge of e2285895 to master

14 years agoMerge the fullscreen change from master to donut for security.
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.

14 years agoUpdate Portuguese translations.
Eric Fischer [Thu, 11 Jun 2009 00:20:43 +0000 (17:20 -0700)]
Update Portuguese translations.

14 years agoam 01b9b5ba: 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.

14 years agoam 64155a59: am 12afe3b7: AI 149721: Import 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.

14 years agoUpdate Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 22:08:34 +0000 (15:08 -0700)]
Update Portuguese translations.

14 years agoam 12afe3b7: AI 149721: Import 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.

14 years agoAI 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

14 years agoRework the AlarmAlert dialog layout.
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.

14 years agoAcquire the lock in onCreate again.
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.

14 years agoam 01dee6ee: use the new window manager flag FLAG_SHOW_WHEN_LOCKED to hide/show the...
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

14 years agouse 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

14 years agoDismiss the alarm when hitting the camera button.
Patrick Scott [Fri, 15 May 2009 14:11:23 +0000 (10:11 -0400)]
Dismiss the alarm when hitting the camera button.

14 years agoAllow the alert to be silent.
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.

14 years agoAdd a setting to change the alarm volume.
Patrick Scott [Thu, 14 May 2009 14:07:45 +0000 (10:07 -0400)]
Add a setting to change the alarm volume.

14 years agoCleanup the preference code for editing an alarm.
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.

14 years agoam 5a8fa64: am 6ac4649: AI 148147: Import lots of zh_TW translation chan
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.

14 years agoam 6ac4649: 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.

14 years agoAI 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

14 years agoam 9433391: Merge commit \'405572e\' into donut
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.

14 years agoam c37043f: Merge commit \'4c73a7b\' into donut
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.

14 years agoAdd a setting to change the snooze duration.
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.

14 years agoMerge commit '405572e' into donut
The Android Open Source Project [Wed, 29 Apr 2009 04:55:58 +0000 (21:55 -0700)]
Merge commit '405572e' into donut

14 years agoMerge commit '4c73a7b' into donut
The Android Open Source Project [Wed, 29 Apr 2009 04:55:51 +0000 (21:55 -0700)]
Merge commit '4c73a7b' into donut

14 years agoAI 147962: Import updated zh_TW translations.
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

15 years agoMerge commit 'korg/donut'
The Android Open Source Project [Fri, 24 Apr 2009 20:55:02 +0000 (13:55 -0700)]
Merge commit 'korg/donut'

15 years agoAI 147492: Update zh_TW translations.
Eric Fischer [Thu, 23 Apr 2009 18:59:14 +0000 (11:59 -0700)]
AI 147492: Update zh_TW translations.

Automated import of CL 147492

15 years agoMerge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)]
Merge donut into master

15 years agomerge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut

15 years agoMerge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:35 +0000 (17:12 -0700)]
Merge donut into master

15 years agoDon't maintain separate translations in Alarm Clock for days of the week.
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".

15 years agoAI 146365: Import revised translations.
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

15 years agoExtend the ListView selection behind the checkbox.
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

15 years agoMerge commit 'korg/cupcake'
The Android Open Source Project [Wed, 15 Apr 2009 01:18:15 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'

15 years agoAI 146175: Import updated translations.
Eric Fischer [Tue, 14 Apr 2009 19:10:43 +0000 (12:10 -0700)]
AI 146175: Import updated translations.

Automated import of CL 146175

15 years agoAI 146037: Import updated translations.
Eric Fischer [Tue, 14 Apr 2009 00:16:19 +0000 (17:16 -0700)]
AI 146037: Import updated translations.

Automated import of CL 146037

15 years agoMerge branch 'readonly-p4-master'
Patrick Scott [Mon, 13 Apr 2009 16:59:11 +0000 (09:59 -0700)]
Merge branch 'readonly-p4-master'

15 years agoAI 145870: Add a build property for the default alarm alert. Update the various
Patrick Scott [Mon, 13 Apr 2009 16:57:38 +0000 (09:57 -0700)]
AI 145870: Add a build property for the default alarm alert. Update the various
  framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870

15 years agoAI 145225: Import more revised translations into cupcake.
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

15 years agoMerge branch 'readonly-p4-master'
Eric Fischer [Wed, 8 Apr 2009 07:31:51 +0000 (00:31 -0700)]
Merge branch 'readonly-p4-master'

15 years agoAI 144913: am: CL 144912 Merge from cupcake:
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

15 years agoAI 144912: Merge from cupcake:
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

15 years agoAI 144891: Import a bunch of revised translations.
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

15 years agoMerge branch 'readonly-p4-master'
Patrick Scott [Mon, 6 Apr 2009 14:08:50 +0000 (07:08 -0700)]
Merge branch 'readonly-p4-master'

15 years agoAI 144629: Updated UI for alarm labels. Draw the label underneath the repeat days.
Patrick Scott [Mon, 6 Apr 2009 14:07:41 +0000 (07:07 -0700)]
AI 144629: Updated UI for alarm labels. Draw the label underneath the repeat days.
  Use a slightly larger font than the repeat string. Also use bold and
  italics to distinguish the label.
  To avoid further clunkiness, do not draw the default label except in the
  alert dialog.
  BUG=1716467

Automated import of CL 144629

15 years agoMerge branch 'readonly-p4-master'
Eric Fischer [Fri, 3 Apr 2009 06:32:28 +0000 (23:32 -0700)]
Merge branch 'readonly-p4-master'

15 years agoAI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few...
Eric Fischer [Fri, 3 Apr 2009 06:31:17 +0000 (23:31 -0700)]
AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144411

15 years agoAI 144355: Automated g4 rollback of changelist 144335.
Eric Fischer [Fri, 3 Apr 2009 04:42:06 +0000 (21:42 -0700)]
AI 144355: Automated g4 rollback of changelist 144335.
  *** Reason for rollback ***
  Roll back US Spanish import because it made the build too big.
  *** Original change description ***
  Import US Spanish translations, and a few Japanese changes.

Automated import of CL 144355

15 years agoAI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Eric Fischer [Thu, 2 Apr 2009 23:42:13 +0000 (16:42 -0700)]
AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
  Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 144336

15 years agoAI 144335: Import US Spanish translations, and a few Japanese changes.
Eric Fischer [Thu, 2 Apr 2009 23:39:20 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.

Automated import of CL 144335

15 years agoMerge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project [Sun, 29 Mar 2009 15:55:11 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal

15 years agoMerge commit 'korg/cupcake'
The Android Open Source Project [Fri, 27 Mar 2009 22:31:11 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'

15 years agoAutomated import from //branches/donutburger/...@142720,142720
Eric Fischer [Thu, 26 Mar 2009 00:04:27 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720

15 years agoAutomated import from //branches/master/...@142759,142759
Eric Fischer [Wed, 25 Mar 2009 23:13:51 +0000 (16:13 -0700)]
Automated import from //branches/master/...@142759,142759

15 years agoAutomated import from //branches/donutburger/...@142694,142694
Patrick Scott [Wed, 25 Mar 2009 22:47:08 +0000 (15:47 -0700)]
Automated import from //branches/donutburger/...@142694,142694

15 years agoAutomated import from //branches/master/...@142733,142733
Patrick Scott [Wed, 25 Mar 2009 22:44:42 +0000 (15:44 -0700)]
Automated import from //branches/master/...@142733,142733

15 years agoAutomated import from //branches/cupcake/...@142643,142643
Eric Fischer [Wed, 25 Mar 2009 22:22:43 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643

15 years agoAutomated import from //branches/cupcake/...@142551,142551
Patrick Scott [Wed, 25 Mar 2009 16:08:25 +0000 (09:08 -0700)]
Automated import from //branches/cupcake/...@142551,142551

15 years agoAutomated import from //branches/master/...@142357,142357
Patrick Scott [Wed, 25 Mar 2009 05:41:39 +0000 (22:41 -0700)]
Automated import from //branches/master/...@142357,142357

15 years agoAutomated import from //branches/donutburger/...@142356,142356
Patrick Scott [Wed, 25 Mar 2009 05:34:45 +0000 (22:34 -0700)]
Automated import from //branches/donutburger/...@142356,142356

15 years agoAutomated import from //branches/master/...@142049,142049
Patrick Scott [Wed, 25 Mar 2009 04:26:48 +0000 (21:26 -0700)]
Automated import from //branches/master/...@142049,142049

15 years agoAutomated import from //branches/donutburger/...@142048,142048
Patrick Scott [Wed, 25 Mar 2009 04:22:12 +0000 (21:22 -0700)]
Automated import from //branches/donutburger/...@142048,142048

15 years agoAutomated import from //branches/master/...@141978,141978
Patrick Scott [Wed, 25 Mar 2009 04:18:07 +0000 (21:18 -0700)]
Automated import from //branches/master/...@141978,141978