OSDN Git Service

android-x86/packages-apps-DeskClock.git
14 years agoam 43313e0d: am b95b7a63: Myriad fixes & cleanups in DeskClock.
Daniel Sandler [Wed, 18 Nov 2009 20:25:22 +0000 (12:25 -0800)]
am 43313e0d: am b95b7a63: Myriad fixes & cleanups in DeskClock.

Merge commit '43313e0ddc772c0eb3818f5efbdc5bcddedde56a' into eclair-mr2-plus-aosp

* commit '43313e0ddc772c0eb3818f5efbdc5bcddedde56a':
  Myriad fixes & cleanups in DeskClock.

14 years agoam 62598e4e: am f1e8069b: UI tweaks to meet Jeff\'s spec.
Patrick Scott [Wed, 18 Nov 2009 20:25:17 +0000 (12:25 -0800)]
am 62598e4e: am f1e8069b: UI tweaks to meet Jeff\'s spec.

Merge commit '62598e4eb795e56e06e0b20891be707b9fd11c15' into eclair-mr2-plus-aosp

* commit '62598e4eb795e56e06e0b20891be707b9fd11c15':
  UI tweaks to meet Jeff's spec.

14 years agoam b95b7a63: Myriad fixes & cleanups in DeskClock.
Daniel Sandler [Wed, 18 Nov 2009 20:22:37 +0000 (12:22 -0800)]
am b95b7a63: Myriad fixes & cleanups in DeskClock.

Merge commit 'b95b7a63c403a17c3725e1ccfbd65b4283fd6a0f' into eclair-mr2

* commit 'b95b7a63c403a17c3725e1ccfbd65b4283fd6a0f':
  Myriad fixes & cleanups in DeskClock.

14 years agoam f1e8069b: UI tweaks to meet Jeff\'s spec.
Patrick Scott [Wed, 18 Nov 2009 20:20:53 +0000 (12:20 -0800)]
am f1e8069b: UI tweaks to meet Jeff\'s spec.

Merge commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2

* commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
  UI tweaks to meet Jeff's spec.

14 years agoMyriad fixes & cleanups in DeskClock.
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

14 years agoUI tweaks to meet Jeff's spec.
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.

14 years agoam f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2
Patrick Scott [Mon, 16 Nov 2009 22:41:39 +0000 (14:41 -0800)]
am f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2

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

* commit 'f6f1e5d224b8522d6f62ece1dff4180b381f2a47':
  Finish the UI improvements for the alarm list.

14 years agoam 7a46bb83: am 515f4384: Merge change Ic31f08c3 into eclair
Patrick Scott [Mon, 16 Nov 2009 22:40:30 +0000 (14:40 -0800)]
am 7a46bb83: am 515f4384: Merge change Ic31f08c3 into eclair

Merge commit '7a46bb83334a88c39c288f51196da424cbfb9adc' into eclair-mr2-plus-aosp

* commit '7a46bb83334a88c39c288f51196da424cbfb9adc':
  Make the default ringtone selected in the list.

14 years agoam 7e344f5d: resolved conflicts for merge of 4e1b06eb to eclair-mr2
Patrick Scott [Mon, 16 Nov 2009 22:39:21 +0000 (14:39 -0800)]
am 7e344f5d: resolved conflicts for merge of 4e1b06eb to eclair-mr2

Merge commit '7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7' into eclair-mr2-plus-aosp

* commit '7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7':
  New UI for the list of alarms.

14 years agoresolved conflicts for merge of e3f01aff to eclair-mr2
Patrick Scott [Mon, 16 Nov 2009 21:23:49 +0000 (16:23 -0500)]
resolved conflicts for merge of e3f01aff to eclair-mr2

14 years agoFinish the UI improvements for the alarm list.
Patrick Scott [Mon, 16 Nov 2009 21:11:32 +0000 (16:11 -0500)]
Finish the UI improvements for the alarm list.

14 years agoam 515f4384: Merge change Ic31f08c3 into eclair
Patrick Scott [Mon, 16 Nov 2009 19:32:11 +0000 (11:32 -0800)]
am 515f4384: Merge change Ic31f08c3 into eclair

Merge commit '515f43840b8404b1ad2ef95c0e9704a26c248647' into eclair-mr2

* commit '515f43840b8404b1ad2ef95c0e9704a26c248647':
  Make the default ringtone selected in the list.

