OSDN Git Service

android-x86/packages-apps-DeskClock.git
10 years agoImport revised translations froyo-x86 android-x86-2.2 android-x86-2.2-r2
Kenny Root [Mon, 21 Jun 2010 18:04:22 +0000 (11:04 -0700)]
Import revised translations

Change-Id: Ief42aa4ca9238b0481a6b3e75d198ceacc3c721c

10 years agoImport revised translations
Kenny Root [Thu, 10 Jun 2010 05:30:41 +0000 (22:30 -0700)]
Import revised translations

Change-Id: Ie6a0e9f5d27e9c3a7f8218f3a3fb7b69d35d6be1

10 years agoFix midnight date rollover in DeskClock screensaver.
Daniel Sandler [Wed, 19 May 2010 17:54:04 +0000 (13:54 -0400)]
Fix midnight date rollover in DeskClock screensaver.

Bug: 2692736
Change-Id: I36854393b273c383e63fbf771946da711d027d65

10 years agoImport revised translations
Kenny Root [Mon, 17 May 2010 18:30:49 +0000 (11:30 -0700)]
Import revised translations

Change-Id: I60fe1383131104aa318623ac7103594aa9a8fc7d

10 years agoImport revised translations
Kenny Root [Thu, 29 Apr 2010 22:34:04 +0000 (15:34 -0700)]
Import revised translations

Change-Id: I2435aa757ca98633281e7c495794e9e86cb71289

10 years agoMerge "Import revised translations" into froyo
Kenny Root [Wed, 28 Apr 2010 04:42:17 +0000 (21:42 -0700)]
Merge "Import revised translations" into froyo

10 years agoImport revised translations
Kenny Root [Tue, 27 Apr 2010 20:18:02 +0000 (13:18 -0700)]
Import revised translations

Change-Id: I7ec8f6e718f9ec86e52247effd3ef944a48481cb

10 years agoSwitch to explicitly managed cursors for weather query.
Daniel Sandler [Tue, 27 Apr 2010 13:17:40 +0000 (09:17 -0400)]
Switch to explicitly managed cursors for weather query.

Previously, DeskClock used Activity.managedQuery, which
didn't exactly leak cursors, but it allowed them to
accumulate as long as the DeskClock Activity was running.
When used overnight as a bedside clock, the Activity can run
for a very long time without being paused.

Bug: 2627720
Change-Id: If4d53d3d6cba9dd96b41a3e25f4c8fad75339c42

10 years agoImport revised translations
Kenny Root [Thu, 15 Apr 2010 03:32:59 +0000 (20:32 -0700)]
Import revised translations

Change-Id: Ic8e770f3951c6baf9e705f054ed8afe8493a9f46

10 years agoMake an alias for shortcuts that are pre-deskclock.
Patrick Scott [Wed, 14 Apr 2010 12:39:57 +0000 (08:39 -0400)]
Make an alias for shortcuts that are pre-deskclock.

Bug: 2570142
Change-Id: I093b48f5b1baf50341f9fcb03516e127ae3057ac

10 years agoShow a long dash instead of 0° if no temperature is available.
Daniel Sandler [Thu, 3 Dec 2009 16:44:30 +0000 (11:44 -0500)]
Show a long dash instead of 0° if no temperature is available.

Bug: 2574118
Bug: 2301604 (original)
Change-Id: I36fba9248848325f48f6ab82dbd09dcc881cfcbf

10 years agoDo not dismiss the activity if it is being stopped.
Patrick Scott [Wed, 7 Apr 2010 19:05:35 +0000 (15:05 -0400)]
Do not dismiss the activity if it is being stopped.

This allows the activity to stick around if another activity
(like calendar alerts) pops up on top.

Bug: 2577091
Change-Id: I46ca5596f96e05184b64cc9a73b4e1e9a33f1561

10 years agoadd launch performance test for deskclock
Guang Zhu [Fri, 2 Apr 2010 01:13:01 +0000 (18:13 -0700)]
add launch performance test for deskclock

this is part of a larger effort to collect app launch performance for the platform.

Change-Id: I23974688bad1f66aa24906c73317c6ace67c41fd

10 years agoMerge "Import revised translations" into froyo
Kenny Root [Tue, 30 Mar 2010 16:29:35 +0000 (09:29 -0700)]
Merge "Import revised translations" into froyo

