Kenny Root
a15e3f5a92
Merge "Change assets to use 64-bit API"
2010-12-08 14:46:22 -08:00
Carl Shapiro
44cdb6a3eb
Merge "Add a comment regarding the sizing of the Dalvik heap."
2010-12-08 14:09:32 -08:00
Brad Fitzpatrick
93687e4f93
am 5f8524d4: am 36af7943: Fix malformed Javadoc.
...
* commit '5f8524d446fb217516eebafe5d347005051891d1':
Fix malformed Javadoc.
2010-12-08 13:30:25 -08:00
Brad Fitzpatrick
638ea56494
am 36af7943: Fix malformed Javadoc.
...
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
Fix malformed Javadoc.
2010-12-08 13:23:03 -08:00
Romain Guy
4c9421488b
Merge "Fallback to software rendering when eglMakeCurrent fails. Bug #3200621 "
2010-12-08 11:49:41 -08:00
Svetoslav Ganov
811be91174
Merge "bug 3248277 android.webkit.AccessibilityInjectorTest tests are flaky on trygon"
2010-12-08 11:39:13 -08:00
Dianne Hackborn
7bcef48fca
Merge "Rework activity lifecycle so onSaveInstanceState() is after onPause()."
2010-12-08 11:25:25 -08:00
Kenny Root
18092ddc86
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
2010-12-08 11:21:30 -08:00
Eric Rowe
ff9e8af9eb
Merge "Allow extra flags to be fired in BT stress tests"
2010-12-08 11:11:48 -08:00
Eric Laurent
b5ec7eb39b
Merge "Fix issue 3159946."
2010-12-08 11:05:28 -08:00
Daniel Sandler
fdb423b0a4
Merge "Experimental: Tapping on the status bar sends a space key."
2010-12-08 10:51:03 -08:00
Nick Kralevich
5eee07b132
Merge "Modify emergency number detection"
2010-12-08 10:08:22 -08:00
Teng-Hui Zhu
756af537b2
Merge "Webview listen to Scroll event to update the viewport"
2010-12-08 09:12:10 -08:00
Andreas Huber
180e5d84bf
Merge "Better buffer status management and verification in OMXCodec."
2010-12-08 09:09:25 -08:00
Mathias Agopian
5ec99b57c3
should fix build.
...
Change-Id: I7705227ad123c73714af2ecb7ad84f5432a21c1d
2010-12-07 23:41:55 -08:00
Nick Pelly
4be193fcfe
am 8abce7f5: am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
...
* commit '8abce7f56e4298d3e0035208be48c7afe0e3d2ad':
Implemented getSize() to return max ndef size.
2010-12-07 23:03:52 -08:00
Martijn Coenen
d83973b4d3
am 2f3ed791: am 5289b91c: Implement ndef formatting.
...
* commit '2f3ed7912e852da88efd5ebf9651ba3a89d3c9bd':
Implement ndef formatting.
2010-12-07 23:01:02 -08:00
Wink Saville
950ee6b131
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
2010-12-07 23:00:56 -08:00
Dianne Hackborn
84e194209c
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.
2010-12-07 23:00:49 -08:00
Mathias Agopian
c9a77126ad
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)
2010-12-07 23:00:20 -08:00
Nick Pelly
1f5a356bd1
am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
...
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
2010-12-07 22:57:23 -08:00
Mathias Agopian
222ae987aa
Merge "resolved conflicts for merge of a0f011ff to master"
2010-12-07 22:57:04 -08:00
Nick Pelly
ce561faf57
Merge "Implemented getSize() to return max ndef size." into gingerbread
2010-12-07 22:55:21 -08:00
Mathias Agopian
a1aa18fc26
resolved conflicts for merge of a0f011ff to master
...
Change-Id: I4c17021fc269ce66c98cc345353600eda332f980
2010-12-07 22:53:40 -08:00
Martijn Coenen
8d591a9d1e
am 5289b91c: Implement ndef formatting.
...
* commit '5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
2010-12-07 22:35:01 -08:00
Wink Saville
e7bdce57c2
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
2010-12-07 22:22:01 -08:00
Wink Saville
9d6ca87ee1
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
2010-12-07 22:18:14 -08:00
Dianne Hackborn
759355403e
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.
2010-12-07 22:07:40 -08:00
Dianne Hackborn
84d86eb52b
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
2010-12-07 22:04:38 -08:00
Wink Saville
b56a7b062d
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
2010-12-07 21:57:53 -08:00
Mathias Agopian
e24cc7a38d
[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
2010-12-07 21:16:14 -08:00
Romain Guy
0de74e0268
Merge "Correctly release the OpenGL Canvas on EGL error."
2010-12-07 20:15:29 -08:00
Adam Powell
f56d5df44e
Merge "Add hide/show animations for action bar"
2010-12-07 20:14:38 -08:00
Mike Lockwood
dc9f234519
Merge "MTP: pass format back as default value in GetObjectPropDesc for format property"
2010-12-07 18:57:18 -08:00
Mike Lockwood
e7d4e6db84
Merge "MTP: Support format argument in host GetObjectPropDesc command"
2010-12-07 18:56:58 -08:00
Guang Zhu
2b66f8654d
Merge "re-enable HW acceleration in DRT"
2010-12-07 18:03:03 -08:00
Romain Guy
b9149756fe
Merge "Updated the NumberPicker for exposing it into the SDK"
2010-12-07 18:01:28 -08:00
Carl Shapiro
15406805ba
Merge "Do not attempt to set the minimize heap size in the Zygote."
2010-12-07 18:00:52 -08:00
Jeff Brown
c476fb36cb
Merge "Add support for fallback keycodes."
2010-12-07 17:39:28 -08:00
Jeff Brown
02d85b5021
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
2010-12-07 17:35:26 -08:00
Carl Shapiro
3a77a8b8b3
Merge "Add a property to set the starting size of a VM."
2010-12-07 17:34:07 -08:00
Mathias Agopian
b5a00fcb71
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
2010-12-07 17:24:03 -08:00
Jeff Hamilton
8a84418ef1
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.
2010-12-07 17:23:56 -08:00
Daniel Sandler
16d31d751e
am 688ad19d: (-s ours) am f340d082: Merge "More precise status bar battery icons." into gingerbread
...
* commit '688ad19d95a324a4588023779082e949a1d3f8ec':
More precise status bar battery icons.
2010-12-07 17:23:49 -08:00
Mike Lockwood
38eca47597
Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
2010-12-07 17:21:01 -08:00
Mike Lockwood
0d1dd976cc
Merge "MTP: Improve MtpProperty logging support"
2010-12-07 17:15:02 -08:00
Mike Lockwood
4b79d9dffb
Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
2010-12-07 17:11:07 -08:00
Mike Lockwood
779bc669dc
Merge "MTP: Use correct return type for getSupportedObjectProperties"
2010-12-07 17:10:43 -08:00
Mike Lockwood
1a1d9dfa09
Merge "Revert "MTP: Remove static library build for linux host.""
2010-12-07 17:10:25 -08:00
Mike Lockwood
d2eeca2a44
Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property."
2010-12-07 17:10:02 -08:00