14 years agoresolved conflicts for merge of 4e1b06eb to eclair-mr2
Patrick Scott [Mon, 16 Nov 2009 19:28:05 +0000 (14:28 -0500)]
resolved conflicts for merge of 4e1b06eb to eclair-mr2

14 years agoMerge change Ic31f08c3 into eclair
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.

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

14 years agoNew UI for the list of alarms.
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.

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:24 +0000 (14:55 -0800)]
merge from open-source master

14 years agoam a092e9b2: am 33137d79: (-s ours) Merge change Ia9f7e629 into eclair
Eric Fischer [Sat, 14 Nov 2009 01:52:32 +0000 (17:52 -0800)]
am a092e9b2: am 33137d79: (-s ours) Merge change Ia9f7e629 into eclair

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

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

14 years agoam 82239b60: am 2ff01ef6: Fine-tuning the DeskClock UI.
Daniel Sandler [Sat, 14 Nov 2009 01:52:29 +0000 (17:52 -0800)]
am 82239b60: am 2ff01ef6: Fine-tuning the DeskClock UI.

Merge commit '82239b60431594f820f0ce4bd339b5405c12c4c0' into eclair-mr2-plus-aosp

* commit '82239b60431594f820f0ce4bd339b5405c12c4c0':
  Fine-tuning the DeskClock UI.

14 years agoam 33137d79: (-s ours) Merge change Ia9f7e629 into eclair
Eric Fischer [Sat, 14 Nov 2009 01:48:59 +0000 (17:48 -0800)]
am 33137d79: (-s ours) Merge change Ia9f7e629 into eclair

Merge commit '33137d791aadea46f6ed8ceae198d3f5a2e4a964' into eclair-mr2

* commit '33137d791aadea46f6ed8ceae198d3f5a2e4a964':
  Import revised translations.  DO NOT MERGE

14 years agoam 33137d79: Merge change Ia9f7e629 into eclair
Eric Fischer [Sat, 14 Nov 2009 01:47:58 +0000 (17:47 -0800)]
am 33137d79: Merge change Ia9f7e629 into eclair

Merge commit '33137d791aadea46f6ed8ceae198d3f5a2e4a964' into eclair-plus-aosp

* commit '33137d791aadea46f6ed8ceae198d3f5a2e4a964':
  Import revised translations.  DO NOT MERGE

14 years agoMerge change Ia9f7e629 into eclair
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

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

14 years agoam 2ff01ef6: Fine-tuning the DeskClock UI.
Daniel Sandler [Sat, 14 Nov 2009 00:15:22 +0000 (16:15 -0800)]
am 2ff01ef6: Fine-tuning the DeskClock UI.

Merge commit '2ff01ef636c8896455e6780fbe14cd0dca207969' into eclair-mr2

* commit '2ff01ef636c8896455e6780fbe14cd0dca207969':
  Fine-tuning the DeskClock UI.

14 years agoam 2ff01ef6: Fine-tuning the DeskClock UI.
Daniel Sandler [Sat, 14 Nov 2009 00:14:50 +0000 (16:14 -0800)]
am 2ff01ef6: Fine-tuning the DeskClock UI.

Merge commit '2ff01ef636c8896455e6780fbe14cd0dca207969' into eclair-plus-aosp

* commit '2ff01ef636c8896455e6780fbe14cd0dca207969':
  Fine-tuning the DeskClock UI.

14 years agoFine-tuning the DeskClock UI.
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.

14 years agoam 4a12dab4: am 5a2aa678: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 19:14:11 +0000 (11:14 -0800)]
am 4a12dab4: am 5a2aa678: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '4a12dab4a00c414c7a88b7118c0e51b77130a70d' into eclair-mr2-plus-aosp

* commit '4a12dab4a00c414c7a88b7118c0e51b77130a70d':
  Import revised translations.  DO NOT MERGE

14 years agoam 5a2aa678: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:43:21 +0000 (10:43 -0800)]
am 5a2aa678: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5a2aa6783837954c496f49e3e08b3c57a626e326' into eclair-mr2

* commit '5a2aa6783837954c496f49e3e08b3c57a626e326':
  Import revised translations.  DO NOT MERGE

14 years agoam 5a2aa678: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:43:07 +0000 (10:43 -0800)]
am 5a2aa678: Import revised translations.  DO NOT MERGE

Merge commit '5a2aa6783837954c496f49e3e08b3c57a626e326' into eclair-plus-aosp