10 years agoImport revised translations
Kenny Root [Tue, 30 Mar 2010 16:16:08 +0000 (09:16 -0700)]
Import revised translations

Change-Id: I2cbc91055b377c9654408b0065e8619fcb450f9b

10 years agoFix the Add alarm text color when pressed.
Patrick Scott [Tue, 30 Mar 2010 14:19:24 +0000 (10:19 -0400)]
Fix the Add alarm text color when pressed.

Bug: 2545542
Change-Id: I297482b010dda3167bee9ee844934ccd2daabd4a

10 years agoMerge "Import revised translations"
Eric Fischer [Thu, 18 Mar 2010 17:52:57 +0000 (10:52 -0700)]
Merge "Import revised translations"

10 years agoImport revised translations
Kenny Root [Thu, 18 Mar 2010 05:13:45 +0000 (22:13 -0700)]
Import revised translations

Change-Id: I21d2e557406199f7537c2749c7569f95ecaa935c

10 years agoChange Power to Camera as the power button does not work.
Patrick Scott [Wed, 17 Mar 2010 19:22:07 +0000 (15:22 -0400)]
Change Power to Camera as the power button does not work.

Bug: 2511012
Change-Id: I9543e40784c31d860bba76faea943b4b9fbb0e60

10 years agoKeep listening for dock event broadcasts when paused.
Daniel Sandler [Mon, 15 Mar 2010 21:05:03 +0000 (17:05 -0400)]
Keep listening for dock event broadcasts when paused.

When the screen is off, the dock app is paused; if the
device is undocked in this state, there's a race to resume
the dock app & broadcast the UI mode change event. Fixed.

Bug: 2507444
Change-Id: I7416aed4f9def0b9458273f40fe27131412d23f0

10 years agoUpgrade the clock widget correctly.
Romain Guy [Fri, 12 Mar 2010 02:14:58 +0000 (18:14 -0800)]
Upgrade the clock widget correctly.

Change-Id: I001a3040a49afb7c8974db1ebe69fa3d4cef09f1

10 years agoAdd an empty CleanSpec.mk
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:59 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk

Change-Id: Idc645589651e4164baca01dde58665d531d80037

10 years agoEnable the alarm when preferences change and not when hitting done.
Patrick Scott [Mon, 8 Mar 2010 15:27:52 +0000 (10:27 -0500)]
Enable the alarm when preferences change and not when hitting done.

The original intent was to enable the alarm when hitting done after making edits
but this caused the alarm to always turn on even if the user turned the alarm
off and hit done.

Bug: 2441762
Change-Id: I9f37ec2477ddced26df1c1fb4444cd5e5121e7d5

10 years agoUpdate to use new dock broadcasts.
Dianne Hackborn [Fri, 5 Mar 2010 04:50:56 +0000 (20:50 -0800)]
Update to use new dock broadcasts.

10 years agoMerge "Import new translations"
Eric Fischer [Thu, 4 Mar 2010 22:21:13 +0000 (14:21 -0800)]
Merge "Import new translations"

10 years agoImport new translations
Eric Fischer [Thu, 4 Mar 2010 22:04:54 +0000 (14:04 -0800)]
Import new translations

10 years agoMove the widget into com.android.alarmclock to allow upgrades.
Patrick Scott [Thu, 4 Mar 2010 21:39:09 +0000 (16:39 -0500)]
Move the widget into com.android.alarmclock to allow upgrades.

10 years agoAllow migration from old alarm clock app.
Dianne Hackborn [Thu, 4 Mar 2010 00:20:05 +0000 (16:20 -0800)]
Allow migration from old alarm clock app.

10 years agoHave "Revert" go back to the original state of the alarm.
Patrick Scott [Wed, 3 Mar 2010 15:23:16 +0000 (10:23 -0500)]
Have "Revert" go back to the original state of the alarm.

Keep the original alarm state so that revert will reload the preferences from
the original state. Have all preferences immediately take effect. When adding a
new alarm, add the alarm if preferences change and then delete the alarm when
reverting.

Pop the set alarm toast only when changing the time or the enabled setting and
the result is that the alarm is enabled. Otherwise there can be a lot of toasts
showing while editing an alarm.

10 years agoMerge "Adds hooks to DeskClock so that other programs may kill or snooze a ringing...
Bjorn Bringert [Tue, 2 Mar 2010 14:04:54 +0000 (06:04 -0800)]
Merge "Adds hooks to DeskClock so that other programs may kill or snooze a ringing alarm, and also a broadcast intent to inform interested parties when the alarm has been dismissed."

