OSDN Git Service
Fred Quintana [Wed, 30 Sep 2009 18:17:52 +0000 (11:17 -0700)]
am
609c2c08: Merge change Ia54b1bf0 into eclair
Merge commit '
609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '
609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
Android (Google) Code Review [Wed, 30 Sep 2009 18:10:01 +0000 (14:10 -0400)]
Merge change Ia54b1bf0 into eclair
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
Fred Quintana [Wed, 30 Sep 2009 03:44:30 +0000 (20:44 -0700)]
- make SyncManager get the accounts list during the constructor,
which will allow syncs to be scheduled during bootup. The
providers need this so that they can potentially schedule
syncs while they are starting up.
- make the SyncManager message handler wait until boot
has completed to start dispatching messages
Jaikumar Ganesh [Wed, 30 Sep 2009 18:01:12 +0000 (11:01 -0700)]
am
017c5de1: Merge change I78c4e64a into eclair
Merge commit '
017c5de1cf1228664da84b31012a386c2eac2232' into eclair-plus-aosp
* commit '
017c5de1cf1228664da84b31012a386c2eac2232':
Query from Bluez if name is not present in cache.
Android (Google) Code Review [Wed, 30 Sep 2009 17:55:11 +0000 (13:55 -0400)]
Merge change I78c4e64a into eclair
* changes:
Query from Bluez if name is not present in cache.
Jaikumar Ganesh [Wed, 30 Sep 2009 17:49:34 +0000 (10:49 -0700)]
Query from Bluez if name is not present in cache.
Change-Id: I78c4e64a52b8290053dedfb1326df8d4c20f8a09
Dave Sparks [Wed, 30 Sep 2009 17:09:07 +0000 (10:09 -0700)]
am
8b781403: Merge change Id0ac8c08 into eclair
Merge commit '
8b781403f183fa3616accd1e243d02168a9b9b1d' into eclair-plus-aosp
* commit '
8b781403f183fa3616accd1e243d02168a9b9b1d':
Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug
2142215.
Evan Millar [Wed, 30 Sep 2009 17:08:59 +0000 (10:08 -0700)]
am
1935a341: Merge change I9d12beeb into eclair
Merge commit '
1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp
* commit '
1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Android (Google) Code Review [Wed, 30 Sep 2009 17:03:44 +0000 (13:03 -0400)]
Merge change Id0ac8c08 into eclair
* changes:
Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug
2142215.
Android (Google) Code Review [Wed, 30 Sep 2009 17:00:46 +0000 (13:00 -0400)]
Merge change I9d12beeb into eclair
* changes:
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Robert Greenwalt [Wed, 30 Sep 2009 16:33:20 +0000 (09:33 -0700)]
am
a3431e4c: Merge change I84612ea6 into eclair
Merge commit '
a3431e4c7d6307b845d7008955d99425d842ff72' into eclair-plus-aosp
* commit '
a3431e4c7d6307b845d7008955d99425d842ff72':
Add a delay to wifi driver stop on screen off.
Android (Google) Code Review [Wed, 30 Sep 2009 16:28:14 +0000 (12:28 -0400)]
Merge change I84612ea6 into eclair
* changes:
Add a delay to wifi driver stop on screen off.
Andrei Popescu [Wed, 30 Sep 2009 16:13:33 +0000 (09:13 -0700)]
am
6e58cf21: Merge change I020d2e34 into eclair
Merge commit '
6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp
* commit '
6e58cf21088c2e6b0ef52572bfd544347e02fc17':
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
Android (Google) Code Review [Wed, 30 Sep 2009 16:07:24 +0000 (12:07 -0400)]
Merge change I020d2e34 into eclair
* changes:
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
Robert Greenwalt [Wed, 30 Sep 2009 16:04:22 +0000 (09:04 -0700)]
Add a delay to wifi driver stop on screen off.
We already had a delay if we were associated, but we have some race conditions
we think will be masked if we delay the driver stop for the other cases
too. Don't wait as long (2 min instead of 15).
bug:
2147260
Evan Millar [Wed, 30 Sep 2009 01:02:06 +0000 (18:02 -0700)]
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Change-Id: I9d12beeba16c2f64742b4a99d0da4ceb73525b5b
Bryan Mawhinney [Wed, 30 Sep 2009 15:11:43 +0000 (08:11 -0700)]
am
fb54aadd: Merge change Ic3aa7aa6 into eclair
Merge commit '
fb54aaddf25c8b60e57239880663655ec76a1e8d' into eclair-plus-aosp
* commit '
fb54aaddf25c8b60e57239880663655ec76a1e8d':
Recreate search dialog view each time it's shown.
Cary Clark [Wed, 30 Sep 2009 15:11:36 +0000 (08:11 -0700)]
am
0c5924e9: preserve webkit-side text selection
Merge commit '
0c5924e9dd1befadae8c73505d3acc9813bf8224' into eclair-plus-aosp
* commit '
0c5924e9dd1befadae8c73505d3acc9813bf8224':
preserve webkit-side text selection
Android (Google) Code Review [Wed, 30 Sep 2009 15:06:59 +0000 (11:06 -0400)]
Merge change Ic3aa7aa6 into eclair
* changes:
Recreate search dialog view each time it's shown.
Cary Clark [Wed, 30 Sep 2009 14:24:19 +0000 (10:24 -0400)]
preserve webkit-side text selection
When webkit modifies a text field programmatically, it may change
the selection. This competes with the UI thread attempting to
set the selection in response to the IME next button and changes
made by the trackball.
One recent fix (https://android-git.corp.google.com/g/#change,26904)
sets the selection from the UI side after the IME generated click.
Unfortunately, this can be generated under other circumstances,
so this change qualifies this with mOkayForFocusNotToMatch, which
is only set after the IME next button is pressed.
The other change qualfies onTextChanged calls so that if it was
triggered by setTextAndKeepSelection, the webkit-side selection
is unchanged.
fixes http://b/issue?id=
2096746
Bryan Mawhinney [Wed, 30 Sep 2009 14:20:22 +0000 (15:20 +0100)]
Recreate search dialog view each time it's shown.
This is slower, but less vulnerable to problems in TextField, for example.
Change-Id: I3bb6220f30d8231cedde97fc5e0c4db993660d27
Andrei Popescu [Wed, 30 Sep 2009 13:54:55 +0000 (14:54 +0100)]
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
Fixes http://b/issue?id=
2156505
Jack Palevich [Wed, 30 Sep 2009 13:23:57 +0000 (06:23 -0700)]
am
b386a86c: Merge change I8018f091 into eclair
Merge commit '
b386a86c1c131832c8f9955a5a57a2fa13609d15' into eclair-plus-aosp
* commit '
b386a86c1c131832c8f9955a5a57a2fa13609d15':
Add very simple input path. Fix end-of-line issues.
Android (Google) Code Review [Wed, 30 Sep 2009 13:15:16 +0000 (09:15 -0400)]
Merge change I8018f091 into eclair
* changes:
Add very simple input path. Fix end-of-line issues.
Jack Palevich [Wed, 30 Sep 2009 13:14:24 +0000 (06:14 -0700)]
Add very simple input path. Fix end-of-line issues.
Mike Reed [Wed, 30 Sep 2009 13:04:43 +0000 (06:04 -0700)]
am
9fcd581a: Merge change I4e03999c into eclair
Merge commit '
9fcd581a022abec565e3bf65c3ed4aaecf7d1555' into eclair-plus-aosp
* commit '
9fcd581a022abec565e3bf65c3ed4aaecf7d1555':
if we have a single value for roundrect radius, manually clamp it before drawing.
Android (Google) Code Review [Wed, 30 Sep 2009 12:56:17 +0000 (08:56 -0400)]
Merge change I4e03999c into eclair
* changes:
if we have a single value for roundrect radius, manually clamp it before drawing.
Hung-ying Tyan [Wed, 30 Sep 2009 10:50:30 +0000 (03:50 -0700)]
am
2df1cc43: Merge change I42a80783 into eclair
Merge commit '
2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp
* commit '
2df1cc437793d50609c575881c04cc2c63d0bd97':
Remove deprecated VpnType.getDescription().
Android (Google) Code Review [Wed, 30 Sep 2009 10:45:17 +0000 (06:45 -0400)]
Merge change I42a80783 into eclair
* changes:
Remove deprecated VpnType.getDescription().
Hung-ying Tyan [Wed, 30 Sep 2009 10:00:36 +0000 (18:00 +0800)]
Remove deprecated VpnType.getDescription().
Leon Clarke [Wed, 30 Sep 2009 10:11:50 +0000 (03:11 -0700)]
am
ccf6947e: Merge change Ib89f80df into eclair
Merge commit '
ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp
* commit '
ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
Re-instate the link coloring on startup, but going via the browser
Jim Miller [Wed, 30 Sep 2009 10:11:42 +0000 (03:11 -0700)]
am
badfac38: Merge change I85d63002 into eclair
Merge commit '
badfac3825c6f6823e77fe53eab79ffbb8caef4c' into eclair-plus-aosp
* commit '
badfac3825c6f6823e77fe53eab79ffbb8caef4c':
Fix for
2139014: Allow platform customization of vibration pattern in LockScreenView.
Dave Sparks [Wed, 30 Sep 2009 10:09:03 +0000 (03:09 -0700)]
Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug
2142215.
Android (Google) Code Review [Wed, 30 Sep 2009 10:08:08 +0000 (06:08 -0400)]
Merge change Ib89f80df into eclair
* changes:
Re-instate the link coloring on startup, but going via the browser to read the bookmark history, and restricting it to 100 results.
Android (Google) Code Review [Wed, 30 Sep 2009 10:07:00 +0000 (06:07 -0400)]
Merge change I85d63002 into eclair
* changes:
Fix for
2139014: Allow platform customization of vibration pattern in LockScreenView.
Jim Miller [Wed, 30 Sep 2009 09:50:02 +0000 (02:50 -0700)]
Fix for
2139014: Allow platform customization of vibration pattern in LockScreenView.
Can be configured by config_virtualKeyVibePattern.
Hung-ying Tyan [Wed, 30 Sep 2009 09:42:14 +0000 (02:42 -0700)]
am
f2bd9017: make vpn type strings i18n ready.
Merge commit '
f2bd901738736e16ea93f0a4c7275f2141ca3a3e' into eclair-plus-aosp
* commit '
f2bd901738736e16ea93f0a4c7275f2141ca3a3e':
make vpn type strings i18n ready.
Leon Clarke [Mon, 28 Sep 2009 10:42:12 +0000 (11:42 +0100)]
Re-instate the link coloring on startup, but going via the browser
to read the bookmark history, and restricting it to 100 results.
Link coloring - doing db lookup in new thread
Whitespace, following review
Hung-ying Tyan [Wed, 30 Sep 2009 08:02:17 +0000 (16:02 +0800)]
make vpn type strings i18n ready.
Mike Cleron [Wed, 30 Sep 2009 08:36:11 +0000 (01:36 -0700)]
am
4ca8c837: Merge change Ia4087911 into eclair
Merge commit '
4ca8c837d3aca781e0ba641ed4353827bfd05805' into eclair-plus-aosp
* commit '
4ca8c837d3aca781e0ba641ed4353827bfd05805':
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 08:26:06 +0000 (04:26 -0400)]
Merge change Ia4087911 into eclair
* changes:
Newer icons
Mike Cleron [Wed, 30 Sep 2009 08:04:36 +0000 (01:04 -0700)]
Newer icons
Ray Chen [Wed, 30 Sep 2009 07:16:53 +0000 (00:16 -0700)]
am
3ba35126: update current.xml for cancelThumbnailRequest api.
Merge commit '
3ba351267a3815a3c9a08e2ac7f62a39f83d7776' into eclair-plus-aosp
* commit '
3ba351267a3815a3c9a08e2ac7f62a39f83d7776':
update current.xml for cancelThumbnailRequest api.
Ray Chen [Wed, 30 Sep 2009 07:07:08 +0000 (00:07 -0700)]
am
49e750a3: Merge change I7495977a into eclair
Merge commit '
49e750a3586cdb09aa1a374442af48982b225050' into eclair-plus-aosp
* commit '
49e750a3586cdb09aa1a374442af48982b225050':
Add cancelThumbnailRequest to thumbnail API.
Ray Chen [Wed, 30 Sep 2009 07:06:37 +0000 (00:06 -0700)]
update current.xml for cancelThumbnailRequest api.
Android (Google) Code Review [Wed, 30 Sep 2009 06:59:56 +0000 (02:59 -0400)]
Merge change I7495977a into eclair
* changes:
Add cancelThumbnailRequest to thumbnail API.
Jianhong Jiang [Wed, 30 Sep 2009 06:23:08 +0000 (23:23 -0700)]
am
37b0f279: Merge change I999f1aeb into eclair
Merge commit '
37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp
* commit '
37b0f279a6a237ae366c4861cde3f774f5ab811c':
Remove audio latency fudge factor 96 msec.
Android (Google) Code Review [Wed, 30 Sep 2009 06:18:15 +0000 (02:18 -0400)]
Merge change I999f1aeb into eclair
* changes:
Remove audio latency fudge factor 96 msec.
Nicolas Catania [Wed, 30 Sep 2009 06:13:24 +0000 (23:13 -0700)]
am
fd974f20: Merge change Ifb2ab8f8 into eclair
Merge commit '
fd974f208c5f1e7e6682d772d2cebf4501cd5aed' into eclair-plus-aosp
* commit '
fd974f208c5f1e7e6682d772d2cebf4501cd5aed':
Reverting the background colors back to cupcake's values.
Jianhong Jiang [Wed, 30 Sep 2009 06:12:39 +0000 (23:12 -0700)]
Remove audio latency fudge factor 96 msec.
Android (Google) Code Review [Wed, 30 Sep 2009 06:06:53 +0000 (02:06 -0400)]
Merge change Ifb2ab8f8 into eclair
* changes:
Reverting the background colors back to cupcake's values.
Costin Manolache [Wed, 30 Sep 2009 05:58:53 +0000 (22:58 -0700)]
am
3348f14b: Remove GAIA string
Merge commit '
3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp
* commit '
3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
Remove GAIA string
Costin Manolache [Wed, 30 Sep 2009 01:58:36 +0000 (18:58 -0700)]
Remove GAIA string
Nicolas Catania [Wed, 30 Sep 2009 05:36:41 +0000 (22:36 -0700)]
Reverting the background colors back to cupcake's values.
The new dark background is #1a1a1a instead of #000000.
In effect reverting commit
00ac7e6490e8be8314f660d9ef29fb8258e9000b
Bug:
2153508
Mike Cleron [Wed, 30 Sep 2009 05:33:22 +0000 (22:33 -0700)]
am
b4ee8349: Merge change I290947bb into eclair
Merge commit '
b4ee8349cc7e64a264335ee2dfecc00980eca07a' into eclair-plus-aosp
* commit '
b4ee8349cc7e64a264335ee2dfecc00980eca07a':
Git sucks
Android (Google) Code Review [Wed, 30 Sep 2009 05:26:59 +0000 (01:26 -0400)]
Merge change I290947bb into eclair
* changes:
Git sucks
Yu Shan Emily Lau [Wed, 30 Sep 2009 05:13:57 +0000 (22:13 -0700)]
am
edd942c2: Merge change I55a6ac8c into eclair
Merge commit '
edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp
* commit '
edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
Fixed the long recorder time and reduce the number of loops.
Debajit Ghosh [Wed, 30 Sep 2009 05:13:49 +0000 (22:13 -0700)]
am
2a35c8d7: Merge change I96cb8d0b into eclair
Merge commit '
2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp
* commit '
2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
fix account permission strings. this permission is used to protect more than just Google accounts.
Android (Google) Code Review [Wed, 30 Sep 2009 05:10:54 +0000 (01:10 -0400)]
Merge change I55a6ac8c into eclair
* changes:
Fixed the long recorder time and reduce the number of loops.
Android (Google) Code Review [Wed, 30 Sep 2009 05:06:07 +0000 (01:06 -0400)]
Merge change I96cb8d0b into eclair
* changes:
fix account permission strings. this permission is used to protect more than just Google accounts.
Mike Cleron [Wed, 30 Sep 2009 01:34:32 +0000 (18:34 -0700)]
Git sucks
Yu Shan Emily Lau [Wed, 30 Sep 2009 04:38:39 +0000 (21:38 -0700)]
Fixed the long recorder time and reduce the number of loops.
Dan Egnor [Wed, 30 Sep 2009 03:48:12 +0000 (20:48 -0700)]
am
b1b289a0: Merge change Id6688603 into eclair
Merge commit '
b1b289a01d20a3a2e08775d31994f0abca996a63' into eclair-plus-aosp
* commit '
b1b289a01d20a3a2e08775d31994f0abca996a63':
Better event log tracking for initializeDevice() requests --
Android (Google) Code Review [Wed, 30 Sep 2009 03:39:47 +0000 (23:39 -0400)]
Merge change Id6688603 into eclair
* changes:
Better event log tracking for initializeDevice() requests -- on success, record "backup_initialize" event; on failure, record "backup_transport_failure" event (and add tags to "backup_transport_failure" events that aren't associated with a particular package -- namely "(initialize)" and "(finish)").
Dan Egnor [Wed, 30 Sep 2009 02:12:31 +0000 (19:12 -0700)]
Better event log tracking for initializeDevice() requests --
on success, record "backup_initialize" event; on failure,
record "backup_transport_failure" event (and add tags to
"backup_transport_failure" events that aren't associated
with a particular package -- namely "(initialize)" and
"(finish)").
Ray Chen [Wed, 30 Sep 2009 03:24:01 +0000 (20:24 -0700)]
Add cancelThumbnailRequest to thumbnail API.
Mike LeBeau [Wed, 30 Sep 2009 02:56:13 +0000 (19:56 -0700)]
am
2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide.
Merge commit '
2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp
* commit '
2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
Unhide APIs for enabling geolocation in web views. I've confirmed
Mike LeBeau [Wed, 30 Sep 2009 02:40:28 +0000 (19:40 -0700)]
Unhide APIs for enabling geolocation in web views. I've confirmed
with Grace that these are okay to unhide.
Jim Miller [Wed, 30 Sep 2009 01:25:53 +0000 (18:25 -0700)]
am
a4c96aa2: Merge change I88bb16e6 into eclair
Merge commit '
a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp
* commit '
a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
Fix for
2133391: Allow menu hard key to be disabled in LockScreen on some devices
Xavier Ducrohet [Wed, 30 Sep 2009 01:23:02 +0000 (18:23 -0700)]
am
dd49055a: am
ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit '
dd49055a9dc4c0e66671a80bb51cac946b431029' into eclair-plus-aosp
* commit '
dd49055a9dc4c0e66671a80bb51cac946b431029':
Update 4.xml with the native status change of breakText/measureText
Android (Google) Code Review [Wed, 30 Sep 2009 01:20:13 +0000 (21:20 -0400)]
Merge change I88bb16e6 into eclair
* changes:
Fix for
2133391: Allow menu hard key to be disabled in LockScreen on some devices
Xavier Ducrohet [Wed, 30 Sep 2009 01:15:46 +0000 (18:15 -0700)]
am
ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit '
ac18e4f238650aa4bf8b6c7540d928b0249cfd99' into eclair
* commit '
ac18e4f238650aa4bf8b6c7540d928b0249cfd99':
Update 4.xml with the native status change of breakText/measureText
Dianne Hackborn [Wed, 30 Sep 2009 01:11:49 +0000 (18:11 -0700)]
am
989384b2: am
e67f0c97: (-s ours) Hack to fix issue #
2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit '
989384b20af6e76ded9ddbac77d9d7db37f3326f' into eclair-plus-aosp
* commit '
989384b20af6e76ded9ddbac77d9d7db37f3326f':
Hack to fix issue #
2125365: Sports Trivia compatability with Eclair (do not merge)
Dianne Hackborn [Wed, 30 Sep 2009 01:11:41 +0000 (18:11 -0700)]
am
e5faf231: am
d135b093: (-s ours) Fix broken build. (do not merge)
Merge commit '
e5faf231e0cca9c786492b36e4abcc648c1aec8d' into eclair-plus-aosp
* commit '
e5faf231e0cca9c786492b36e4abcc648c1aec8d':
Fix broken build. (do not merge)
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:34 +0000 (18:11 -0700)]
am
c9c834f9: am
08905850: (-s ours) Merge change I499f8819 into donut
Merge commit '
c9c834f9f35a54ee110bf07182ee03eabb2e9bad' into eclair-plus-aosp
* commit '
c9c834f9f35a54ee110bf07182ee03eabb2e9bad':
Add density support to layoutlib so that bitmap are scaled if needed.
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:27 +0000 (18:11 -0700)]
am
3e211b56: am
f05f92a2: (-s ours) Merge change Id16e0e13 into donut
Merge commit '
3e211b563c7a52185b748d0f38dda3a3e76cf856' into eclair-plus-aosp
* commit '
3e211b563c7a52185b748d0f38dda3a3e76cf856':
Add density value to density enum.
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:19 +0000 (18:11 -0700)]
am
19ea1354: am
59b30f69: (-s ours) Merge change Ia4e59dbb into donut
Merge commit '
19ea135407e225777750fda5955d92f508c7968b' into eclair-plus-aosp
* commit '
19ea135407e225777750fda5955d92f508c7968b':
Add a new IResourceValue that knows about the density.
Dianne Hackborn [Wed, 30 Sep 2009 01:07:59 +0000 (18:07 -0700)]
am
e67f0c97: (-s ours) Hack to fix issue #
2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit '
e67f0c9712890f3af19d1213ff4c4b049c401226' into eclair
* commit '
e67f0c9712890f3af19d1213ff4c4b049c401226':
Hack to fix issue #
2125365: Sports Trivia compatability with Eclair (do not merge)
Dianne Hackborn [Wed, 30 Sep 2009 01:07:48 +0000 (18:07 -0700)]
am
d135b093: (-s ours) Fix broken build. (do not merge)
Merge commit '
d135b0937875b405a20f735189040d5cb4d2546d' into eclair
* commit '
d135b0937875b405a20f735189040d5cb4d2546d':
Fix broken build. (do not merge)
Xavier Ducrohet [Wed, 30 Sep 2009 01:04:51 +0000 (18:04 -0700)]
am
08905850: (-s ours) Merge change I499f8819 into donut
Merge commit '
08905850084c501585fb0a89c346b1be6a103ca1' into eclair
* commit '
08905850084c501585fb0a89c346b1be6a103ca1':
Add density support to layoutlib so that bitmap are scaled if needed.
Xavier Ducrohet [Wed, 30 Sep 2009 01:04:41 +0000 (18:04 -0700)]
am
f05f92a2: (-s ours) Merge change Id16e0e13 into donut
Merge commit '
f05f92a24214f04c88ed3161a4cc684d70192cc1' into eclair
* commit '
f05f92a24214f04c88ed3161a4cc684d70192cc1':
Add density value to density enum.
Xavier Ducrohet [Wed, 30 Sep 2009 01:04:32 +0000 (18:04 -0700)]
am
59b30f69: (-s ours) Merge change Ia4e59dbb into donut
Merge commit '
59b30f6958f0460b59d050cde34aa863ec9b77c2' into eclair
* commit '
59b30f6958f0460b59d050cde34aa863ec9b77c2':
Add a new IResourceValue that knows about the density.
Debajit Ghosh [Wed, 30 Sep 2009 00:57:25 +0000 (17:57 -0700)]
fix account permission strings. this permission is used to protect more than just Google accounts.
Xavier Ducrohet [Wed, 30 Sep 2009 00:56:39 +0000 (17:56 -0700)]
Update 4.xml with the native status change of breakText/measureText
Wu-cheng Li [Wed, 30 Sep 2009 00:51:18 +0000 (17:51 -0700)]
am
8d1ff3a4: Merge change I77153ee0 into eclair
Merge commit '
8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135' into eclair-plus-aosp
* commit '
8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135':
Hide zoom api.
Dianne Hackborn [Tue, 29 Sep 2009 00:33:54 +0000 (17:33 -0700)]
Hack to fix issue #
2125365: Sports Trivia compatability with Eclair (do not merge)
Adds a mechanism to tell Paint the scaling factor its target
canvas will have, for it to compute font metrics based on the
correct font size. Only TextView uses this, but that is enough
for the large majority of apps.
This is integrated from the Eclair branch.
Android (Google) Code Review [Wed, 30 Sep 2009 00:46:18 +0000 (20:46 -0400)]
Merge change I77153ee0 into eclair
* changes:
Hide zoom api.
Romain Guy [Wed, 30 Sep 2009 00:31:58 +0000 (17:31 -0700)]
am
91c6bdd2: Merge change I2e069577 into eclair
Merge commit '
91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp
* commit '
91c6bdd20365a5c6d33986cb941aa085864d016e':
Simplify the layout of all activities with a title and a progress bar.
Android (Google) Code Review [Wed, 30 Sep 2009 00:27:22 +0000 (20:27 -0400)]
Merge change I2e069577 into eclair
* changes:
Simplify the layout of all activities with a title and a progress bar.
Christopher Tate [Wed, 30 Sep 2009 00:22:32 +0000 (17:22 -0700)]
am
072c9e74: Merge change I52e20bac into eclair
Merge commit '
072c9e7473f4ff1a1b08ec08a906cc8308ed1c91' into eclair-plus-aosp
* commit '
072c9e7473f4ff1a1b08ec08a906cc8308ed1c91':
Add more useful-for-debug info to 'dumpsys backup'
Romain Guy [Wed, 30 Sep 2009 00:22:26 +0000 (17:22 -0700)]
am
92f0370c: Merge change Id43181f2 into eclair
Merge commit '
92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp
* commit '
92f0370cf09ef835c72099864fe7c0e7b7389877':
Fix disabled text color in choice dialogs.
Android (Google) Code Review [Wed, 30 Sep 2009 00:18:44 +0000 (20:18 -0400)]
Merge change I52e20bac into eclair
* changes:
Add more useful-for-debug info to 'dumpsys backup'
Romain Guy [Wed, 30 Sep 2009 00:18:28 +0000 (17:18 -0700)]
Simplify the layout of all activities with a title and a progress bar.
Change-Id: I2e0695779e5b4bccc4fc2e790bbaf5466e017fb2
Jim Miller [Wed, 30 Sep 2009 00:13:48 +0000 (17:13 -0700)]
Fix for
2133391: Allow menu hard key to be disabled in LockScreen on some devices
Christopher Tate [Wed, 30 Sep 2009 00:17:34 +0000 (17:17 -0700)]
Add more useful-for-debug info to 'dumpsys backup'
Change-Id: I52e20bac01ff63feaf28920a79311881992293a3
Dianne Hackborn [Wed, 23 Sep 2009 22:17:39 +0000 (15:17 -0700)]
Fix broken build. (do not merge)
I -did- run it... why did this later break on me?!?
This is integrated from the Eclair branch.
Android (Google) Code Review [Wed, 30 Sep 2009 00:13:09 +0000 (20:13 -0400)]
Merge change Id43181f2 into eclair
* changes:
Fix disabled text color in choice dialogs.
Romain Guy [Wed, 30 Sep 2009 00:12:37 +0000 (17:12 -0700)]
Fix disabled text color in choice dialogs.
Change-Id: Id43181f27c741ed181960e9c592d0544b6571811
Chih-Chung Chang [Wed, 30 Sep 2009 00:00:24 +0000 (17:00 -0700)]
am
8bbba0e3: Merge change If5722b3f into eclair
Merge commit '
8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp
* commit '
8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
Dont NPE if the thumbnail file cannot be opened.
Android (Google) Code Review [Tue, 29 Sep 2009 23:52:23 +0000 (19:52 -0400)]
Merge change If5722b3f into eclair
* changes:
Dont NPE if the thumbnail file cannot be opened.