* commit '5a2aa6783837954c496f49e3e08b3c57a626e326':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:47:57 +0000 (19:47 -0800)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoam 13b0650c: am 8423a177: Fix http://b/2249983 .
Daniel Sandler [Thu, 12 Nov 2009 21:56:21 +0000 (13:56 -0800)]
am 13b0650c: am 8423a177: Fix http://b/2249983 .

Merge commit '13b0650ce0a3aac691002060412d3d89479817d3' into eclair-mr2-plus-aosp

* commit '13b0650ce0a3aac691002060412d3d89479817d3':
  Fix http://b/2249983 .

14 years agoam 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair
Patrick Scott [Thu, 12 Nov 2009 21:56:18 +0000 (13:56 -0800)]
am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit '123538f398bec9e425aee6fd427aa4ad7a11fb28' into eclair-mr2-plus-aosp

* commit '123538f398bec9e425aee6fd427aa4ad7a11fb28':
  Cancel the snooze if the user sets an alarm for before the snooze fires.

14 years agoam 8423a177: Fix http://b/2249983 .
Daniel Sandler [Thu, 12 Nov 2009 21:53:27 +0000 (13:53 -0800)]
am 8423a177: Fix http://b/2249983 .

Merge commit '8423a1772b340c02e07c066b646baeae18521fe7' into eclair-plus-aosp

* commit '8423a1772b340c02e07c066b646baeae18521fe7':
  Fix http://b/2249983 .

14 years agoam 8423a177: Fix http://b/2249983 .
Daniel Sandler [Thu, 12 Nov 2009 21:53:06 +0000 (13:53 -0800)]
am 8423a177: Fix http://b/2249983 .

Merge commit '8423a1772b340c02e07c066b646baeae18521fe7' into eclair-mr2

* commit '8423a1772b340c02e07c066b646baeae18521fe7':
  Fix http://b/2249983 .

14 years agoFix http://b/2249983 .
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).

14 years agoam bafd4638: Merge change Ic7edd6ea into eclair
Patrick Scott [Thu, 12 Nov 2009 13:44:51 +0000 (05:44 -0800)]
am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9' into eclair-mr2

* commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9':
  Cancel the snooze if the user sets an alarm for before the snooze fires.

14 years agoam bafd4638: Merge change Ic7edd6ea into eclair
Patrick Scott [Thu, 12 Nov 2009 13:44:44 +0000 (05:44 -0800)]
am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9' into eclair-plus-aosp

* commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9':
  Cancel the snooze if the user sets an alarm for before the snooze fires.

14 years agoMerge change Ic7edd6ea into eclair
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.

14 years agoam cbf6f5e3: am 0c4449d6: Fix http://b/2235284 by putting the next alarm in the Clock...
Daniel Sandler [Thu, 12 Nov 2009 08:17:50 +0000 (00:17 -0800)]
am cbf6f5e3: am 0c4449d6: Fix b/2235284 by putting the next alarm in the Clock screen saver mode.

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

* commit 'cbf6f5e39b17a84beb93876d95594c26784b8128':
  Fix http://b/2235284 by putting the next alarm in the Clock screen saver mode.

14 years agoam 8f405db2: am 338597a5: Add text descriptions for icons in DeskClock.
Daniel Sandler [Thu, 12 Nov 2009 08:17:47 +0000 (00:17 -0800)]
am 8f405db2: am 338597a5: Add text descriptions for icons in DeskClock.

Merge commit '8f405db263c0bff087828e6f59dacbe2d04a532f' into eclair-mr2-plus-aosp

* commit '8f405db263c0bff087828e6f59dacbe2d04a532f':
  Add text descriptions for icons in DeskClock.

14 years agoam 0c4449d6: Fix http://b/2235284 by putting the next alarm in the Clock screen saver...
Daniel Sandler [Thu, 12 Nov 2009 08:16:02 +0000 (00:16 -0800)]
am 0c4449d6: Fix b/2235284 by putting the next alarm in the Clock screen saver mode.

Merge commit '0c4449d6fd421c916ebaf9657ff6ae5a21eed2e7' into eclair-plus-aosp

* commit '0c4449d6fd421c916ebaf9657ff6ae5a21eed2e7':
  Fix http://b/2235284 by putting the next alarm in the Clock screen saver mode.

14 years agoam 338597a5: Add text descriptions for icons in DeskClock.
Daniel Sandler [Thu, 12 Nov 2009 08:15:59 +0000 (00:15 -0800)]
am 338597a5: Add text descriptions for icons in DeskClock.

