OSDN Git Service
Dirk Dougherty [Tue, 29 Sep 2009 15:56:21 +0000 (08:56 -0700)]
am
bc0e07bf: Merge change I7b64ad2e into donut
Merge commit '
bc0e07bf9ad21d9237713d58879c00556d70b1f2' into eclair
* commit '
bc0e07bf9ad21d9237713d58879c00556d70b1f2':
doc change only. fix toc links on terms page.
Android (Google) Code Review [Tue, 29 Sep 2009 15:42:46 +0000 (11:42 -0400)]
Merge change I59ceeae4 into eclair
* changes:
Fix the reporting of ActiveApnTypes on CDMA
Android (Google) Code Review [Tue, 29 Sep 2009 15:42:03 +0000 (11:42 -0400)]
Merge change I7b64ad2e into donut
* changes:
doc change only. fix toc links on terms page.
Android (Google) Code Review [Tue, 29 Sep 2009 15:19:48 +0000 (11:19 -0400)]
Merge change I94c715d6 into eclair
* changes:
Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
Android (Google) Code Review [Tue, 29 Sep 2009 07:35:53 +0000 (03:35 -0400)]
Merge change I17f45d35 into eclair
* changes:
Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
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.
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
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
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.
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.
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.
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.
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.
Android (Google) Code Review [Mon, 28 Sep 2009 23:47:28 +0000 (19:47 -0400)]
Merge change I228d52db into eclair
* changes:
Three changes.
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.
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.
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
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
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.
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.
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:43 +0000 (14:46 -0400)]
Merge change 27474 into eclair
* changes:
Don't crash search when getKeyDispatcherState() is null
Android (Google) Code Review [Mon, 28 Sep 2009 18:44:42 +0000 (14:44 -0400)]
Merge change 27243 into eclair
* changes:
Add drop shadow to contact name in ContactHeaderWidget
Android (Google) Code Review [Mon, 28 Sep 2009 18:40:34 +0000 (14:40 -0400)]
Merge change 27466 into eclair
* changes:
Turn on thubmnail capture unit test for media metadata retriever
Android (Google) Code Review [Mon, 28 Sep 2009 18:12:03 +0000 (14:12 -0400)]
Merge change 27349 into eclair
* changes:
Fix
2143297: Fix transition from password -> visible password
Android (Google) Code Review [Mon, 28 Sep 2009 18:09:47 +0000 (14:09 -0400)]
Merge change 27462 into eclair
* changes:
Add an API to request a system activity to turn on Bluetooth.
Android (Google) Code Review [Mon, 28 Sep 2009 17:33:01 +0000 (13:33 -0400)]
Merge change 27426 into eclair
* changes:
Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
Android (Google) Code Review [Mon, 28 Sep 2009 17:07:16 +0000 (13:07 -0400)]
Merge change 27411 into eclair
* changes:
Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
Android (Google) Code Review [Mon, 28 Sep 2009 16:56:02 +0000 (12:56 -0400)]
Merge change 27457 into eclair
* changes:
Added code style fix that actually did not get submitted in 2nd patch of previous change.
Android (Google) Code Review [Mon, 28 Sep 2009 16:27:45 +0000 (12:27 -0400)]
Merge change 27410 into eclair
* changes:
Add extension->mime type mappings
Android (Google) Code Review [Mon, 28 Sep 2009 16:24:08 +0000 (12:24 -0400)]
Merge change 27449 into eclair
* changes:
Always consider m4a files as audio, even when they contain a video track.
Android (Google) Code Review [Mon, 28 Sep 2009 16:21:30 +0000 (12:21 -0400)]
Merge change 27185 into eclair
* changes:
Add checks for double-dumping on webkit data.
Mathias Agopian [Mon, 28 Sep 2009 05:47:27 +0000 (22:47 -0700)]
don't emit GL commands when sf is in freeze mode
We were emitting GL commands, calling composition complete and releasing clients
without ever calling eglSwapBuffers(), which is completely wrong on non-direct
renders. This could cause transient drawing artifacts when unfreezing the
screen (upon orientaion change for instance) and could also block the clients
for ever as they are waiting for their previous buffer to be rendered.
Android (Google) Code Review [Mon, 28 Sep 2009 03:19:49 +0000 (23:19 -0400)]
Merge change 27387 into eclair
* changes:
fix [
2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Mathias Agopian [Mon, 28 Sep 2009 03:18:16 +0000 (20:18 -0700)]
fix [
2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Also set max swap interval to 1, which is the only supported value currently.
Android (Google) Code Review [Mon, 28 Sep 2009 02:43:05 +0000 (22:43 -0400)]
Merge change 27318 into eclair
* changes:
Check that playlist entries refer to a row in the audio table.
Android (Google) Code Review [Mon, 28 Sep 2009 02:13:43 +0000 (22:13 -0400)]
Merge change 27292 into eclair
* changes:
Add documentation about flash and change video-light to torch.
Android (Google) Code Review [Mon, 28 Sep 2009 01:47:29 +0000 (21:47 -0400)]
Merge change 27375 into eclair
* changes:
Allways dump the list of allocated buffers when an allocation fails.
Mathias Agopian [Mon, 28 Sep 2009 01:44:09 +0000 (18:44 -0700)]
Allways dump the list of allocated buffers when an allocation fails.
Hopefully this will help us understand cases of failures such as [
2148405]
Android (Google) Code Review [Mon, 28 Sep 2009 01:04:09 +0000 (21:04 -0400)]
Merge change 27364 into eclair
* changes:
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
Android (Google) Code Review [Mon, 28 Sep 2009 00:56:57 +0000 (20:56 -0400)]
Merge change 27348 into eclair
* changes:
fix "pacakge" typo in error log message
Android (Google) Code Review [Mon, 28 Sep 2009 00:06:33 +0000 (20:06 -0400)]
Merge change 27351 into eclair
* changes:
Allow wallpaper picker to work.
Doug Zongker [Mon, 28 Sep 2009 00:00:13 +0000 (17:00 -0700)]
fix "pacakge" typo in error log message
Android (Google) Code Review [Sun, 27 Sep 2009 23:38:23 +0000 (19:38 -0400)]
Merge change 27342 into eclair
* changes:
Don't back up / restore "allow apps from unknown sources"
Android (Google) Code Review [Sun, 27 Sep 2009 23:07:29 +0000 (19:07 -0400)]
Merge change 27306 into eclair
* changes:
Modified the test case name for the browser page load test.
Android (Google) Code Review [Sun, 27 Sep 2009 22:58:27 +0000 (18:58 -0400)]
Merge change 27325 into eclair
* changes:
Don't forget to clear "backup in progress" state when finishing a pass
Android (Google) Code Review [Sun, 27 Sep 2009 22:10:28 +0000 (18:10 -0400)]
Merge change 27304 into eclair
* changes:
Fix Cdma re-start of default connection.
Android (Google) Code Review [Sun, 27 Sep 2009 22:04:13 +0000 (18:04 -0400)]
Merge change 27315 into eclair
* changes:
Reset mPreventDrag at touch_down.
Android (Google) Code Review [Sun, 27 Sep 2009 21:04:44 +0000 (17:04 -0400)]
Merge change 27301 into eclair
* changes:
bug
2148061: if PduBody is zero length, treat it as an empty message.
Android (Google) Code Review [Sun, 27 Sep 2009 21:00:20 +0000 (17:00 -0400)]
Merge change 27291 into eclair
* changes:
Fix issue #
2148939: Sholes slow to wake up in landscape mode
Android (Google) Code Review [Sun, 27 Sep 2009 19:43:17 +0000 (15:43 -0400)]
Merge change 27032 into eclair
* changes:
BatteryService: Specify low battery levels in resources.
Android (Google) Code Review [Sun, 27 Sep 2009 19:42:14 +0000 (15:42 -0400)]
Merge change 27142 into eclair
* changes:
Handle expiration of discovery mode in system server.
Android (Google) Code Review [Sun, 27 Sep 2009 19:41:51 +0000 (15:41 -0400)]
Merge change 27129 into eclair
* changes:
Bounds check read and write path in native code.
Android (Google) Code Review [Sun, 27 Sep 2009 19:24:48 +0000 (15:24 -0400)]
Merge change 27154 into eclair
* changes:
When change from narrow screen to wide screen, we will leave the mMinZoomScale to 1.0
Android (Google) Code Review [Sun, 27 Sep 2009 19:19:27 +0000 (15:19 -0400)]
Merge change 27271 into eclair
* changes:
Only scan windows media files when those codecs are enabled.
Android (Google) Code Review [Sun, 27 Sep 2009 18:05:05 +0000 (14:05 -0400)]
Merge change 27267 into eclair
* changes:
Add official assets for tabs in compatibility mode
Android (Google) Code Review [Sun, 27 Sep 2009 17:20:44 +0000 (13:20 -0400)]
Merge change 27177 into eclair
* changes:
Add auto-brightness mode to the list of backed-up settings
Android (Google) Code Review [Sun, 27 Sep 2009 07:31:59 +0000 (03:31 -0400)]
Merge change 27188 into eclair
* changes:
Fix
2146581: Make tabs work for donut apps Use different tab assets with the original coloring scheme for apps that are not Eclair-aware.
Android (Google) Code Review [Sun, 27 Sep 2009 00:00:07 +0000 (20:00 -0400)]
Merge change 27238 into eclair
* changes:
The touch screen is probably a feature.
Android (Google) Code Review [Sat, 26 Sep 2009 21:49:12 +0000 (17:49 -0400)]
Merge change 27234 into eclair
* changes:
Fix http://b/issue?id=
2106682 (Don't show status if we don't have it).
Android (Google) Code Review [Sat, 26 Sep 2009 21:06:47 +0000 (17:06 -0400)]
Merge change 26993 into eclair
* changes:
Pass provider authority to SyncActivityTooManyDeletes
Android (Google) Code Review [Sat, 26 Sep 2009 20:32:18 +0000 (16:32 -0400)]
Merge change 27233 into eclair
* changes:
Change longClick -> click in ContactHeaderWidget.
Android (Google) Code Review [Sat, 26 Sep 2009 18:12:23 +0000 (14:12 -0400)]
Merge change 27159 into eclair
* changes:
DO NOT MERGE: Cleaning up the PipedStreamTest
Dima Zavin [Fri, 25 Sep 2009 23:18:27 +0000 (16:18 -0700)]
egl: temporarily also include eglTerminate->eglInitialize hack for 8k
Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9
Signed-off-by: Dima Zavin <dima@android.com>
Android (Google) Code Review [Sat, 26 Sep 2009 02:57:07 +0000 (22:57 -0400)]
Merge change 27212 into eclair
* changes:
Fix the build.
Jeff Hamilton [Sat, 26 Sep 2009 02:56:25 +0000 (21:56 -0500)]
Fix the build.
Change-Id: Ie4b61f8e8dde864c4d99b8723cd5ff290a373279
Android (Google) Code Review [Sat, 26 Sep 2009 02:55:31 +0000 (22:55 -0400)]
Merge change 27211 into eclair
* changes:
Fix build.
Jack Palevich [Sat, 26 Sep 2009 02:55:07 +0000 (19:55 -0700)]
Fix build.
Android (Google) Code Review [Sat, 26 Sep 2009 02:08:15 +0000 (22:08 -0400)]
Merge change 27203 into eclair
* changes:
Tighten up sample code.
Android (Google) Code Review [Sat, 26 Sep 2009 02:07:59 +0000 (22:07 -0400)]
Merge change 27202 into eclair
* changes:
Check for failure to create EGL surfaces and contexts.
Jack Palevich [Sat, 26 Sep 2009 02:07:31 +0000 (19:07 -0700)]
Tighten up sample code.
- Still fails to work; don't know why.
Scott Main [Sat, 26 Sep 2009 00:58:05 +0000 (17:58 -0700)]
Android (Google) Code Review [Sat, 26 Sep 2009 00:51:31 +0000 (20:51 -0400)]
Merge change 27064 into donut
* changes:
docs only. add information on provisional api level and fix some link titles
Android (Google) Code Review [Sat, 26 Sep 2009 00:51:00 +0000 (20:51 -0400)]
Merge change 27141 into eclair
* changes:
Fix ConnectivityManager's handling of apn switch.
Android (Google) Code Review [Sat, 26 Sep 2009 00:19:59 +0000 (20:19 -0400)]
Merge change 27178 into eclair
* changes:
Fix issue #
2136448: googleapps crashes while adding 2nd gmail account
Android (Google) Code Review [Fri, 25 Sep 2009 23:52:41 +0000 (19:52 -0400)]
Merge change 27171 into eclair
* changes:
Fix remaining object leaks. Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
Android (Google) Code Review [Fri, 25 Sep 2009 23:42:24 +0000 (19:42 -0400)]
Merge change 27073 into eclair
* changes:
Removed the device type checking
Android (Google) Code Review [Fri, 25 Sep 2009 23:41:13 +0000 (19:41 -0400)]
Merge change 27168 into eclair
* changes:
Use EGLUtils to simplify choosing a configuration.
Android (Google) Code Review [Fri, 25 Sep 2009 23:38:40 +0000 (19:38 -0400)]
Merge change 27169 into eclair
* changes:
Improved object lifecycle tracking and fix leaks.
Jack Palevich [Fri, 25 Sep 2009 23:25:19 +0000 (16:25 -0700)]
Use EGLUtils to simplify choosing a configuration.
Doesn't actually select anything, possibly due to device driver errors.
Android (Google) Code Review [Fri, 25 Sep 2009 23:11:43 +0000 (19:11 -0400)]
Merge change 27162 into eclair
* changes:
Fix Activity.overridePendingTransition().
Android (Google) Code Review [Fri, 25 Sep 2009 23:05:10 +0000 (19:05 -0400)]
Merge change 26720 into eclair
* changes:
Allow us to set the contact uri without setting the fast track's uri
Android (Google) Code Review [Fri, 25 Sep 2009 22:44:25 +0000 (18:44 -0400)]
Merge change 27150 into eclair
* changes:
Fix FasttrackBadgeWidget pressed state.
Android (Google) Code Review [Fri, 25 Sep 2009 22:27:25 +0000 (18:27 -0400)]
Merge change 27146 into eclair
* changes:
Reduce debugging spew and add props to selectivly re-enable it.
Scott Main [Fri, 25 Sep 2009 22:26:28 +0000 (15:26 -0700)]
Android (Google) Code Review [Fri, 25 Sep 2009 22:00:08 +0000 (18:00 -0400)]
Merge change 27137 into eclair
* changes:
Improve renderscript context teardown. Track object in the system and then force their cleanup by releasing all user references once destroy context is called. Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
Android (Google) Code Review [Fri, 25 Sep 2009 21:34:35 +0000 (17:34 -0400)]
Merge change 27076 into eclair
* changes:
Optimize rotary selector widget by using bitmaps instead of drawables.
Wu-cheng Li [Wed, 23 Sep 2009 21:37:52 +0000 (14:37 -0700)]
Add camera parameter key constants and documentation.
Android (Google) Code Review [Fri, 25 Sep 2009 21:15:10 +0000 (17:15 -0400)]
Merge change 27106 into eclair
* changes:
Use reflection to figure out a readable string from install error code.
Android (Google) Code Review [Fri, 25 Sep 2009 21:02:05 +0000 (17:02 -0400)]
Merge change 27077 into eclair
* changes:
Two changes toward vCard composer.
Android (Google) Code Review [Fri, 25 Sep 2009 20:58:39 +0000 (16:58 -0400)]
Merge change 27116 into eclair
* changes:
Fix http://b/
2131173 (gaps between Gallery tiles).
Android (Google) Code Review [Fri, 25 Sep 2009 20:39:47 +0000 (16:39 -0400)]
Merge change 27052 into eclair
* changes:
If WebCore doesn't response touch down in time, don't block the UI tap, pan and double tap. Added a time out (which is same as shortpress time out, 200ms) for how long we wait for WebCore's response for touch down.
Android (Google) Code Review [Fri, 25 Sep 2009 18:40:27 +0000 (14:40 -0400)]
Merge change 27078 into eclair
* changes:
Fix generic build boot sequence.
Android (Google) Code Review [Fri, 25 Sep 2009 17:43:16 +0000 (13:43 -0400)]
Merge change 27065 into eclair
* changes:
Remove vertical separator from landscape layout of pattern lock screen.
Android (Google) Code Review [Fri, 25 Sep 2009 16:21:21 +0000 (12:21 -0400)]
Merge change 27046 into eclair
* changes:
Add a method to destroy the RS object.
Scott Main [Fri, 25 Sep 2009 16:15:13 +0000 (09:15 -0700)]
am
c1828d5a: Merge change 3583 into donut
Merge commit '
c1828d5a492a14a9b15e9106684079049317313e' into eclair
* commit '
c1828d5a492a14a9b15e9106684079049317313e':
implement browser history for tabbed search results...