10 years agoAdds hooks to DeskClock so that other programs may kill or
David Ingram [Mon, 1 Mar 2010 15:34:38 +0000 (15:34 +0000)]
Adds hooks to DeskClock so that other programs may kill or
snooze a ringing alarm, and also a broadcast intent to
inform interested parties when the alarm has been dismissed.

Change-Id: I491c3a24a6bac33025665c799c76a743010e9761

10 years agoDo not add a new alarm if the user cancels the time picker.
Patrick Scott [Fri, 26 Feb 2010 13:18:46 +0000 (08:18 -0500)]
Do not add a new alarm if the user cancels the time picker.

TimePickerDialog calls onTimeSet only if the user hits the "Set" button. In the
case of a new alarm, keep track of the call to onTimeSet and check it when the
user presses back.

Bug: 2338234

10 years agoImport new translations.
Eric Fischer [Sat, 27 Feb 2010 01:29:36 +0000 (17:29 -0800)]
Import new translations.

10 years agoAdd missing close-paren to fix build break.
Jack Palevich [Mon, 22 Feb 2010 15:15:31 +0000 (07:15 -0800)]
Add missing close-paren to fix build break.

10 years agoLaunch music player via new INTENT_ACTION_MUSIC_PLAYER.
Daniel Sandler [Thu, 18 Feb 2010 20:11:52 +0000 (15:11 -0500)]
Launch music player via new INTENT_ACTION_MUSIC_PLAYER.

10 years agoNull check when launching Music.
Daniel Sandler [Wed, 17 Feb 2010 18:37:13 +0000 (13:37 -0500)]
Null check when launching Music.

Bug: 2449914

10 years agoDisable "Delete" button when adding a new alarm.
Patrick Scott [Wed, 17 Feb 2010 14:03:11 +0000 (09:03 -0500)]
Disable "Delete" button when adding a new alarm.

Bug: 2440197

10 years agoDisable the snooze if it matches the alarm that has been changed.
Patrick Scott [Wed, 17 Feb 2010 13:27:17 +0000 (08:27 -0500)]
Disable the snooze if it matches the alarm that has been changed.

The user most likely wants the alarm to fire at the time they just set so
disable the snooze alert.

Bug: 2421068

10 years agoRestore DeskClock's app icon.
Daniel Sandler [Fri, 12 Feb 2010 19:02:19 +0000 (14:02 -0500)]
Restore DeskClock's app icon.

(Change 3b5a3c1 caused the widget icon to show up in
Launcher.)

10 years agoAdd an original-package tag that matches the real package name.
Jeff Hamilton [Thu, 11 Feb 2010 22:25:48 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.

Change-Id: I10b7c73dfed00e74bcf74db0eb4632b23b30dc31

10 years agoNew widget icons.
Daniel Sandler [Thu, 11 Feb 2010 01:12:18 +0000 (20:12 -0500)]
New widget icons.

10 years agoam 92c9a6fe: am 5553de61: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 22:26:17 +0000 (14:26 -0800)]
am 92c9a6fe: am 5553de61: reconcile main tree with open-source eclair

Merge commit '92c9a6fe2e5a576de50d08e08a332a774f4cf2d4'

* commit '92c9a6fe2e5a576de50d08e08a332a774f4cf2d4':
  android-2.1_r1 snapshot

10 years agoam 5553de61: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:50:03 +0000 (08:50 -0800)]
am 5553de61: reconcile main tree with open-source eclair

Merge commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36' into eclair-plus-aosp

* commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36':
  android-2.1_r1 snapshot

10 years agoreconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair

10 years agoFix Czech DeskClock date format.
Eric Fischer [Wed, 3 Feb 2010 23:10:41 +0000 (15:10 -0800)]
Fix Czech DeskClock date format.

Bug 2291064

10 years agoA few string changes in settings.
Patrick Scott [Tue, 2 Feb 2010 16:29:02 +0000 (11:29 -0500)]
A few string changes in settings.

Bug: 2252631