Merge commit '338597a5b502b03a01ddaa3579f70b58ca7fdbbe' into eclair-plus-aosp

* commit '338597a5b502b03a01ddaa3579f70b58ca7fdbbe':
  Add text descriptions for icons in DeskClock.

14 years agoam 0c4449d6: Fix http://b/2235284 by putting the next alarm in the Clock screen saver...
Daniel Sandler [Thu, 12 Nov 2009 08:14:52 +0000 (00:14 -0800)]
am 0c4449d6: Fix b/2235284 by putting the next alarm in the Clock screen saver mode.

Merge commit '0c4449d6fd421c916ebaf9657ff6ae5a21eed2e7' into eclair-mr2

* commit '0c4449d6fd421c916ebaf9657ff6ae5a21eed2e7':
  Fix http://b/2235284 by putting the next alarm in the Clock screen saver mode.

14 years agoam 338597a5: Add text descriptions for icons in DeskClock.
Daniel Sandler [Thu, 12 Nov 2009 08:14:48 +0000 (00:14 -0800)]
am 338597a5: Add text descriptions for icons in DeskClock.

Merge commit '338597a5b502b03a01ddaa3579f70b58ca7fdbbe' into eclair-mr2

* commit '338597a5b502b03a01ddaa3579f70b58ca7fdbbe':
  Add text descriptions for icons in DeskClock.

14 years agoFix http://b/2235284 by putting the next alarm in the Clock screen saver mode.
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.

14 years agoAdd text descriptions for icons in DeskClock.
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).

14 years agoam 134efd4b: am 9463551d: Fix http://b/2232909 .
Daniel Sandler [Thu, 12 Nov 2009 01:29:15 +0000 (17:29 -0800)]
am 134efd4b: am 9463551d: Fix http://b/2232909 .

Merge commit '134efd4bfb3495105daaebe37a9b21916c21a18d' into eclair-mr2-plus-aosp

* commit '134efd4bfb3495105daaebe37a9b21916c21a18d':
  Fix http://b/2232909 .

14 years agoam 11342749: am ba328cd4: Use an alarm to refresh the date at midnight.
Daniel Sandler [Thu, 12 Nov 2009 01:29:06 +0000 (17:29 -0800)]
am 11342749: am ba328cd4: Use an alarm to refresh the date at midnight.

Merge commit '113427490f4a7f771708c1872a25d9dbc4bfab1b' into eclair-mr2-plus-aosp

* commit '113427490f4a7f771708c1872a25d9dbc4bfab1b':
  Use an alarm to refresh the date at midnight.

14 years agoam b54f2639: am 8c7bbe7b: Fix http://b/2246758 (new icon for slideshow)
Daniel Sandler [Thu, 12 Nov 2009 01:29:02 +0000 (17:29 -0800)]
am b54f2639: am 8c7bbe7b: Fix b/2246758 (new icon for slideshow)

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

* commit 'b54f26394b11578f75f724b1ca675092c255b629':
  Fix http://b/2246758 (new icon for slideshow)

14 years agoam 1dfd07db: am 2f7c9edf: Preserve dim status when pausing.
Daniel Sandler [Thu, 12 Nov 2009 01:28:58 +0000 (17:28 -0800)]
am 1dfd07db: am 2f7c9edf: Preserve dim status when pausing.

Merge commit '1dfd07dbe85dd4697ac285d56f5a8c9cb1aefb98' into eclair-mr2-plus-aosp

* commit '1dfd07dbe85dd4697ac285d56f5a8c9cb1aefb98':
  Preserve dim status when pausing.

14 years agoam 9463551d: Fix http://b/2232909 .
Daniel Sandler [Thu, 12 Nov 2009 01:13:40 +0000 (17:13 -0800)]
am 9463551d: Fix http://b/2232909 .

Merge commit '9463551d754302e158b80357d9c5c88517fe6e58' into eclair-mr2

* commit '9463551d754302e158b80357d9c5c88517fe6e58':
  Fix http://b/2232909 .

14 years agoam ba328cd4: Use an alarm to refresh the date at midnight.
Daniel Sandler [Thu, 12 Nov 2009 01:13:37 +0000 (17:13 -0800)]
am ba328cd4: Use an alarm to refresh the date at midnight.

Merge commit 'ba328cd4a23a13732467ba5533a94ac3d7cbbf4e' into eclair-mr2

