37630 Commits

Author SHA1 Message Date
Mathias Agopian
3de0f1a05f 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
8abce7f56e 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
f9e2ca326f Merge "resolved conflicts for merge of a0f011ff to master" 2010-12-07 22:57:04 -08:00
Nick Pelly
40ddd4a649 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
6d9fc7e1ef Implemented getSize() to return max ndef size.
Change-Id: Ia584e8cfa51a4eaef5f03dc436c78a67296c2cae
2010-12-07 22:54:07 -08:00
Mathias Agopian
669084dbe6 resolved conflicts for merge of a0f011ff to master
Change-Id: I4c17021fc269ce66c98cc345353600eda332f980
2010-12-07 22:53:40 -08:00
Martijn Coenen
2f3ed7912e am 5289b91c: Implement ndef formatting.
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
2010-12-07 22:35:01 -08:00
Martijn Coenen
5289b91c88 Implement ndef formatting.
Change-Id: I6e3e3abdc304bc14d7c93a413e42bf957963e288
2010-12-07 22:30:39 -08:00
Wink Saville
d9c7fde961 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
a00d89e824 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
c4b7088f19 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
42a23783aa Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 2010-12-07 22:04:38 -08:00
Dianne Hackborn
7b9c56fe0f Add more checks for bad values to protect from corrupt files.
Change-Id: I4174c358c49b93e74920b00fcfd6c68659bf7d08
2010-12-07 22:02:59 -08:00
Wink Saville
2b858caecb Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00
Carl Shapiro
ca7e1ed81c Remove stale code and unneeded '\n' chars from findClass.
Change-Id: I496d56105a0889eb0a8c492985f8a324a200edc6
2010-12-07 21:03:56 -08:00
Romain Guy
dde4c35385 Merge "Correctly release the OpenGL Canvas on EGL error." 2010-12-07 20:15:29 -08:00
Adam Powell
d00e116293 Merge "Add hide/show animations for action bar" 2010-12-07 20:14:38 -08:00
Romain Guy
67f27952c1 Correctly release the OpenGL Canvas on EGL error.
Change-Id: Ib31fd8445f7ce5f7aa7e0205de0e7db80d024fc2
2010-12-07 20:12:50 -08:00
Adam Powell
e6ec7329b9 Add hide/show animations for action bar
Change-Id: I204cc744573fe040b4d37791a8eef1a65c88ee88
2010-12-07 20:10:34 -08:00
Mike Lockwood
7f889328b7 Merge "MTP: pass format back as default value in GetObjectPropDesc for format property" 2010-12-07 18:57:18 -08:00
Mike Lockwood
a9e67c11c0 Merge "MTP: Support format argument in host GetObjectPropDesc command" 2010-12-07 18:56:58 -08:00
Mike Lockwood
9b5e9c407d MTP: pass format back as default value in GetObjectPropDesc for format property
Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 18:53:50 -08:00
Mike Lockwood
a194cc7d8b MTP: Support format argument in host GetObjectPropDesc command
Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 18:53:04 -08:00
Guang Zhu
994e2cd01c Merge "re-enable HW acceleration in DRT" 2010-12-07 18:03:03 -08:00
Romain Guy
ee5c6c219a Merge "Updated the NumberPicker for exposing it into the SDK" 2010-12-07 18:01:28 -08:00
Carl Shapiro
c8afaa04a0 Merge "Do not attempt to set the minimize heap size in the Zygote." 2010-12-07 18:00:52 -08:00
Guang Zhu
e81d1f9012 re-enable HW acceleration in DRT
Change-Id: I281f7fd94624611797fceb162d6a5e12b6b08d20
2010-12-07 18:00:18 -08:00
Svetoslav Ganov
4bfd794475 Updated the NumberPicker for exposing it into the SDK
Change-Id: I3bd48d0210da8a202b6ff60deecb5d7776f1b73b
2010-12-07 17:59:31 -08:00
Carl Shapiro
b7929d654e Do not attempt to set the minimize heap size in the Zygote.
This parameter is now specified by the product configuration files.

Change-Id: Ia04e4393b778580c206e3122078c999ac8b326a8
2010-12-07 17:56:28 -08:00
Jeff Brown
77019fa4f9 Merge "Add support for fallback keycodes." 2010-12-07 17:39:28 -08:00
Jeff Brown
49ed71db42 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
4ffae87678 Merge "Add a property to set the starting size of a VM." 2010-12-07 17:34:07 -08:00
Mathias Agopian
f30c828752 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
2460a5fa23 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
47fc765540 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
b3f522f34b Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()" 2010-12-07 17:21:01 -08:00
Mike Lockwood
bf1dbd1938 MTP: Read property code before calling isDeviceProperty in MtpProperty::read()
Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:16:20 -08:00
Mike Lockwood
c7f2f0ab01 Merge "MTP: Improve MtpProperty logging support" 2010-12-07 17:15:02 -08:00
Mike Lockwood
e4880e421f MTP: Improve MtpProperty logging support
Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:13:12 -08:00
Mike Lockwood
9cf29560e8 Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc" 2010-12-07 17:11:07 -08:00
Mike Lockwood
612ca8781f Merge "MTP: Use correct return type for getSupportedObjectProperties" 2010-12-07 17:10:43 -08:00
Mike Lockwood
ea4af54093 Merge "Revert "MTP: Remove static library build for linux host."" 2010-12-07 17:10:25 -08:00
Mike Lockwood
ecce2f6d82 Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property." 2010-12-07 17:10:02 -08:00
Romain Guy
6e52b45656 Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #3257222" 2010-12-07 17:06:02 -08:00
Romain Guy
dbf78bdb7a Fix possible NPE in ViewRoot with GL rendering enabled.
Bug #3257222

Change-Id: Ic11cbe5f06311627eb7eac4dfa8864b43651d904
2010-12-07 17:04:03 -08:00
Carl Shapiro
38cfa8ca8b Add a property to set the starting size of a VM.
Change-Id: I3c981417baadfef64990fd90b4a275ed706a0b5b
2010-12-07 16:48:29 -08:00
Dan Bornstein
a2584aa9a3 Merge "Fix another set of out-of-date headers." 2010-12-07 16:39:45 -08:00
Wei-Ta Chen
1fbe4abaf9 Merge "Unhide inPreferQualityOverSpeed in BitmapFactory.Options." 2010-12-07 16:39:13 -08:00
Dan Bornstein
7715d21797 Fix another set of out-of-date headers.
This time in XML files.

Change-Id: Iebe36810c3a2d7a6ff354f43808b1b8649b85637
2010-12-07 16:27:55 -08:00
Dan Bornstein
8028a951c3 Merge "Fix newlines in this file." 2010-12-07 16:27:31 -08:00