10 years agoreconcile android-2.1_r1 snapshot
The Android Open Source Project [Fri, 29 Jan 2010 22:09:22 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot

10 years agoUse ALLOW_LOCK_WHILE_SCREEN_ON window manager flag to allow lockscreen to activate...
Mike Lockwood [Thu, 28 Jan 2010 16:56:54 +0000 (11:56 -0500)]
Use ALLOW_LOCK_WHILE_SCREEN_ON window manager flag to allow lockscreen to activate while screen is on.

Change-Id: I302d65c51cd5b6bd495b24479a9c377e4bedf66d
Signed-off-by: Mike Lockwood <lockwood@android.com>
10 years agoam 352926aa: merge from open-source master
The Android Open Source Project [Thu, 28 Jan 2010 00:22:12 +0000 (16:22 -0800)]
am 352926aa: merge from open-source master

Merge commit '352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df'

* commit '352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df':
  empty initial commit

10 years agoMoving alarm creation into SetAlarm.
Patrick Scott [Wed, 27 Jan 2010 13:58:13 +0000 (08:58 -0500)]
Moving alarm creation into SetAlarm.

This change allows the user to create a new alarm and then press "Revert"
without having already created the alarm.

Refactor a few methods to take an Alarm object rather than all the alarm fields.
The static method in AlarmClock to create a new alarm is no longer needed. Do
some cleanup in AlarmProvider around intial values.

Bug: 2338234

10 years agoAdd localized date formats for DeskClock.
Eric Fischer [Mon, 25 Jan 2010 22:24:16 +0000 (14:24 -0800)]
Add localized date formats for DeskClock.

These were localized in the framework strings but the localized versions
were lost when the application was unbundled.

Bug 2394398

10 years agoresolved conflicts for merge of 456a2b86 to master
Eric Fischer [Mon, 25 Jan 2010 19:06:44 +0000 (11:06 -0800)]
resolved conflicts for merge of 456a2b86 to master

10 years agoresolved conflicts for merge of f22cedb7 to master
Daniel Sandler [Sat, 23 Jan 2010 01:02:00 +0000 (20:02 -0500)]
resolved conflicts for merge of f22cedb7 to master

10 years agoam a03ab881: am 6e371787: Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Fri, 22 Jan 2010 20:01:18 +0000 (12:01 -0800)]
am a03ab881: am 6e371787: Re-schedule screen saver mode when returning to normal.

Merge commit 'a03ab881af23de4baf4ca95cb2bee812060632dd'

* commit 'a03ab881af23de4baf4ca95cb2bee812060632dd':
  Re-schedule screen saver mode when returning to normal.

10 years agoresolved conflicts for merge of ea7bcecf to master
Daniel Sandler [Fri, 22 Jan 2010 04:01:54 +0000 (23:01 -0500)]
resolved conflicts for merge of ea7bcecf to master

10 years agomerge from open-source master
The Android Open Source Project [Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)]
merge from open-source master

10 years agoMerge "Use default values rather than hard coding green for LED notification color."
Mike Lockwood [Thu, 21 Jan 2010 16:19:02 +0000 (08:19 -0800)]
Merge "Use default values rather than hard coding green for LED notification color."

10 years agoam 6ecdeccc: Add translations for Dock Settings menu item.
Eric Fischer [Wed, 20 Jan 2010 23:56:57 +0000 (15:56 -0800)]
am 6ecdeccc: Add translations for Dock Settings menu item.

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

* commit '6ecdeccc244e4a9763e99bf052a21231e1c89dff':
  Add translations for Dock Settings menu item.

10 years agoAdd translations for Dock Settings menu item.
Eric Fischer [Wed, 20 Jan 2010 23:41:14 +0000 (15:41 -0800)]
Add translations for Dock Settings menu item.

10 years agoUnbundle the DeskClock.
Patrick Scott [Wed, 20 Jan 2010 17:50:10 +0000 (12:50 -0500)]
Unbundle the DeskClock.

- Copy some framework resources into the app.
- Add a new layout to SetAlarm to avoid using an internal id to obtain the
  content view.
- Use a string literal to identify the ALARM_CHANGED intent. This is not ideal
  but is better than exposing the actual intent string for now.

10 years agoam 9fa4cc96: Add Dock Settings menu item to DeskClock.
Daniel Sandler [Wed, 20 Jan 2010 18:13:22 +0000 (10:13 -0800)]
am 9fa4cc96: Add Dock Settings menu item to DeskClock.

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

* commit '9fa4cc96ece43fdc6873fdafb8c8f6b3ea0cc1fd':
  Add Dock Settings menu item to DeskClock.