* commit 'ba328cd4a23a13732467ba5533a94ac3d7cbbf4e':
  Use an alarm to refresh the date at midnight.

14 years agoam 8c7bbe7b: Fix http://b/2246758 (new icon for slideshow)
Daniel Sandler [Thu, 12 Nov 2009 01:13:29 +0000 (17:13 -0800)]
am 8c7bbe7b: Fix b/2246758 (new icon for slideshow)

Merge commit '8c7bbe7b1ec01f1d551d9e6c8e8edc4ce4f9c2a6' into eclair-mr2

* commit '8c7bbe7b1ec01f1d551d9e6c8e8edc4ce4f9c2a6':
  Fix http://b/2246758 (new icon for slideshow)

14 years agoam 2f7c9edf: Preserve dim status when pausing.
Daniel Sandler [Thu, 12 Nov 2009 01:13:26 +0000 (17:13 -0800)]
am 2f7c9edf: Preserve dim status when pausing.

Merge commit '2f7c9edfb3f65e5defc7c24bd9348dc76d9e65a5' into eclair-mr2

* commit '2f7c9edfb3f65e5defc7c24bd9348dc76d9e65a5':
  Preserve dim status when pausing.

14 years agoam 9463551d: Fix http://b/2232909 .
Daniel Sandler [Wed, 11 Nov 2009 22:27:30 +0000 (14:27 -0800)]
am 9463551d: Fix http://b/2232909 .

Merge commit '9463551d754302e158b80357d9c5c88517fe6e58' into eclair-plus-aosp

* commit '9463551d754302e158b80357d9c5c88517fe6e58':
  Fix http://b/2232909 .

14 years agoam ba328cd4: Use an alarm to refresh the date at midnight.
Daniel Sandler [Wed, 11 Nov 2009 22:27:26 +0000 (14:27 -0800)]
am ba328cd4: Use an alarm to refresh the date at midnight.

Merge commit 'ba328cd4a23a13732467ba5533a94ac3d7cbbf4e' into eclair-plus-aosp

* commit 'ba328cd4a23a13732467ba5533a94ac3d7cbbf4e':
  Use an alarm to refresh the date at midnight.

14 years agoam 8c7bbe7b: Fix http://b/2246758 (new icon for slideshow)
Daniel Sandler [Wed, 11 Nov 2009 22:24:55 +0000 (14:24 -0800)]
am 8c7bbe7b: Fix b/2246758 (new icon for slideshow)

Merge commit '8c7bbe7b1ec01f1d551d9e6c8e8edc4ce4f9c2a6' into eclair-plus-aosp

* commit '8c7bbe7b1ec01f1d551d9e6c8e8edc4ce4f9c2a6':
  Fix http://b/2246758 (new icon for slideshow)

14 years agoam 2f7c9edf: Preserve dim status when pausing.
Daniel Sandler [Wed, 11 Nov 2009 22:24:51 +0000 (14:24 -0800)]
am 2f7c9edf: Preserve dim status when pausing.

Merge commit '2f7c9edfb3f65e5defc7c24bd9348dc76d9e65a5' into eclair-plus-aosp

* commit '2f7c9edfb3f65e5defc7c24bd9348dc76d9e65a5':
  Preserve dim status when pausing.

14 years agoFix http://b/2232909 .
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.

14 years agoUse an alarm to refresh the date at midnight.
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).

14 years agoFix http://b/2246758 (new icon for slideshow)
Daniel Sandler [Wed, 11 Nov 2009 18:20:12 +0000 (10:20 -0800)]
Fix http://b/2246758 (new icon for slideshow)

14 years agoPreserve dim status when pausing.
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).

14 years agoCancel the snooze if the user sets an alarm for before the snooze fires.
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

14 years agoam 5af06083: am 4e8ad3a4: More UI tweaks:
Daniel Sandler [Fri, 6 Nov 2009 21:52:47 +0000 (13:52 -0800)]
am 5af06083: am 4e8ad3a4: More UI tweaks:

Merge commit '5af0608348ceda9ba959adf61a78ff7c262a210e' into eclair-mr2-plus-aosp

* commit '5af0608348ceda9ba959adf61a78ff7c262a210e':
  More UI tweaks:

14 years agoam 4e8ad3a4: More UI tweaks:
Daniel Sandler [Fri, 6 Nov 2009 21:47:42 +0000 (13:47 -0800)]
am 4e8ad3a4: More UI tweaks:

