Commit Graph

25163 Commits

Author SHA1 Message Date
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
Romain Guy
3d482cf107 Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #3257222" 2010-12-07 17:06:02 -08:00
Dan Bornstein
47c9507c91 Merge "Fix another set of out-of-date headers." 2010-12-07 16:39:45 -08:00
Wei-Ta Chen
e0383c2e32 Merge "Unhide inPreferQualityOverSpeed in BitmapFactory.Options." 2010-12-07 16:39:13 -08:00
Dan Bornstein
4bb407d47e 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
a5651f24b8 Merge "Fix newlines in this file." 2010-12-07 16:27:31 -08:00
Dan Bornstein
22b03897a8 Fix newlines in this file.
They were CRLF instead of just LF.

Change-Id: I2d06d19b4d8ca969527d93bd996103c161e48a79
2010-12-07 16:23:05 -08:00
Dan Bornstein
3f736c96f9 Merge "These files had an older header." 2010-12-07 16:18:02 -08:00
Mindy Pereira
281f9c5cf0 Merge "Make horizotnalscrollview and scrollview edgeglows match the new algorithm." 2010-12-07 16:10:57 -08:00
Makoto Onuki
e3d70db277 Merge "Add space after property name in error message" 2010-12-07 16:05:22 -08:00
Romain Guy
506a73ccd3 Merge "Fixing the build breakage" 2010-12-07 15:18:02 -08:00
Brad Fitzpatrick
0e9313e252 Merge "Fix doc typo." 2010-12-07 14:54:24 -08:00
Gilles Debunne
d9d7455741 Merge "No NPE in Browser when pasting in WebTextView." 2010-12-07 14:48:38 -08:00
Xia Wang
58bbeb9688 Merge "Add Wi-Fi stress tests." 2010-12-07 14:47:07 -08:00
Mathias Agopian
e4f81090c2 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)
2010-12-07 14:22:56 -08:00