10 years agoUse default values rather than hard coding green for LED notification color.
Mike Lockwood [Wed, 20 Jan 2010 17:30:05 +0000 (12:30 -0500)]
Use default values rather than hard coding green for LED notification color.

BUG: 2329568

Signed-off-by: Mike Lockwood <lockwood@android.com>
10 years agoAdd Dock Settings menu item to DeskClock.
Daniel Sandler [Wed, 20 Jan 2010 03:50:37 +0000 (22:50 -0500)]
Add Dock Settings menu item to DeskClock.

Bug: 2367275

10 years agoam 6e371787: Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Wed, 20 Jan 2010 03:59:34 +0000 (19:59 -0800)]
am 6e371787: Re-schedule screen saver mode when returning to normal.

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

* commit '6e37178770f41ffcf8013e9460170140bcc6c130':
  Re-schedule screen saver mode when returning to normal.

10 years agoam 3866899a: Fix http://b/2326879 (drawing glitches)
Daniel Sandler [Tue, 19 Jan 2010 07:43:08 +0000 (23:43 -0800)]
am 3866899a: Fix b/2326879 (drawing glitches)

Merge commit '3866899a033d0cef4d168df93e0d1f65837dfe9e' into eclair-plus-aosp

* commit '3866899a033d0cef4d168df93e0d1f65837dfe9e':
  Fix http://b/2326879 (drawing glitches)

10 years agoRe-schedule screen saver mode when returning to normal.
Daniel Sandler [Thu, 10 Dec 2009 18:05:40 +0000 (13:05 -0500)]
Re-schedule screen saver mode when returning to normal.

Fixes http://b/2317620

10 years agoRestore softkey illumination control.
Daniel Sandler [Fri, 15 Jan 2010 18:06:32 +0000 (13:06 -0500)]
Restore softkey illumination control.

Introduced in change I35b0967
but accidentally reverted in change Ic98ba511.

10 years agoSeveral tweaks to DeskClock's dimming feature:
Daniel Sandler [Thu, 14 Jan 2010 20:04:31 +0000 (15:04 -0500)]
Several tweaks to DeskClock's dimming feature:

 - Attentuate the background slightly more when in dim mode
 - Implement http://b/2332431 (tapping anywhere will cause
   the screen to un-dim)
 - Fix http://b/2349550 (keep the screen dim underneath an
   alarm dialog)
 - When the trackball is operated, focus the alarms button
   first (instead of the dim button)

10 years agoFix http://b/2326879 (drawing glitches)
Daniel Sandler [Thu, 14 Jan 2010 19:39:36 +0000 (14:39 -0500)]
Fix http://b/2326879 (drawing glitches)

10 years agoandroid-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:11 +0000 (15:19 -0800)]
android-2.1_r1 snapshot

10 years agoempty initial commit
The Android Open Source Project [Mon, 11 Jan 2010 22:32:57 +0000 (14:32 -0800)]
empty initial commit

10 years agoam 60d04edf: am e7c9540b: Refresh date display at midnight.
Daniel Sandler [Sat, 9 Jan 2010 00:56:46 +0000 (16:56 -0800)]
am 60d04edf: am e7c9540b: Refresh date display at midnight.

Merge commit '60d04edf7496f3370cb848f696b268825b47295a'

* commit '60d04edf7496f3370cb848f696b268825b47295a':
  Refresh date display at midnight.

10 years agoam e7c9540b: Refresh date display at midnight.
Daniel Sandler [Sat, 9 Jan 2010 00:54:10 +0000 (16:54 -0800)]
am e7c9540b: Refresh date display at midnight.

Merge commit 'e7c9540b179fdafb69cdc5e05a2d769f4be9463a' into eclair-plus-aosp

* commit 'e7c9540b179fdafb69cdc5e05a2d769f4be9463a':
  Refresh date display at midnight.