Merge commit '4e8ad3a40141d05ced3279c6a0296b71ffc5117d' into eclair-plus-aosp

* commit '4e8ad3a40141d05ced3279c6a0296b71ffc5117d':
  More UI tweaks:

14 years agoam 4e8ad3a4: More UI tweaks:
Daniel Sandler [Fri, 6 Nov 2009 21:46:58 +0000 (13:46 -0800)]
am 4e8ad3a4: More UI tweaks:

Merge commit '4e8ad3a40141d05ced3279c6a0296b71ffc5117d' into eclair-mr2

* commit '4e8ad3a40141d05ced3279c6a0296b71ffc5117d':
  More UI tweaks:

14 years agoMore UI tweaks:
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.

14 years agoam e6ebab14: am daa1dd3e: DeskClock UI fixes.
Daniel Sandler [Fri, 6 Nov 2009 19:09:39 +0000 (11:09 -0800)]
am e6ebab14: am daa1dd3e: DeskClock UI fixes.

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

* commit 'e6ebab14fd23b288e551796dc965d99e60ff2dc2':
  DeskClock UI fixes.

14 years agoam daa1dd3e: DeskClock UI fixes.
Daniel Sandler [Fri, 6 Nov 2009 19:02:43 +0000 (11:02 -0800)]
am daa1dd3e: DeskClock UI fixes.

Merge commit 'daa1dd3eb9ebb69817babdb74b125dc63889eb45' into eclair-mr2

* commit 'daa1dd3eb9ebb69817babdb74b125dc63889eb45':
  DeskClock UI fixes.

14 years agoam daa1dd3e: DeskClock UI fixes.
Daniel Sandler [Fri, 6 Nov 2009 18:46:15 +0000 (10:46 -0800)]
am daa1dd3e: DeskClock UI fixes.

Merge commit 'daa1dd3eb9ebb69817babdb74b125dc63889eb45' into eclair-plus-aosp

* commit 'daa1dd3eb9ebb69817babdb74b125dc63889eb45':
  DeskClock UI fixes.

14 years agoDeskClock UI fixes.
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

14 years agoam 35cc835f: am ff1c25c3: Merge change I7ea1d183 into eclair
Daniel Sandler [Fri, 6 Nov 2009 04:38:09 +0000 (20:38 -0800)]
am 35cc835f: am ff1c25c3: Merge change I7ea1d183 into eclair

Merge commit '35cc835fe1d5710d92e8e760fccd90a03ec0d490' into eclair-mr2-plus-aosp

* commit '35cc835fe1d5710d92e8e760fccd90a03ec0d490':
  Alarm Clock is now simply Clock.

14 years agoam b29bc488: am e64281b1: Launch the Genie widget when the weather is tapped.
Daniel Sandler [Fri, 6 Nov 2009 04:38:05 +0000 (20:38 -0800)]
am b29bc488: am e64281b1: Launch the Genie widget when the weather is tapped.

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

* commit 'b29bc48889e5c176720344140d69a85d509d94e0':
  Launch the Genie widget when the weather is tapped.

14 years agoam ff1c25c3: Merge change I7ea1d183 into eclair
Daniel Sandler [Fri, 6 Nov 2009 04:26:27 +0000 (20:26 -0800)]
am ff1c25c3: Merge change I7ea1d183 into eclair

Merge commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894' into eclair-mr2

* commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894':
  Alarm Clock is now simply Clock.

14 years agoam e64281b1: Launch the Genie widget when the weather is tapped.
Daniel Sandler [Fri, 6 Nov 2009 04:26:23 +0000 (20:26 -0800)]
am e64281b1: Launch the Genie widget when the weather is tapped.

Merge commit 'e64281b157842af93b793e8c9de3dd9a71825172' into eclair-mr2

* commit 'e64281b157842af93b793e8c9de3dd9a71825172':
  Launch the Genie widget when the weather is tapped.

14 years agoam ff1c25c3: Merge change I7ea1d183 into eclair
Daniel Sandler [Fri, 6 Nov 2009 01:28:41 +0000 (17:28 -0800)]
am ff1c25c3: Merge change I7ea1d183 into eclair

Merge commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894' into eclair-plus-aosp

* commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894':
  Alarm Clock is now simply Clock.

14 years agoam e64281b1: Launch the Genie widget when the weather is tapped.
Daniel Sandler [Fri, 6 Nov 2009 01:28:36 +0000 (17:28 -0800)]
am e64281b1: Launch the Genie widget when the weather is tapped.

