OSDN Git Service
Patrick Scott [Tue, 2 Feb 2010 16:29:02 +0000 (11:29 -0500)]
A few string changes in settings.
Bug:
2252631
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>
The Android Open Source Project [Thu, 28 Jan 2010 00:22:12 +0000 (16:22 -0800)]
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
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
Eric Fischer [Mon, 25 Jan 2010 19:06:44 +0000 (11:06 -0800)]
resolved conflicts for merge of
456a2b86 to master
Daniel Sandler [Sat, 23 Jan 2010 01:02:00 +0000 (20:02 -0500)]
resolved conflicts for merge of
f22cedb7 to master
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.
Daniel Sandler [Fri, 22 Jan 2010 04:01:54 +0000 (23:01 -0500)]
resolved conflicts for merge of
ea7bcecf to master
The Android Open Source Project [Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)]
merge from open-source master
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."
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.
Eric Fischer [Wed, 20 Jan 2010 23:41:14 +0000 (15:41 -0800)]
Add translations for Dock Settings menu item.
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.
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.
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>
Daniel Sandler [Wed, 20 Jan 2010 03:50:37 +0000 (22:50 -0500)]
Add Dock Settings menu item to DeskClock.
Bug:
2367275
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.
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)
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
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.
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)
Daniel Sandler [Thu, 14 Jan 2010 19:39:36 +0000 (14:39 -0500)]
Fix http://b/
2326879 (drawing glitches)
The Android Open Source Project [Mon, 11 Jan 2010 22:32:57 +0000 (14:32 -0800)]
empty initial commit
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.
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.
Romain Guy [Fri, 8 Jan 2010 23:06:50 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Daniel Sandler [Fri, 8 Jan 2010 19:37:41 +0000 (14:37 -0500)]
Refresh date display at midnight.
Fixes http://b/
2341789
Eric Fischer [Thu, 7 Jan 2010 23:57:20 +0000 (15:57 -0800)]
Update with latest translations.
Jean-Baptiste Queru [Tue, 5 Jan 2010 19:09:51 +0000 (11:09 -0800)]
explicit set an "optional" tag
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
Android Git Automerger [Tue, 15 Dec 2009 08:44:48 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
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.
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.
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
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.
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.
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.
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.
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.
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.
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.
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
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
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)
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.
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.
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.
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
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)
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
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
Eric Fischer [Thu, 10 Dec 2009 01:25:36 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Tue, 8 Dec 2009 16:03:16 +0000 (08:03 -0800)]
am
7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
7e827acae69298441b970262a309a957c92da155' into eclair-mr2
* commit '
7e827acae69298441b970262a309a957c92da155':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Daniel Sandler [Tue, 8 Dec 2009 16:02:16 +0000 (08:02 -0800)]
am
7e827aca: Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
7e827acae69298441b970262a309a957c92da155' into eclair-plus-aosp
* commit '
7e827acae69298441b970262a309a957c92da155':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
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. (DO NOT MERGE)
Fixes http://b/
2301604
Daniel Sandler [Mon, 7 Dec 2009 22:30:26 +0000 (14:30 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 20:25:43 +0000 (12:25 -0800)]
am
801fd314: am
c1d449d0: (-s ours) Fix b/
2305223 (DO NOT MERGE)
Merge commit '
801fd314c77c1e03c34a5172377202d3e28bd4c9' into eclair-mr2-plus-aosp
* commit '
801fd314c77c1e03c34a5172377202d3e28bd4c9':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 20:23:54 +0000 (12:23 -0800)]
am
c1d449d0: Fix http://b/
2305223 (DO NOT MERGE)
Merge commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-plus-aosp
* commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 20:23:41 +0000 (12:23 -0800)]
am
c1d449d0: (-s ours) Fix b/
2305223 (DO NOT MERGE)
Merge commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-mr2
* commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 19:47:03 +0000 (14:47 -0500)]
Fix http://b/
2305223 (DO NOT MERGE)
When placed into night mode (dim mode), the DeskClock must
restore full brightness any time the user returns to it from
another activity. There are two reasons for this:
1. The other activity won't be dim, so it's sort of jarring
to return to an almost-black screen.
2. As indicated in bug
2305223, visiting another activity is
a useful way to restore the display if it's so dark that
you can't see it to find the nightmode toggle button
(e.g., ambient lighting is very bright).
Daniel Sandler [Fri, 4 Dec 2009 19:40:30 +0000 (11:40 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 19:40:27 +0000 (11:40 -0800)]
am
04b4fd66: am
1f385956: Show a long dash instead of 0° if no temperature is available.
Merge commit '
04b4fd6612b4cb3a7e8c5531eae6022b22eeb5f7'
* commit '
04b4fd6612b4cb3a7e8c5531eae6022b22eeb5f7':
Show a long dash instead of 0° if no temperature is available.
Daniel Sandler [Fri, 4 Dec 2009 19:37:05 +0000 (11:37 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 19:37:01 +0000 (11:37 -0800)]
am
1f385956: Show a long dash instead of 0° if no temperature is available.
Merge commit '
1f385956ce5ae6dbe9ede0b0a4869eeff007041d' into eclair-mr2-plus-aosp
* commit '
1f385956ce5ae6dbe9ede0b0a4869eeff007041d':
Show a long dash instead of 0° if no temperature is available.
Daniel Sandler [Fri, 4 Dec 2009 19:20:18 +0000 (14:20 -0500)]
Fix http://b/
2305223
When placed into night mode (dim mode), the DeskClock must
restore full brightness any time the user returns to it from
another activity. There are two reasons for this:
1. The other activity won't be dim, so it's sort of jarring
to return to an almost-black screen.
2. As indicated in bug
2305223, visiting another activity is
a useful way to restore the display if it's so dark that
you can't see it to find the nightmode toggle button
(e.g., ambient lighting is very bright).
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.
Fixes http://b/
2301604
Eric Fischer [Thu, 3 Dec 2009 04:40:54 +0000 (20:40 -0800)]
am
e0f3a29c: (-s ours) am
1c0bdeef: am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
e0f3a29c2962e6abca8a8735d7d3f08391b9ab94'
* commit '
e0f3a29c2962e6abca8a8735d7d3f08391b9ab94':
Import revised translations. DO NOT MERGE
Daniel Sandler [Thu, 3 Dec 2009 04:40:51 +0000 (20:40 -0800)]
am
b054d81b: am
6b98d006: am
1196a729: Merge change I63863614 into eclair
Merge commit '
b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f'
* commit '
b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f':
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Thu, 3 Dec 2009 04:35:42 +0000 (20:35 -0800)]
am
aa4d5e67: am
44c3bfe2: am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca'
* commit '
aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca':
Reduce screen saver delay to 5 min.
Patrick Scott [Thu, 3 Dec 2009 04:30:35 +0000 (20:30 -0800)]
Patrick Scott [Thu, 3 Dec 2009 04:20:15 +0000 (20:20 -0800)]
am
49d9aef1: am
c3f77cc1: resolved conflicts for merge of
90c4833f to eclair-mr2
Merge commit '
49d9aef1f4054aa9d6f4d69b850285cccaef9428'
* commit '
49d9aef1f4054aa9d6f4d69b850285cccaef9428':
UI changes based on feedback from Jeff and Amar.
Eric Fischer [Wed, 2 Dec 2009 23:21:24 +0000 (15:21 -0800)]
am
1c0bdeef: am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
1c0bdeef8daf13aab06143f11c9827467a8ce973' into eclair-mr2-plus-aosp
* commit '
1c0bdeef8daf13aab06143f11c9827467a8ce973':
Import revised translations. DO NOT MERGE
Daniel Sandler [Wed, 2 Dec 2009 23:21:21 +0000 (15:21 -0800)]
am
6b98d006: am
1196a729: Merge change I63863614 into eclair
Merge commit '
6b98d00684df51bc0004446215944ff491c0b75a' into eclair-mr2-plus-aosp
* commit '
6b98d00684df51bc0004446215944ff491c0b75a':
Continued UI fit-and-finish for DeskClock.
Eric Fischer [Wed, 2 Dec 2009 23:11:59 +0000 (15:11 -0800)]
am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7' into eclair-mr2
* commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:09:45 +0000 (15:09 -0800)]
am
630cb4aa: Merge change Iabe6771c into eclair
Merge commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7' into eclair-plus-aosp
* commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:02:42 +0000 (15:02 -0800)]
Merge change Iabe6771c into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:56:13 +0000 (14:56 -0800)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Wed, 2 Dec 2009 20:54:47 +0000 (12:54 -0800)]
am
1196a729: Merge change I63863614 into eclair
Merge commit '
1196a729512ca9207c7d5af4862a830d412a68b7' into eclair-mr2
* commit '
1196a729512ca9207c7d5af4862a830d412a68b7':
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Wed, 2 Dec 2009 20:54:20 +0000 (12:54 -0800)]
am
1196a729: Merge change I63863614 into eclair
Merge commit '
1196a729512ca9207c7d5af4862a830d412a68b7' into eclair-plus-aosp
* commit '
1196a729512ca9207c7d5af4862a830d412a68b7':
Continued UI fit-and-finish for DeskClock.
Android (Google) Code Review [Wed, 2 Dec 2009 20:49:26 +0000 (12:49 -0800)]
Merge change I63863614 into eclair
* changes:
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Wed, 2 Dec 2009 20:08:29 +0000 (12:08 -0800)]
am
44c3bfe2: am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
44c3bfe294da8063f817c80b1f311e101a220b09' into eclair-mr2-plus-aosp
* commit '
44c3bfe294da8063f817c80b1f311e101a220b09':
Reduce screen saver delay to 5 min.
Daniel Sandler [Wed, 2 Dec 2009 20:05:38 +0000 (12:05 -0800)]
am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f' into eclair-plus-aosp
* commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f':
Reduce screen saver delay to 5 min.
Daniel Sandler [Wed, 2 Dec 2009 20:04:50 +0000 (12:04 -0800)]
am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f' into eclair-mr2
* commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f':
Reduce screen saver delay to 5 min.
Android (Google) Code Review [Wed, 2 Dec 2009 20:00:46 +0000 (12:00 -0800)]
Merge change I0a8adab9 into eclair
* changes:
Reduce screen saver delay to 5 min.
Patrick Scott [Wed, 2 Dec 2009 18:00:50 +0000 (10:00 -0800)]
am
1bf3f349: am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
1bf3f349dde2655325a8cca5a65e14b511f3749a' into eclair-mr2-plus-aosp
* commit '
1bf3f349dde2655325a8cca5a65e14b511f3749a':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 17:49:54 +0000 (09:49 -0800)]
am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba' into eclair-mr2
* commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 16:38:07 +0000 (08:38 -0800)]
am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba' into eclair-plus-aosp
* commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 13:28:32 +0000 (08:28 -0500)]
Reverting this change to fix
2252466.
Specifying multiple ringtone types makes the volume stream change to ringer
instead of alarm. This prevents the user from changing the alarm volume inside
the picker.
Patrick Scott [Wed, 2 Dec 2009 13:24:28 +0000 (05:24 -0800)]
am
c3f77cc1: resolved conflicts for merge of
90c4833f to eclair-mr2
Merge commit '
c3f77cc16633551c4daf1c160f4655762dda9a3b' into eclair-mr2-plus-aosp
* commit '
c3f77cc16633551c4daf1c160f4655762dda9a3b':
UI changes based on feedback from Jeff and Amar.
Patrick Scott [Wed, 2 Dec 2009 13:16:25 +0000 (08:16 -0500)]
resolved conflicts for merge of
90c4833f to eclair-mr2
Eric Fischer [Wed, 2 Dec 2009 01:40:12 +0000 (17:40 -0800)]
am
1d0c107a: (-s ours) am
527e80b4: am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
1d0c107a170d54bad76e477b5428f25a7217b9b8'
* commit '
1d0c107a170d54bad76e477b5428f25a7217b9b8':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:40:09 +0000 (17:40 -0800)]
am
1d322b80: am
0d5deb57: am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
1d322b809a816e43b45334f04abdf9229e8f51ae'
* commit '
1d322b809a816e43b45334f04abdf9229e8f51ae':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Fischer [Wed, 2 Dec 2009 01:30:25 +0000 (17:30 -0800)]
am
527e80b4: am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
527e80b4b4395a6b205b4bc4a35f3004ec3702ce' into eclair-mr2-plus-aosp
* commit '
527e80b4b4395a6b205b4bc4a35f3004ec3702ce':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:30:21 +0000 (17:30 -0800)]
am
0d5deb57: am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
0d5deb5795c51cf112489c48e01ebb220ad0b6d1' into eclair-mr2-plus-aosp
* commit '
0d5deb5795c51cf112489c48e01ebb220ad0b6d1':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Fischer [Wed, 2 Dec 2009 01:10:42 +0000 (17:10 -0800)]
am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
77f3d897765faaa640add814852c7b4ccee33655' into eclair-mr2
* commit '
77f3d897765faaa640add814852c7b4ccee33655':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:04:38 +0000 (17:04 -0800)]
am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
98379599e76b778ae7e281d69c3f8923fa50cb27' into eclair-mr2
* commit '
98379599e76b778ae7e281d69c3f8923fa50cb27':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Daniel Sandler [Tue, 1 Dec 2009 22:23:59 +0000 (17:23 -0500)]
Reduce screen saver delay to 5 min.
Discussion in http://b/
2282444 and http://b/
2227579
Patrick Scott [Tue, 1 Dec 2009 13:15:37 +0000 (05:15 -0800)]
am
90c4833f: UI changes based on feedback from Jeff and Amar.
Merge commit '
90c4833f94f4775f747333f8bd67107364a1d9c1' into eclair-plus-aosp
* commit '
90c4833f94f4775f747333f8bd67107364a1d9c1':
UI changes based on feedback from Jeff and Amar.
Patrick Scott [Mon, 23 Nov 2009 19:46:44 +0000 (14:46 -0500)]
UI changes based on feedback from Jeff and Amar.
Bug:
2278206
OSDN Git Service