10 years agoDeprecate fill_parent and introduce match_parent.
Romain Guy [Fri, 8 Jan 2010 23:06:50 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.

10 years agoRefresh date display at midnight.
Daniel Sandler [Fri, 8 Jan 2010 19:37:41 +0000 (14:37 -0500)]
Refresh date display at midnight.

Fixes http://b/2341789

10 years agoUpdate with latest translations.
Eric Fischer [Thu, 7 Jan 2010 23:57:20 +0000 (15:57 -0800)]
Update with latest translations.

10 years agoexplicit set an "optional" tag
Jean-Baptiste Queru [Tue, 5 Jan 2010 19:09:51 +0000 (11:09 -0800)]
explicit set an "optional" tag

10 years agoCheck for null alarms and dismiss the snooze if the alarm is disabled.
Patrick Scott [Wed, 16 Dec 2009 18:52:31 +0000 (13:52 -0500)]
Check for null alarms and dismiss the snooze if the alarm is disabled.

If the alarm that is currently active is deleted, disable snoozing the alarm.

Bug: 2322130

10 years agoMerge commit 'goog/eclair-plus-aosp'
Android Git Automerger [Tue, 15 Dec 2009 08:44:48 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'

10 years agoam 31db8c22: am 7468e218: Update lock screen alarm info when the locale changes.
Eric Fischer [Fri, 11 Dec 2009 20:26:02 +0000 (12:26 -0800)]
am 31db8c22: am 7468e218: Update lock screen alarm info when the locale changes.

Merge commit '31db8c2298ed1bf32d8fd92fafef9c01f233d7df'

* commit '31db8c2298ed1bf32d8fd92fafef9c01f233d7df':
  Update lock screen alarm info when the locale changes.

10 years agoam 7468e218: Update lock screen alarm info when the locale changes.
Eric Fischer [Fri, 11 Dec 2009 20:23:43 +0000 (12:23 -0800)]
am 7468e218: Update lock screen alarm info when the locale changes.

Merge commit '7468e2189eaba8303ae87a251f0179dadae26be8' into eclair-mr2-plus-aosp

* commit '7468e2189eaba8303ae87a251f0179dadae26be8':
  Update lock screen alarm info when the locale changes.

10 years agoUpdate lock screen alarm info when the locale changes.
Eric Fischer [Thu, 10 Dec 2009 22:19:09 +0000 (14:19 -0800)]
Update lock screen alarm info when the locale changes.

http://b/issue?id=2230029

10 years agoam d54b2c2a: am f6e3c42e: Listen for weather update notifications instead of polling.
Daniel Sandler [Fri, 11 Dec 2009 16:52:22 +0000 (08:52 -0800)]
am d54b2c2a: am f6e3c42e: Listen for weather update notifications instead of polling.

Merge commit 'd54b2c2af457df48b371a09b49134293599fb8f8'

* commit 'd54b2c2af457df48b371a09b49134293599fb8f8':
  Listen for weather update notifications instead of polling.

10 years agoam f6e3c42e: Listen for weather update notifications instead of polling.
Daniel Sandler [Fri, 11 Dec 2009 16:49:46 +0000 (08:49 -0800)]
am f6e3c42e: Listen for weather update notifications instead of polling.

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

* commit 'f6e3c42ec2bfd7e3440393bd5a0d498a513574c5':
  Listen for weather update notifications instead of polling.

10 years agoListen for weather update notifications instead of polling.
Daniel Sandler [Thu, 10 Dec 2009 17:15:16 +0000 (12:15 -0500)]
Listen for weather update notifications instead of polling.

DeskClock still periodically requests updated information
from the weather content provider (as recommended by the
Genie team) but does so on an hourly schedule rather than
every 5 minutes.

Also addresses http://b/2314820.

10 years agoam 6101493f: am 80ff42c1: Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Fri, 11 Dec 2009 16:45:43 +0000 (08:45 -0800)]
am 6101493f: am 80ff42c1: Re-schedule screen saver mode when returning to normal.

Merge commit '6101493fdbb259278d3b004cbea108c1e165b305'

* commit '6101493fdbb259278d3b004cbea108c1e165b305':
  Re-schedule screen saver mode when returning to normal.

10 years agoam b3c8766c: am e5b7da93: am 3d4de660: Dismiss the desk clock if it was launched...
Daniel Sandler [Fri, 11 Dec 2009 16:45:40 +0000 (08:45 -0800)]
am b3c8766c: am e5b7da93: am 3d4de660: Dismiss the desk clock if it was launched by docking.

Merge commit 'b3c8766c7c4c7a1d0708084dd940ba3ebc1ddc34'

* commit 'b3c8766c7c4c7a1d0708084dd940ba3ebc1ddc34':
  Dismiss the desk clock if it was launched by docking.

10 years agoam 80ff42c1: Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Fri, 11 Dec 2009 16:40:20 +0000 (08:40 -0800)]
am 80ff42c1: Re-schedule screen saver mode when returning to normal.