Merge commit 'e64281b157842af93b793e8c9de3dd9a71825172' into eclair-plus-aosp

* commit 'e64281b157842af93b793e8c9de3dd9a71825172':
  Launch the Genie widget when the weather is tapped.

14 years agoMerge change I7ea1d183 into eclair
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.

14 years agoAlarm Clock is now simply Clock.
Daniel Sandler [Fri, 6 Nov 2009 01:18:38 +0000 (20:18 -0500)]
Alarm Clock is now simply Clock.

14 years agoam 79bbf660: am 1878e99c: Fix trackball focus issues on orientation change.
Daniel Sandler [Thu, 5 Nov 2009 22:06:09 +0000 (14:06 -0800)]
am 79bbf660: am 1878e99c: Fix trackball focus issues on orientation change.

Merge commit '79bbf660e9bd8a19e6b56e6831171fb5d846c950' into eclair-mr2-plus-aosp

* commit '79bbf660e9bd8a19e6b56e6831171fb5d846c950':
  Fix trackball focus issues on orientation change.

14 years agoam 1878e99c: Fix trackball focus issues on orientation change.
Daniel Sandler [Thu, 5 Nov 2009 21:53:45 +0000 (13:53 -0800)]
am 1878e99c: Fix trackball focus issues on orientation change.

Merge commit '1878e99c5ccd7bd2288707a431e0bb5d39879985' into eclair-mr2

* commit '1878e99c5ccd7bd2288707a431e0bb5d39879985':
  Fix trackball focus issues on orientation change.

14 years agoLaunch the Genie widget when the weather is tapped.
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

14 years agoam 1878e99c: Fix trackball focus issues on orientation change.
Daniel Sandler [Thu, 5 Nov 2009 20:49:37 +0000 (12:49 -0800)]
am 1878e99c: Fix trackball focus issues on orientation change.

Merge commit '1878e99c5ccd7bd2288707a431e0bb5d39879985' into eclair-plus-aosp

* commit '1878e99c5ccd7bd2288707a431e0bb5d39879985':
  Fix trackball focus issues on orientation change.

14 years agoFix trackball focus issues on orientation change.
Daniel Sandler [Thu, 5 Nov 2009 14:37:37 +0000 (09:37 -0500)]
Fix trackball focus issues on orientation change.

http://b/2232758

14 years agoam 865e060f: am f8952fa7: Integrate final button artwork for DeskClock.
Daniel Sandler [Thu, 5 Nov 2009 14:06:04 +0000 (06:06 -0800)]
am 865e060f: am f8952fa7: Integrate final button artwork for DeskClock.

Merge commit '865e060f156124348344a2efd360f4cc58b8ffa6' into eclair-mr2-plus-aosp

* commit '865e060f156124348344a2efd360f4cc58b8ffa6':
  Integrate final button artwork for DeskClock.

14 years agoam f8952fa7: Integrate final button artwork for DeskClock.
Daniel Sandler [Thu, 5 Nov 2009 14:01:09 +0000 (06:01 -0800)]
am f8952fa7: Integrate final button artwork for DeskClock.

Merge commit 'f8952fa79d0cc70e5a802fb2624701fbed0736b8' into eclair-plus-aosp

* commit 'f8952fa79d0cc70e5a802fb2624701fbed0736b8':
  Integrate final button artwork for DeskClock.

14 years agoam f8952fa7: Integrate final button artwork for DeskClock.
Daniel Sandler [Thu, 5 Nov 2009 14:00:55 +0000 (06:00 -0800)]
am f8952fa7: Integrate final button artwork for DeskClock.

Merge commit 'f8952fa79d0cc70e5a802fb2624701fbed0736b8' into eclair-mr2

* commit 'f8952fa79d0cc70e5a802fb2624701fbed0736b8':
  Integrate final button artwork for DeskClock.

14 years agoIntegrate final button artwork for DeskClock.
Daniel Sandler [Thu, 5 Nov 2009 04:17:15 +0000 (23:17 -0500)]
Integrate final button artwork for DeskClock.

14 years agoam 448fe0bf: am 4dc051aa: Start Gallery in slideshow mode from DeskClock.
Daniel Sandler [Wed, 4 Nov 2009 21:23:56 +0000 (13:23 -0800)]
am 448fe0bf: am 4dc051aa: Start Gallery in slideshow mode from DeskClock.

