OSDN Git Service
Jesse Wilson [Thu, 9 Dec 2010 02:16:42 +0000 (18:16 -0800)]
Merge "Update API with latest parameter names and getClass() return type."
Jeff Brown [Thu, 9 Dec 2010 02:15:38 +0000 (18:15 -0800)]
Merge "Improve shortcut handling."
Mathias Agopian [Thu, 9 Dec 2010 01:47:04 +0000 (17:47 -0800)]
Merge "[
3211070] camera preview image is rendered offset from the UI overlay frame"
Mathias Agopian [Thu, 9 Dec 2010 01:44:07 +0000 (17:44 -0800)]
fix build.
Change-Id: I49262ac143da297efcaec4eed04052274c73b7f8
Mathias Agopian [Thu, 9 Dec 2010 01:40:28 +0000 (17:40 -0800)]
[
3211070] camera preview image is rendered offset from the UI overlay frame
somehow this change got lost.
Change-Id: I36f6c7ef3f782918042b77e9dc91a4c811d84a40
Mathias Agopian [Thu, 9 Dec 2010 01:24:52 +0000 (17:24 -0800)]
Merge "fix [
3260137] Sometimes front-facing camera mirroring is wrong"
Mathias Agopian [Thu, 9 Dec 2010 01:23:18 +0000 (17:23 -0800)]
fix [
3260137] Sometimes front-facing camera mirroring is wrong
make sure to take the buffer's orientation into account.
Change-Id: I9fef89e66368ad2dec1cb8c7b77ac2b3b4858efb
Mathias Agopian [Thu, 9 Dec 2010 01:20:39 +0000 (17:20 -0800)]
am
054ae782: am
e1752f41: Merge "fix [
3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '
054ae78245fe9b4c14bbc372ae77cd0a977ded73':
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
James Dong [Thu, 9 Dec 2010 01:18:26 +0000 (17:18 -0800)]
Merge "resolved conflicts for merge of
c402def7 to master"
Mathias Agopian [Thu, 9 Dec 2010 01:15:54 +0000 (17:15 -0800)]
Merge changes Id4222c9b,I3c1a9172
* changes:
More clean-up. Get rid off the "blur" effect in SurfaceFlinger
fix [
3259708] Graphic Buffer Mapper does not support YV12
Mike Lockwood [Thu, 9 Dec 2010 01:15:22 +0000 (17:15 -0800)]
Merge "MTP: Improve argument checking in SendObjectInfo"
James Dong [Thu, 9 Dec 2010 01:14:14 +0000 (17:14 -0800)]
resolved conflicts for merge of
c402def7 to master
Change-Id: I328e7c41ad410f07322f6d3a32251e495710c090
Mathias Agopian [Thu, 9 Dec 2010 01:13:19 +0000 (17:13 -0800)]
More clean-up. Get rid off the "blur" effect in SurfaceFlinger
For multiple reason, this effect is not maintainable and was never
used due to its abysmal performance. it'll be resurected when it can be
implemented efficiently.
Change-Id: Id4222c9b86c629275cdec18873ef07be8723b6d2
Mathias Agopian [Thu, 9 Dec 2010 00:56:29 +0000 (16:56 -0800)]
am
a2c3b355: (-s ours) am
74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '
a2c3b355877690d889882da3492950d1b2e0e974':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
Romain Guy [Thu, 9 Dec 2010 00:50:57 +0000 (16:50 -0800)]
Merge "bug_3259956 and bug_2166704"
Mathias Agopian [Thu, 9 Dec 2010 00:40:01 +0000 (16:40 -0800)]
fix [
3259708] Graphic Buffer Mapper does not support YV12
remove a bunch of a code that was there only to support broken gralloc implementations
Change-Id: I3c1a9172224cbcc283601abfbbd695a20815451f
Mathias Agopian [Thu, 9 Dec 2010 00:20:23 +0000 (16:20 -0800)]
am
e1752f41: Merge "fix [
3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '
e1752f41d34249c891564889b07963262b1bd8bf':
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
James Dong [Thu, 9 Dec 2010 00:20:16 +0000 (16:20 -0800)]
am
1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '
1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
Mathias Agopian [Thu, 9 Dec 2010 00:17:02 +0000 (16:17 -0800)]
Merge "fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
Mathias Agopian [Thu, 9 Dec 2010 00:15:08 +0000 (16:15 -0800)]
am
74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '
74da537f80ba36c1279c04fcb85d89fc38c246a6':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
James Dong [Thu, 9 Dec 2010 00:14:27 +0000 (16:14 -0800)]
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 03:38:17 +0000 (19:38 -0800)]
remove support for PUSH_BUFFER surfaces and overlays
the same functionality is now supported through
the h/w composer HAL, and YUV support in the GPU.
Change-Id: I8146605449954b8e8fd7f78810b7d873c2d8f5bf
Joe Onorato [Wed, 8 Dec 2010 23:51:33 +0000 (15:51 -0800)]
Merge "make the wifi button go where it's supposed to."
Joe Onorato [Wed, 8 Dec 2010 23:51:27 +0000 (15:51 -0800)]
Merge "Make the ToggleSlider in the status bar settings panel show the right track when it's disabled."
Joe Onorato [Wed, 8 Dec 2010 23:50:52 +0000 (15:50 -0800)]
Merge "Make setDrawable work after initialization has occurred."
Dianne Hackborn [Wed, 8 Dec 2010 23:49:04 +0000 (15:49 -0800)]
Merge "Fix issues #
3257701 and #
3267312"
Erik Gilling [Thu, 2 Dec 2010 00:38:01 +0000 (16:38 -0800)]
surfaceflinger: add support for gralloc dump hooks
Change-Id: Ib6f539ed0132b70d040d653c03d52cc04249ac3c
Mathias Agopian [Wed, 8 Dec 2010 23:34:02 +0000 (15:34 -0800)]
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
Winson Chung [Wed, 8 Dec 2010 23:14:37 +0000 (15:14 -0800)]
Merge "Modified GridView to report when to small"
Mathias Agopian [Wed, 8 Dec 2010 23:08:33 +0000 (15:08 -0800)]
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
Romain Guy [Wed, 8 Dec 2010 23:08:20 +0000 (15:08 -0800)]
Merge "Re-enable fades in ListView."
Justin Ho [Wed, 8 Dec 2010 22:55:00 +0000 (14:55 -0800)]
Merge "Integrating updated alert sounds, and new audio manifest for trygon"
Andreas Huber [Wed, 8 Dec 2010 22:52:11 +0000 (14:52 -0800)]
Merge "Fix thumbnail extraction for extractors that don't have a preference."
Kenny Root [Wed, 8 Dec 2010 22:46:22 +0000 (14:46 -0800)]
Merge "Change assets to use 64-bit API"
Carl Shapiro [Wed, 8 Dec 2010 22:09:32 +0000 (14:09 -0800)]
Merge "Add a comment regarding the sizing of the Dalvik heap."
Brad Fitzpatrick [Wed, 8 Dec 2010 21:30:25 +0000 (13:30 -0800)]
am
5f8524d4: am
36af7943: Fix malformed Javadoc.
* commit '
5f8524d446fb217516eebafe5d347005051891d1':
Fix malformed Javadoc.
Brad Fitzpatrick [Wed, 8 Dec 2010 21:23:03 +0000 (13:23 -0800)]
am
36af7943: Fix malformed Javadoc.
* commit '
36af79434fb62c26238132eaeda2ec5e732f3c2f':
Fix malformed Javadoc.
Romain Guy [Wed, 8 Dec 2010 19:49:41 +0000 (11:49 -0800)]
Merge "Fallback to software rendering when eglMakeCurrent fails. Bug #
3200621"
Svetoslav Ganov [Wed, 8 Dec 2010 19:39:13 +0000 (11:39 -0800)]
Merge "bug
3248277 android.webkit.AccessibilityInjectorTest tests are flaky on trygon"
Dianne Hackborn [Wed, 8 Dec 2010 19:25:25 +0000 (11:25 -0800)]
Merge "Rework activity lifecycle so onSaveInstanceState() is after onPause()."
Kenny Root [Wed, 24 Nov 2010 20:56:06 +0000 (12:56 -0800)]
Change assets to use 64-bit API
The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.
There is a new utils/Compat.h added for Mac OS compatibility.
Also fixed some size-related compiler warnings.
Bug:
3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
Eric Rowe [Wed, 8 Dec 2010 19:11:48 +0000 (11:11 -0800)]
Merge "Allow extra flags to be fired in BT stress tests"
Eric Laurent [Wed, 8 Dec 2010 19:05:28 +0000 (11:05 -0800)]
Merge "Fix issue
3159946."
Daniel Sandler [Wed, 8 Dec 2010 18:51:03 +0000 (10:51 -0800)]
Merge "Experimental: Tapping on the status bar sends a space key."
Nick Kralevich [Wed, 8 Dec 2010 18:08:22 +0000 (10:08 -0800)]
Merge "Modify emergency number detection"
Teng-Hui Zhu [Wed, 8 Dec 2010 17:12:10 +0000 (09:12 -0800)]
Merge "Webview listen to Scroll event to update the viewport"
Andreas Huber [Wed, 8 Dec 2010 17:09:25 +0000 (09:09 -0800)]
Merge "Better buffer status management and verification in OMXCodec."
Mathias Agopian [Wed, 8 Dec 2010 07:41:55 +0000 (23:41 -0800)]
should fix build.
Change-Id: I7705227ad123c73714af2ecb7ad84f5432a21c1d
Nick Pelly [Wed, 8 Dec 2010 07:03:52 +0000 (23:03 -0800)]
am
8abce7f5: am
40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
* commit '
8abce7f56e4298d3e0035208be48c7afe0e3d2ad':
Implemented getSize() to return max ndef size.
Martijn Coenen [Wed, 8 Dec 2010 07:01:02 +0000 (23:01 -0800)]
am
2f3ed791: am
5289b91c: Implement ndef formatting.
* commit '
2f3ed7912e852da88efd5ebf9651ba3a89d3c9bd':
Implement ndef formatting.
Wink Saville [Wed, 8 Dec 2010 07:00:56 +0000 (23:00 -0800)]
am
d9c7fde9: am
a00d89e8: am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
d9c7fde961dbb78f980be08b9be77b929630c897':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Dianne Hackborn [Wed, 8 Dec 2010 07:00:49 +0000 (23:00 -0800)]
am
c4b7088f: am
42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
* commit '
c4b7088f19f8111ea5f34fba41da4a93899708cd':
Add more checks for bad values to protect from corrupt files.
Mathias Agopian [Wed, 8 Dec 2010 07:00:20 +0000 (23:00 -0800)]
am
4e345ab7: (-s ours) am
a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit '
4e345ab7df737592528e99db73612c6b37e34545':
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Nick Pelly [Wed, 8 Dec 2010 06:57:23 +0000 (22:57 -0800)]
am
40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
* commit '
40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
Mathias Agopian [Wed, 8 Dec 2010 06:57:04 +0000 (22:57 -0800)]
Merge "resolved conflicts for merge of
a0f011ff to master"
Nick Pelly [Wed, 8 Dec 2010 06:55:21 +0000 (22:55 -0800)]
Merge "Implemented getSize() to return max ndef size." into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 06:53:40 +0000 (22:53 -0800)]
resolved conflicts for merge of
a0f011ff to master
Change-Id: I4c17021fc269ce66c98cc345353600eda332f980
Martijn Coenen [Wed, 8 Dec 2010 06:35:01 +0000 (22:35 -0800)]
am
5289b91c: Implement ndef formatting.
* commit '
5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
Wink Saville [Wed, 8 Dec 2010 06:22:01 +0000 (22:22 -0800)]
am
a00d89e8: am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Wink Saville [Wed, 8 Dec 2010 06:18:14 +0000 (22:18 -0800)]
am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Dianne Hackborn [Wed, 8 Dec 2010 06:07:40 +0000 (22:07 -0800)]
am
42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
* commit '
42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
Add more checks for bad values to protect from corrupt files.
Dianne Hackborn [Wed, 8 Dec 2010 06:04:38 +0000 (22:04 -0800)]
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
Wink Saville [Wed, 8 Dec 2010 05:57:53 +0000 (21:57 -0800)]
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
Mathias Agopian [Wed, 8 Dec 2010 05:00:25 +0000 (21:00 -0800)]
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
Romain Guy [Wed, 8 Dec 2010 04:15:29 +0000 (20:15 -0800)]
Merge "Correctly release the OpenGL Canvas on EGL error."
Adam Powell [Wed, 8 Dec 2010 04:14:38 +0000 (20:14 -0800)]
Merge "Add hide/show animations for action bar"
Mike Lockwood [Wed, 8 Dec 2010 02:57:18 +0000 (18:57 -0800)]
Merge "MTP: pass format back as default value in GetObjectPropDesc for format property"
Mike Lockwood [Wed, 8 Dec 2010 02:56:58 +0000 (18:56 -0800)]
Merge "MTP: Support format argument in host GetObjectPropDesc command"
Guang Zhu [Wed, 8 Dec 2010 02:03:03 +0000 (18:03 -0800)]
Merge "re-enable HW acceleration in DRT"
Romain Guy [Wed, 8 Dec 2010 02:01:28 +0000 (18:01 -0800)]
Merge "Updated the NumberPicker for exposing it into the SDK"
Carl Shapiro [Wed, 8 Dec 2010 02:00:52 +0000 (18:00 -0800)]
Merge "Do not attempt to set the minimize heap size in the Zygote."
Jeff Brown [Wed, 8 Dec 2010 01:39:28 +0000 (17:39 -0800)]
Merge "Add support for fallback keycodes."
Jeff Brown [Tue, 7 Dec 2010 01:13:33 +0000 (17:13 -0800)]
Add support for fallback keycodes.
This change enables the framework to synthesize key events to implement
default behavior when an application does not handle a key.
For example, this change enables numeric keypad keys to perform
their associated special function when numlock is off.
The application is informed that it is processing a fallback keypress
so it can choose to ignore it.
Added a new keycode for switching applications.
Added ALT key deadkeys.
New default key mappings:
- ESC -> BACK
- Meta+ESC -> HOME
- Alt+ESC -> MENU
- Meta+Space -> SEARCH
- Meta+Tab -> APP_SWITCH
Fixed some comments.
Fixed some tests.
Change-Id: Id7f3b6645f3a350275e624547822f72652f3defe
Carl Shapiro [Wed, 8 Dec 2010 01:34:07 +0000 (17:34 -0800)]
Merge "Add a property to set the starting size of a VM."
Mathias Agopian [Wed, 8 Dec 2010 01:24:03 +0000 (17:24 -0800)]
am
48f42f8c: am
4153bf3a: Merge "[
3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
* commit '
48f42f8c3fbd33b2f46c6290ff5963dd58938cf9':
[
3171580] don't automatically log GraphicBuffer allocation failures
Jeff Hamilton [Wed, 8 Dec 2010 01:23:56 +0000 (17:23 -0800)]
am
03dc51b1: am
0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread
* commit '
03dc51b1a07c7d79f1d12751b19ebda044857333':
Remove Type X Tags from the top-level API.
Daniel Sandler [Wed, 8 Dec 2010 01:23:49 +0000 (17:23 -0800)]
am
688ad19d: (-s ours) am
f340d082: Merge "More precise status bar battery icons." into gingerbread
* commit '
688ad19d95a324a4588023779082e949a1d3f8ec':
More precise status bar battery icons.
Mike Lockwood [Wed, 8 Dec 2010 01:21:01 +0000 (17:21 -0800)]
Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
Mike Lockwood [Wed, 8 Dec 2010 01:15:02 +0000 (17:15 -0800)]
Merge "MTP: Improve MtpProperty logging support"
Mike Lockwood [Wed, 8 Dec 2010 01:11:07 +0000 (17:11 -0800)]
Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
Mike Lockwood [Wed, 8 Dec 2010 01:10:43 +0000 (17:10 -0800)]
Merge "MTP: Use correct return type for getSupportedObjectProperties"
Mike Lockwood [Wed, 8 Dec 2010 01:10:25 +0000 (17:10 -0800)]
Merge "Revert "MTP: Remove static library build for linux host.""
Mike Lockwood [Wed, 8 Dec 2010 01:10:02 +0000 (17:10 -0800)]
Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property."
Romain Guy [Wed, 8 Dec 2010 01:06:02 +0000 (17:06 -0800)]
Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #
3257222"
Dan Bornstein [Wed, 8 Dec 2010 00:39:45 +0000 (16:39 -0800)]
Merge "Fix another set of out-of-date headers."
Wei-Ta Chen [Wed, 8 Dec 2010 00:39:13 +0000 (16:39 -0800)]
Merge "Unhide inPreferQualityOverSpeed in BitmapFactory.Options."
Dan Bornstein [Wed, 8 Dec 2010 00:27:55 +0000 (16:27 -0800)]
Fix another set of out-of-date headers.
This time in XML files.
Change-Id: Iebe36810c3a2d7a6ff354f43808b1b8649b85637
Dan Bornstein [Wed, 8 Dec 2010 00:27:31 +0000 (16:27 -0800)]
Merge "Fix newlines in this file."
Dan Bornstein [Wed, 8 Dec 2010 00:23:05 +0000 (16:23 -0800)]
Fix newlines in this file.
They were CRLF instead of just LF.
Change-Id: I2d06d19b4d8ca969527d93bd996103c161e48a79
Dan Bornstein [Wed, 8 Dec 2010 00:18:02 +0000 (16:18 -0800)]
Merge "These files had an older header."
Mindy Pereira [Wed, 8 Dec 2010 00:10:57 +0000 (16:10 -0800)]
Merge "Make horizotnalscrollview and scrollview edgeglows match the new algorithm."
Makoto Onuki [Wed, 8 Dec 2010 00:05:22 +0000 (16:05 -0800)]
Merge "Add space after property name in error message"
Romain Guy [Tue, 7 Dec 2010 23:18:02 +0000 (15:18 -0800)]
Merge "Fixing the build breakage"
Brad Fitzpatrick [Tue, 7 Dec 2010 22:54:24 +0000 (14:54 -0800)]
Merge "Fix doc typo."
Gilles Debunne [Tue, 7 Dec 2010 22:48:38 +0000 (14:48 -0800)]
Merge "No NPE in Browser when pasting in WebTextView."
Xia Wang [Tue, 7 Dec 2010 22:47:07 +0000 (14:47 -0800)]
Merge "Add Wi-Fi stress tests."
Mathias Agopian [Tue, 7 Dec 2010 22:22:56 +0000 (14:22 -0800)]
am
a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit '
a2977c383d363e1e88a5b36230b1fa4c312807d2':
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:20:14 +0000 (14:20 -0800)]
am
05813b0e: Merge changes I244b5469,I32044e91 into gingerbread
* commit '
05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:20:09 +0000 (14:20 -0800)]
am
4153bf3a: Merge "[
3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
* commit '
4153bf3a259624a2f2dc497b77b225a1fb517abc':
[
3171580] don't automatically log GraphicBuffer allocation failures
Mathias Agopian [Tue, 7 Dec 2010 22:18:56 +0000 (14:18 -0800)]
Merge changes Ie03796ae,Ide3e980a into gingerbread
* changes:
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)