Merge commit '80ff42c1abf87a4e81cb422446412973b46a75bd' into eclair-mr2-plus-aosp

* commit '80ff42c1abf87a4e81cb422446412973b46a75bd':
  Re-schedule screen saver mode when returning to normal.

10 years agoam e5b7da93: am 3d4de660: Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 16:40:17 +0000 (08:40 -0800)]
am e5b7da93: am 3d4de660: Dismiss the desk clock if it was launched by docking.

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

* commit 'e5b7da9308d17c4d6720c012950c7922779435f7':
  Dismiss the desk clock if it was launched by docking.

10 years agoRe-schedule screen saver mode when returning to normal.
Daniel Sandler [Thu, 10 Dec 2009 18:05:40 +0000 (13:05 -0500)]
Re-schedule screen saver mode when returning to normal.

Fixes http://b/2317620

10 years agoam 62c74426: (-s ours) am 23a30560: am cda260fb: (-s ours) Import revised translation...
Eric Fischer [Fri, 11 Dec 2009 07:41:49 +0000 (23:41 -0800)]
am 62c74426: (-s ours) am 23a30560: am cda260fb: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '62c7442680b1535603753bf0f5a9667f4c48e2ca'

* commit '62c7442680b1535603753bf0f5a9667f4c48e2ca':
  Import revised translations.  DO NOT MERGE

10 years agoam 9aa8d8bc: (-s ours) am 15dc2e87: am 7e827aca: (-s ours) Show a long dash instead...
Daniel Sandler [Fri, 11 Dec 2009 07:41:46 +0000 (23:41 -0800)]
am 9aa8d8bc: (-s ours) am 15dc2e87: am 7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)

Merge commit '9aa8d8bca640ba10f187c6b0f561a9d1efb22ad6'

* commit '9aa8d8bca640ba10f187c6b0f561a9d1efb22ad6':
  Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)

10 years agoam 3d4de660: Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)]
am 3d4de660: Dismiss the desk clock if it was launched by docking.

Merge commit '3d4de660d654fee760cf96f609198489e4d6525d' into eclair-mr2

* commit '3d4de660d654fee760cf96f609198489e4d6525d':
  Dismiss the desk clock if it was launched by docking.

10 years agoam 3d4de660: Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 07:16:25 +0000 (23:16 -0800)]
am 3d4de660: Dismiss the desk clock if it was launched by docking.

Merge commit '3d4de660d654fee760cf96f609198489e4d6525d' into eclair-plus-aosp

* commit '3d4de660d654fee760cf96f609198489e4d6525d':
  Dismiss the desk clock if it was launched by docking.

10 years agoDismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 07:07:36 +0000 (02:07 -0500)]
Dismiss the desk clock if it was launched by docking.

In other words: if the clock is behaving like a dock app
(launched by a dock event), it should finish() when the
device is removed from the dock.  If, on the other hand,
it's behaving like a regular app (launched from the
Launcher), it should ignore an un-dock event.

This change also removes support for entering the desk dock
via a dialer code (an unnecessary feature since the app can
always be invoked from the Launcher).

Fixes http://b/2302215, approved by hiroshi.

10 years agoam 23a30560: am cda260fb: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:53:50 +0000 (17:53 -0800)]
am 23a30560: am cda260fb: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '23a305607e907ae0b6644393330420f31867c512' into eclair-mr2-plus-aosp

* commit '23a305607e907ae0b6644393330420f31867c512':
  Import revised translations.  DO NOT MERGE

10 years agoam 15dc2e87: am 7e827aca: (-s ours) Show a long dash instead of 0° if no temperature...
Daniel Sandler [Fri, 11 Dec 2009 01:53:47 +0000 (17:53 -0800)]
am 15dc2e87: am 7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)

Merge commit '15dc2e871248c51ecfe0aa527e8b04d2153620b9' into eclair-mr2-plus-aosp

* commit '15dc2e871248c51ecfe0aa527e8b04d2153620b9':
  Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)

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

Merge commit 'cda260fb9e42d1a470ec0040bd325a97261c88dd' into eclair-mr2

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

10 years agoam cda260fb: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 02:07:14 +0000 (18:07 -0800)]
am cda260fb: Import revised translations.  DO NOT MERGE

Merge commit 'cda260fb9e42d1a470ec0040bd325a97261c88dd' into eclair-plus-aosp

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

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