Merge commit '448fe0bfbd3f0c759a987307532f99d608c7e7a6' into eclair-mr2-plus-aosp

* commit '448fe0bfbd3f0c759a987307532f99d608c7e7a6':
  Start Gallery in slideshow mode from DeskClock.

14 years agoam 4dc051aa: Start Gallery in slideshow mode from DeskClock.
Daniel Sandler [Wed, 4 Nov 2009 21:15:25 +0000 (13:15 -0800)]
am 4dc051aa: Start Gallery in slideshow mode from DeskClock.

Merge commit '4dc051aa9b76d8dffbd2372740eff2735c654540' into eclair-mr2

* commit '4dc051aa9b76d8dffbd2372740eff2735c654540':
  Start Gallery in slideshow mode from DeskClock.

14 years agoam 4dc051aa: Start Gallery in slideshow mode from DeskClock.
Daniel Sandler [Wed, 4 Nov 2009 21:13:53 +0000 (13:13 -0800)]
am 4dc051aa: Start Gallery in slideshow mode from DeskClock.

Merge commit '4dc051aa9b76d8dffbd2372740eff2735c654540' into eclair-plus-aosp

* commit '4dc051aa9b76d8dffbd2372740eff2735c654540':
  Start Gallery in slideshow mode from DeskClock.

14 years agoStart Gallery in slideshow mode from DeskClock.
Daniel Sandler [Wed, 4 Nov 2009 15:13:26 +0000 (10:13 -0500)]
Start Gallery in slideshow mode from DeskClock.

14 years agoam be6b7c73: am 4e5e11e9: Merge change I0a267d0f into eclair
Daniel Sandler [Wed, 4 Nov 2009 14:19:56 +0000 (06:19 -0800)]
am be6b7c73: am 4e5e11e9: Merge change I0a267d0f into eclair

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

* commit 'be6b7c737f1fab0160bd9b97f80c2bbc7702976b':
  More tweaks per spec.

14 years agoam 4e5e11e9: Merge change I0a267d0f into eclair
Daniel Sandler [Wed, 4 Nov 2009 14:11:20 +0000 (06:11 -0800)]
am 4e5e11e9: Merge change I0a267d0f into eclair

Merge commit '4e5e11e92d1bd0b3b12432c99d1e76d592dbf229' into eclair-plus-aosp

* commit '4e5e11e92d1bd0b3b12432c99d1e76d592dbf229':
  More tweaks per spec.

14 years agoam 4e5e11e9: Merge change I0a267d0f into eclair
Daniel Sandler [Wed, 4 Nov 2009 14:10:46 +0000 (06:10 -0800)]
am 4e5e11e9: Merge change I0a267d0f into eclair

Merge commit '4e5e11e92d1bd0b3b12432c99d1e76d592dbf229' into eclair-mr2

* commit '4e5e11e92d1bd0b3b12432c99d1e76d592dbf229':
  More tweaks per spec.

14 years agoMerge change I0a267d0f into eclair
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.

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

14 years agoam 3d7d762c: am df465736: Change default sort order to sort by alarm time.
Patrick Scott [Tue, 3 Nov 2009 18:35:00 +0000 (10:35 -0800)]
am 3d7d762c: am df465736: Change default sort order to sort by alarm time.

Merge commit '3d7d762cc460fb337e23215c6b3081d2aff67aaa' into eclair-mr2-plus-aosp

* commit '3d7d762cc460fb337e23215c6b3081d2aff67aaa':
  Change default sort order to sort by alarm time.

14 years agoam df465736: Change default sort order to sort by alarm time.
Patrick Scott [Tue, 3 Nov 2009 18:25:21 +0000 (10:25 -0800)]
am df465736: Change default sort order to sort by alarm time.

Merge commit 'df4657361cc0bd0f4671d5e53f18bd48a7e97245' into eclair-plus-aosp

* commit 'df4657361cc0bd0f4671d5e53f18bd48a7e97245':
  Change default sort order to sort by alarm time.

14 years agoam df465736: Change default sort order to sort by alarm time.
Patrick Scott [Tue, 3 Nov 2009 18:25:21 +0000 (10:25 -0800)]
am df465736: Change default sort order to sort by alarm time.

Merge commit 'df4657361cc0bd0f4671d5e53f18bd48a7e97245' into eclair-mr2

* commit 'df4657361cc0bd0f4671d5e53f18bd48a7e97245':
  Change default sort order to sort by alarm time.