OSDN Git Service
Chung-yih Wang [Thu, 1 Oct 2009 18:11:44 +0000 (11:11 -0700)]
am
d0af7f90: am
31522ad0: Merge change I931ce71e into eclair
Merge commit '
d0af7f905fc39704c98cfd51961199722e551f9b'
* commit '
d0af7f905fc39704c98cfd51961199722e551f9b':
Add unit test for the new keystore.
Dianne Hackborn [Thu, 1 Oct 2009 18:11:30 +0000 (11:11 -0700)]
am
ce37120d: am
7eca687c: Fix bug where we would return null with disabled components.
Merge commit '
ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit '
ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Dianne Hackborn [Thu, 1 Oct 2009 18:10:25 +0000 (11:10 -0700)]
am
4df43ab1: am
ffc16544: Merge change Ib7c1701a into eclair
Merge commit '
4df43ab1d834f839f3b1e535554836a936902d00'
* commit '
4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #
1930911: Crash in system process
John Michelau [Thu, 1 Oct 2009 18:09:48 +0000 (11:09 -0700)]
am
a2fbe447: am
a2f5afe6: Merge change I27009b08 into eclair
Merge commit '
a2fbe44783d190236a42950e0a2585d8835d657f'
* commit '
a2fbe44783d190236a42950e0a2585d8835d657f':
Fix EVDO SNR signal bar calculation
Dianne Hackborn [Thu, 1 Oct 2009 18:07:16 +0000 (11:07 -0700)]
am
72191950: am
6b1cb352: Fix issue #
2149126: unable to answer incoming call, various problems
Merge commit '
7219195066f365ae4ada788dd416e5e87fc906f5'
* commit '
7219195066f365ae4ada788dd416e5e87fc906f5':
Fix issue #
2149126: unable to answer incoming call, various problems
Jason Sams [Thu, 1 Oct 2009 18:06:17 +0000 (11:06 -0700)]
am
e88adf36: am
ff966d5f: Merge change I5235cf3f into eclair
Merge commit '
e88adf369a2f078432b2e35a1656a004af643940'
* commit '
e88adf369a2f078432b2e35a1656a004af643940':
Fix but processing raster state pragma.
Mike Cleron [Thu, 1 Oct 2009 18:06:05 +0000 (11:06 -0700)]
am
e6566064: am
0368334d: Merge change Ie1072f12 into eclair
Merge commit '
e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit '
e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Jack Palevich [Thu, 1 Oct 2009 18:05:54 +0000 (11:05 -0700)]
am
019116ce: am
97702aac: Merge changes I82c78b83,I54f72d9d into eclair
Merge commit '
019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '
019116ce202021e1b274516c9813aeff83b1b5ab':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Jeff Sharkey [Tue, 29 Sep 2009 18:14:52 +0000 (11:14 -0700)]
Jeff Sharkey [Tue, 29 Sep 2009 18:14:39 +0000 (11:14 -0700)]
am
7d028a0a: am
ff18bbf8: Separate API for vCards through openAssetFileDescriptor().
Merge commit '
7d028a0a974fdee240cac7118bf47c96777ea533'
* commit '
7d028a0a974fdee240cac7118bf47c96777ea533':
Separate API for vCards through openAssetFileDescriptor().
Dmitri Plotnikov [Tue, 29 Sep 2009 18:14:32 +0000 (11:14 -0700)]
am
b3787062: am
13a90abc: Adding status update attribution to ContactHeaderWidget
Merge commit '
b3787062bc652d4db71b40ba3a7c991ce1636a96'
* commit '
b3787062bc652d4db71b40ba3a7c991ce1636a96':
Adding status update attribution to ContactHeaderWidget
Evan Millar [Tue, 29 Sep 2009 18:14:24 +0000 (11:14 -0700)]
am
aec2b81d: am
6e98f7e3: Merge change Ie6a95736 into eclair
Merge commit '
aec2b81d7bc1f42b217d6734a5d23ab820740273'
* commit '
aec2b81d7bc1f42b217d6734a5d23ab820740273':
Fix artifact in tab drawing.
Jeff Hamilton [Tue, 29 Sep 2009 18:13:09 +0000 (11:13 -0700)]
am
84eb12bc: am
f36a2bb5: Merge change Ibeb22f37 into eclair
Merge commit '
84eb12bc7ef92ce04d43e1c7ce0319768e3f247e'
* commit '
84eb12bc7ef92ce04d43e1c7ce0319768e3f247e':
Call the proper variant of markAsContacted.
Mark Wagner [Tue, 29 Sep 2009 18:13:01 +0000 (11:13 -0700)]
am
b74e2ac4: am
1cff7476: Merge change Ie7d26695 into eclair
Merge commit '
b74e2ac44c72c846095334fab7f60111c1271f34'
* commit '
b74e2ac44c72c846095334fab7f60111c1271f34':
Modify the "active chats" uri to not overlap with other uris.
Daisuke Miyakawa [Tue, 29 Sep 2009 18:12:35 +0000 (11:12 -0700)]
Jack Palevich [Tue, 29 Sep 2009 18:12:22 +0000 (11:12 -0700)]
am
0d6d171a: am
ee25eb58: Merge change I669ce246 into eclair
Merge commit '
0d6d171af20e52b529c6f42885a2aca70e3a5cef'
* commit '
0d6d171af20e52b529c6f42885a2aca70e3a5cef':
Print out all available EGL configurations.
Romain Guy [Tue, 29 Sep 2009 18:12:13 +0000 (11:12 -0700)]
am
39433f81: am
5d259d3b: Merge change Id29ec50d into eclair
Merge commit '
39433f818b223aab50b264fb43e8e32da1d8151a'
* commit '
39433f818b223aab50b264fb43e8e32da1d8151a':
Do not crash appwdiget host when a pending intent send fails.
Mike Lockwood [Tue, 29 Sep 2009 18:12:05 +0000 (11:12 -0700)]
am
c78f617b: am
733fdf34: Disable keyguard while docked when the lock screen is insecure.
Merge commit '
c78f617bb66123c224c833ed2bd151d588a9a06d'
* commit '
c78f617bb66123c224c833ed2bd151d588a9a06d':
Disable keyguard while docked when the lock screen is insecure.
Tadashi G. Takaoka [Tue, 29 Sep 2009 18:11:31 +0000 (11:11 -0700)]
am
250d3255: am
c031981f: Merge change I36ad03e1 into eclair
Merge commit '
250d3255c6a14944390816108e3edc5e1f19a37a'
* commit '
250d3255c6a14944390816108e3edc5e1f19a37a':
Delegate exclude mimetypes to FasttrackBadgeWidget
Dianne Hackborn [Tue, 29 Sep 2009 18:10:53 +0000 (11:10 -0700)]
am
ccc624ca: am
ebd45e5c: Merge change I55edce63 into eclair
Merge commit '
ccc624ca9a8fd8f9435afb854313aa9bda51b0b0'
* commit '
ccc624ca9a8fd8f9435afb854313aa9bda51b0b0':
Fix issue #
2149145: Safe Mode does not work on Sholes device
Mike Cleron [Tue, 29 Sep 2009 18:09:35 +0000 (11:09 -0700)]
am
1492b96e: am
fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit '
1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '
1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
Wu-cheng Li [Tue, 29 Sep 2009 18:09:04 +0000 (11:09 -0700)]
am
90b4a932: am
fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Merge commit '
90b4a93271520b2952b55520338b153192b834a6'
* commit '
90b4a93271520b2952b55520338b153192b834a6':
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Xavier Ducrohet [Tue, 29 Sep 2009 18:08:32 +0000 (11:08 -0700)]
Romain Guy [Tue, 29 Sep 2009 18:08:25 +0000 (11:08 -0700)]
am
ba016786: am
b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit '
ba0167861d71b0412503843369530575f0d9faeb'
* commit '
ba0167861d71b0412503843369530575f0d9faeb':
Fix possible NPE in AbsListView.positionSelector().
Nick Pelly [Tue, 29 Sep 2009 18:07:30 +0000 (11:07 -0700)]
am
3083a3c1: am
aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit '
3083a3c11ae303e3fc17d9c7949a46b1e619c146'
* commit '
3083a3c11ae303e3fc17d9c7949a46b1e619c146':
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Bjorn Bringert [Tue, 29 Sep 2009 18:06:45 +0000 (11:06 -0700)]
am
575d73a1: am
2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '
575d73a15b33b000feb82f5243c6d9bec7e16083'
* commit '
575d73a15b33b000feb82f5243c6d9bec7e16083':
Pass limit=50 to all suggestion sources.
Chung-yih Wang [Tue, 29 Sep 2009 07:41:10 +0000 (00:41 -0700)]
am
31522ad0: Merge change I931ce71e into eclair
Merge commit '
31522ad0ca71013ac5437a1a43e9078a31ff2213' into eclair-plus-aosp
* commit '
31522ad0ca71013ac5437a1a43e9078a31ff2213':
Add unit test for the new keystore.
Android (Google) Code Review [Tue, 29 Sep 2009 07:27:21 +0000 (03:27 -0400)]
Merge change I931ce71e into eclair
* changes:
Add unit test for the new keystore.
Dianne Hackborn [Tue, 29 Sep 2009 07:21:53 +0000 (00:21 -0700)]
am
7eca687c: Fix bug where we would return null with disabled components.
Merge commit '
7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp
* commit '
7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
Fix bug where we would return null with disabled components.
Chung-yih Wang [Tue, 29 Sep 2009 03:20:28 +0000 (11:20 +0800)]
Add unit test for the new keystore.
Since we need to test the keystore with user system in order to test
the reset(), password(), lock() and unlock(), we have to take advantage
of the ActivityUnitTestCase to run the test with the user 'system'.
Dianne Hackborn [Tue, 29 Sep 2009 06:57:05 +0000 (23:57 -0700)]
Fix bug where we would return null with disabled components.
Change-Id: I1624a42803f1c4b02736f558a8eeeeba2890667e
Dianne Hackborn [Tue, 29 Sep 2009 05:24:03 +0000 (22:24 -0700)]
am
ffc16544: Merge change Ib7c1701a into eclair
Merge commit '
ffc165446a7188cadfbc9f99fafac27d11254a54' into eclair-plus-aosp
* commit '
ffc165446a7188cadfbc9f99fafac27d11254a54':
Fix issue #
1930911: Crash in system process
Android (Google) Code Review [Tue, 29 Sep 2009 05:18:57 +0000 (01:18 -0400)]
Merge change Ib7c1701a into eclair
* changes:
Fix issue #
1930911: Crash in system process
Dianne Hackborn [Tue, 29 Sep 2009 05:14:42 +0000 (22:14 -0700)]
Fix issue #
1930911: Crash in system process
Ensure that we do all the work for removing a window's view
hierarchy in that window's thread.
Change-Id: Ib7c1701aee6b541b75fd1a680f6987f959f2ba88
John Michelau [Tue, 29 Sep 2009 04:45:06 +0000 (21:45 -0700)]
am
a2f5afe6: Merge change I27009b08 into eclair
Merge commit '
a2f5afe6c690ad84aec046c4fa0178f2ee590c8e' into eclair-plus-aosp
* commit '
a2f5afe6c690ad84aec046c4fa0178f2ee590c8e':
Fix EVDO SNR signal bar calculation
Android (Google) Code Review [Tue, 29 Sep 2009 04:35:55 +0000 (00:35 -0400)]
Merge change I27009b08 into eclair
* changes:
Fix EVDO SNR signal bar calculation
Dianne Hackborn [Tue, 29 Sep 2009 03:04:01 +0000 (20:04 -0700)]
am
6b1cb352: Fix issue #
2149126: unable to answer incoming call, various problems
Merge commit '
6b1cb352b86f2cf983026f2e6814665e12eb8452' into eclair-plus-aosp
* commit '
6b1cb352b86f2cf983026f2e6814665e12eb8452':
Fix issue #
2149126: unable to answer incoming call, various problems
Dianne Hackborn [Tue, 29 Sep 2009 01:27:26 +0000 (18:27 -0700)]
Fix issue #
2149126: unable to answer incoming call, various problems
Now that we can have a non-app-window cross-wallpaper animation,
we need to make sure to not access a null app token.
Change-Id: Ia00debd4b2b431d15bd074927a9035e1bc0a6445
Jason Sams [Tue, 29 Sep 2009 01:39:03 +0000 (18:39 -0700)]
am
ff966d5f: Merge change I5235cf3f into eclair
Merge commit '
ff966d5f6c88a9fba033f1bb5ec087464376534d' into eclair-plus-aosp
* commit '
ff966d5f6c88a9fba033f1bb5ec087464376534d':
Fix but processing raster state pragma.
Mike Cleron [Tue, 29 Sep 2009 01:38:55 +0000 (18:38 -0700)]
am
0368334d: Merge change Ie1072f12 into eclair
Merge commit '
0368334db91e923021df36ae9afb81ed8256abfd' into eclair-plus-aosp
* commit '
0368334db91e923021df36ae9afb81ed8256abfd':
Finish off java API to allow fading scrollbars
Jack Palevich [Tue, 29 Sep 2009 01:38:48 +0000 (18:38 -0700)]
am
97702aac: Merge changes I82c78b83,I54f72d9d into eclair
Merge commit '
97702aacfc7f84b473357ce102cc70da2a316032' into eclair-plus-aosp
* commit '
97702aacfc7f84b473357ce102cc70da2a316032':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Android (Google) Code Review [Tue, 29 Sep 2009 01:34:37 +0000 (21:34 -0400)]
Merge change I5235cf3f into eclair
* changes:
Fix but processing raster state pragma. rename stateFragmentStore to stateStore
Android (Google) Code Review [Tue, 29 Sep 2009 01:33:19 +0000 (21:33 -0400)]
Merge change Ie1072f12 into eclair
* changes:
Finish off java API to allow fading scrollbars
Android (Google) Code Review [Tue, 29 Sep 2009 01:32:47 +0000 (21:32 -0400)]
Merge changes I82c78b83,I54f72d9d into eclair
* changes:
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Mike Cleron [Tue, 29 Sep 2009 01:21:37 +0000 (18:21 -0700)]
Finish off java API to allow fading scrollbars
Jeff Sharkey [Tue, 29 Sep 2009 01:29:00 +0000 (18:29 -0700)]
am
8f76734d: Fix docs breakage.
Merge commit '
8f76734d1e9a21618ad9762c0716ee93f60902ec' into eclair-plus-aosp
* commit '
8f76734d1e9a21618ad9762c0716ee93f60902ec':
Fix docs breakage.
Jack Palevich [Tue, 29 Sep 2009 01:28:07 +0000 (18:28 -0700)]
Don't ask for pbuffer support, because we don't use any pbuffers.
Jeff Sharkey [Tue, 29 Sep 2009 01:22:46 +0000 (18:22 -0700)]
Fix docs breakage.
Jack Palevich [Tue, 29 Sep 2009 01:22:01 +0000 (18:22 -0700)]
Print out EGL configuration info for the config we've chosen.
Don't ask for PBuffer support, since we don't actually use pbuffers,
and some drivers might not support them.
Jason Sams [Tue, 29 Sep 2009 01:12:56 +0000 (18:12 -0700)]
Fix but processing raster state pragma.
rename stateFragmentStore to stateStore
Jeff Sharkey [Tue, 29 Sep 2009 00:54:46 +0000 (17:54 -0700)]
am
ff18bbf8: Separate API for vCards through openAssetFileDescriptor().
Merge commit '
ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp
* commit '
ff18bbf83562b8a827a37c19cdc27e520786119e':
Separate API for vCards through openAssetFileDescriptor().
Dmitri Plotnikov [Tue, 29 Sep 2009 00:54:40 +0000 (17:54 -0700)]
am
13a90abc: Adding status update attribution to ContactHeaderWidget
Merge commit '
13a90abcae224b85d128ded8e59398a3fc1ce4e1' into eclair-plus-aosp
* commit '
13a90abcae224b85d128ded8e59398a3fc1ce4e1':
Adding status update attribution to ContactHeaderWidget
Evan Millar [Tue, 29 Sep 2009 00:54:33 +0000 (17:54 -0700)]
am
6e98f7e3: Merge change Ie6a95736 into eclair
Merge commit '
6e98f7e3fb12b830413aa57623712b5fa3f334e3' into eclair-plus-aosp
* commit '
6e98f7e3fb12b830413aa57623712b5fa3f334e3':
Fix artifact in tab drawing.
Jeff Sharkey [Sun, 27 Sep 2009 23:55:00 +0000 (16:55 -0700)]
Separate API for vCards through openAssetFileDescriptor().
Previously we overloaded Contacts.CONTENT_URI to return
vCard-formatted Contacts entries. To fix http://b/
2138790
this is a separate API that returns a well-known MIME-type.
Also helps fix http://b/
2078399 by adding OFFICE_LOCATION.
Dmitri Plotnikov [Mon, 28 Sep 2009 21:32:54 +0000 (14:32 -0700)]
Adding status update attribution to ContactHeaderWidget
Change-Id: I677f8a8d805c68d95ee56cd1119cc3e97c6ae073
Android (Google) Code Review [Tue, 29 Sep 2009 00:15:44 +0000 (20:15 -0400)]
Merge change Ie6a95736 into eclair
* changes:
Fix artifact in tab drawing.
Jeff Hamilton [Tue, 29 Sep 2009 00:14:28 +0000 (17:14 -0700)]
am
f36a2bb5: Merge change Ibeb22f37 into eclair
Merge commit '
f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp
* commit '
f36a2bb59b846545946124124d3290bd3eec44f0':
Call the proper variant of markAsContacted.
Mark Wagner [Tue, 29 Sep 2009 00:14:21 +0000 (17:14 -0700)]
am
1cff7476: Merge change Ie7d26695 into eclair
Merge commit '
1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp
* commit '
1cff74761798eba8349a3b9824ae4b11072c11d1':
Modify the "active chats" uri to not overlap with other uris.
Android (Google) Code Review [Tue, 29 Sep 2009 00:09:57 +0000 (20:09 -0400)]
Merge change Ibeb22f37 into eclair
* changes:
Call the proper variant of markAsContacted.
Android (Google) Code Review [Tue, 29 Sep 2009 00:05:55 +0000 (20:05 -0400)]
Merge change Ie7d26695 into eclair
* changes:
Modify the "active chats" uri to not overlap with other uris.
Joshua Bloch [Tue, 29 Sep 2009 00:05:08 +0000 (17:05 -0700)]
Replace existing ArrayList implementation with faster, simpler one.
Jeff Hamilton [Mon, 28 Sep 2009 23:57:37 +0000 (16:57 -0700)]
Call the proper variant of markAsContacted.
Change-Id: Ibeb22f37bd079b1a965f5b350ac7ca6e77eac00f
Daisuke Miyakawa [Mon, 28 Sep 2009 23:54:12 +0000 (16:54 -0700)]
am
3f48d31b: Merge change I228d52db into eclair
Merge commit '
3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3' into eclair-plus-aosp
* commit '
3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3':
Three changes.
Android (Google) Code Review [Mon, 28 Sep 2009 23:47:28 +0000 (19:47 -0400)]
Merge change I228d52db into eclair
* changes:
Three changes.
Jack Palevich [Mon, 28 Sep 2009 23:44:32 +0000 (16:44 -0700)]
am
ee25eb58: Merge change I669ce246 into eclair
Merge commit '
ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp
* commit '
ee25eb58aac8fded3927c0343eaa367f66c8b79d':
Print out all available EGL configurations.
Daisuke Miyakawa [Mon, 28 Sep 2009 13:28:26 +0000 (06:28 -0700)]
Three changes.
- Add FOR_EXPORT_ONLY to Data column.
- Make VCardComposer use Contacts instead of RawContacts.
- Make VCardComposer honor FOR_CONTACT_ONLY regardless of
the intention of any caller, which makes composer unable to
compose any contact with "is_restricted" flag, which is unseen
from outside the contacts provider.
Internal Issue number:
2147248,
2143207
Android (Google) Code Review [Mon, 28 Sep 2009 23:35:43 +0000 (19:35 -0400)]
Merge change I669ce246 into eclair
* changes:
Print out all available EGL configurations.
Jack Palevich [Mon, 28 Sep 2009 23:34:45 +0000 (16:34 -0700)]
Print out all available EGL configurations.
Romain Guy [Mon, 28 Sep 2009 23:28:42 +0000 (16:28 -0700)]
am
5d259d3b: Merge change Id29ec50d into eclair
Merge commit '
5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp
* commit '
5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
Do not crash appwdiget host when a pending intent send fails.
Mike Lockwood [Mon, 28 Sep 2009 23:28:36 +0000 (16:28 -0700)]
am
733fdf34: Disable keyguard while docked when the lock screen is insecure.
Merge commit '
733fdf34b6a8a8e3983ff7663828a928d3c19944' into eclair-plus-aosp
* commit '
733fdf34b6a8a8e3983ff7663828a928d3c19944':
Disable keyguard while docked when the lock screen is insecure.
Android (Google) Code Review [Mon, 28 Sep 2009 23:25:53 +0000 (19:25 -0400)]
Merge change Id29ec50d into eclair
* changes:
Do not crash appwdiget host when a pending intent send fails.
Romain Guy [Mon, 28 Sep 2009 23:24:35 +0000 (16:24 -0700)]
Do not crash appwdiget host when a pending intent send fails.
Change-Id: Id29ec50dcb4d51589b9732ace6d505fcea9cc787
Mike Lockwood [Mon, 28 Sep 2009 23:08:53 +0000 (19:08 -0400)]
Disable keyguard while docked when the lock screen is insecure.
Change-Id: If6e11bb49a2cbbe904517e6037d1e8b99fe2717c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Tadashi G. Takaoka [Mon, 28 Sep 2009 23:08:31 +0000 (16:08 -0700)]
am
c031981f: Merge change I36ad03e1 into eclair
Merge commit '
c031981f2320aa592aa819f4b0a22d0da6e7d5e4' into eclair-plus-aosp
* commit '
c031981f2320aa592aa819f4b0a22d0da6e7d5e4':
Delegate exclude mimetypes to FasttrackBadgeWidget
Android (Google) Code Review [Mon, 28 Sep 2009 23:03:04 +0000 (19:03 -0400)]
Merge change I36ad03e1 into eclair
* changes:
Delegate exclude mimetypes to FasttrackBadgeWidget
Dianne Hackborn [Mon, 28 Sep 2009 22:18:51 +0000 (15:18 -0700)]
am
ebd45e5c: Merge change I55edce63 into eclair
Merge commit '
ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp
* commit '
ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
Fix issue #
2149145: Safe Mode does not work on Sholes device
Android (Google) Code Review [Mon, 28 Sep 2009 22:11:28 +0000 (18:11 -0400)]
Merge change I55edce63 into eclair
* changes:
Fix issue #
2149145: Safe Mode does not work on Sholes device
Mark Wagner [Mon, 28 Sep 2009 22:10:28 +0000 (15:10 -0700)]
Modify the "active chats" uri to not overlap with other uris.
Tadashi G. Takaoka [Mon, 28 Sep 2009 21:48:15 +0000 (14:48 -0700)]
Delegate exclude mimetypes to FasttrackBadgeWidget
Internal Bug:
2138745
Mike Cleron [Mon, 28 Sep 2009 21:41:46 +0000 (14:41 -0700)]
am
fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit '
fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp
* commit '
fe81d386a818b386ffc0d5a789236531ab4e264f':
Remove obsolete links; start at a method to turn on fading scrollbars
Mike Cleron [Mon, 28 Sep 2009 21:22:16 +0000 (14:22 -0700)]
Remove obsolete links; start at a method to turn on fading scrollbars
Wu-cheng Li [Mon, 28 Sep 2009 21:13:11 +0000 (14:13 -0700)]
am
fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Merge commit '
fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp
* commit '
fe1a86df8b1c23e3290f96dce69984bf979a462b':
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Xavier Ducrohet [Mon, 28 Sep 2009 20:55:36 +0000 (13:55 -0700)]
am
279ba943: Merge change I7c7b1596 into eclair
Merge commit '
279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp
* commit '
279ba943553ec2368d14e1b3c8a88c36bf17785d':
Fix a warning output.
Romain Guy [Mon, 28 Sep 2009 20:55:30 +0000 (13:55 -0700)]
am
b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit '
b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp
* commit '
b4c547a56caebb5900c132ec9d5ce953f89de14f':
Fix possible NPE in AbsListView.positionSelector().
Wu-cheng Li [Mon, 28 Sep 2009 20:51:12 +0000 (13:51 -0700)]
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Android (Google) Code Review [Mon, 28 Sep 2009 20:49:16 +0000 (16:49 -0400)]
Merge change I7c7b1596 into eclair
* changes:
Fix a warning output.
Romain Guy [Mon, 28 Sep 2009 20:42:20 +0000 (13:42 -0700)]
Fix possible NPE in AbsListView.positionSelector().
ListView was being reckless and calling the method with a null object in some
situations.
Change-Id: Ibb595a1ff6f916c699e4af55450966dd7fd8c156
Dianne Hackborn [Mon, 28 Sep 2009 20:25:46 +0000 (13:25 -0700)]
Fix issue #
2149145: Safe Mode does not work on Sholes device
The APIs for checking whether keys are held down now also look
at virtual keys.
However it turns out there is less than a second between the time we
start the input thread and check for safe mode, so there is not enough
time to actually open all of the devices and get the data from them
about the finger being down to determine if a virtual key is down.
So now you can also hold DPAD center, trackball center, or s to
enter safe mode. Also give some vibrator feedback.
Change-Id: I55edce63bc0c375813bd3751766b8070beeb0153
Nick Pelly [Mon, 28 Sep 2009 20:19:15 +0000 (13:19 -0700)]
am
aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit '
aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp
* commit '
aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Evan Millar [Mon, 28 Sep 2009 20:13:46 +0000 (13:13 -0700)]
Fix artifact in tab drawing.
The tab nine-patch assets were 2 pixes too tall. I trimmed them down.
Change-Id: Ie6a95736578c42997136eb9036b0f1d23cf2b6d7
Nick Pelly [Mon, 28 Sep 2009 19:33:17 +0000 (12:33 -0700)]
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
Xavier Ducrohet [Mon, 28 Sep 2009 19:57:42 +0000 (12:57 -0700)]
Fix a warning output.
This was introduced by the dpi work.
Change-Id: I7c7b1596085f70532b8279139c287a2a58f57046
Bjorn Bringert [Mon, 28 Sep 2009 19:54:37 +0000 (12:54 -0700)]
am
2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '
2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp
* commit '
2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
Pass limit=50 to all suggestion sources.
Android (Google) Code Review [Mon, 28 Sep 2009 19:47:56 +0000 (15:47 -0400)]
Merge change Ida50e915 into eclair
* changes:
Pass limit=50 to all suggestion sources.
Bjorn Bringert [Mon, 28 Sep 2009 19:11:52 +0000 (20:11 +0100)]
Pass limit=50 to all suggestion sources.
Should mitigate http://b/issue?id=
2149158
"Bad suggestions behavior within contacts app
search for 10k contact db"
Change-Id: Ida50e9157c3ce46fc7892ef09a67da9f4008e665
Bjorn Bringert [Mon, 28 Sep 2009 18:54:19 +0000 (11:54 -0700)]
am
385a39d3: am
9d686c93: Merge change 27474 into eclair
Merge commit '
385a39d322267890edc0708c1baff7ac4125ed31'
* commit '
385a39d322267890edc0708c1baff7ac4125ed31':
Don't crash search when getKeyDispatcherState() is null
Mike Cleron [Mon, 28 Sep 2009 18:54:09 +0000 (11:54 -0700)]
Evan Millar [Mon, 28 Sep 2009 18:54:02 +0000 (11:54 -0700)]
am
93d0b335: am
14f65ff9: Merge change 27243 into eclair
Merge commit '
93d0b335a65149b1dc3c31cda89c076e6360c6f8'
* commit '
93d0b335a65149b1dc3c31cda89c076e6360c6f8':
Add drop shadow to contact name in ContactHeaderWidget
James Dong [Mon, 28 Sep 2009 18:53:55 +0000 (11:53 -0700)]
am
9365c8fa: am
99638e74: Merge change 27466 into eclair
Merge commit '
9365c8fa7c66c62de98b859f08c881ea2ad65980'
* commit '
9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
Bjorn Bringert [Mon, 28 Sep 2009 18:49:43 +0000 (11:49 -0700)]
am
9d686c93: Merge change 27474 into eclair
Merge commit '
9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp
* commit '
9d686c9384cad2bccb3db27eb19bb089bf05041c':
Don't crash search when getKeyDispatcherState() is null
OSDN Git Service
