Jeff Hamilton
e4f9791b73
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
Joe Onorato
8397b385ec
Merge "Merge commit 'fce12613' into HEAD"
2011-05-31 15:35:11 -07:00
James Dong
ac5e31087b
Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)"
2011-05-31 14:33:20 -07:00
Chet Haase
dfe375583e
Merge "Fixes for AnimationDrawable"
2011-05-31 14:24:22 -07:00
Joe Onorato
d53f2fa6c5
Merge commit 'fce12613' into HEAD
...
Conflicts:
core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
core/res/res/layout/status_bar_latest_event_content_large_icon.xml
Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11:58 -07:00
Daniel Sandler
39d48eaeb8
Merge "Turn off navbar by default...again."
2011-05-31 13:22:30 -07:00
Daniel Sandler
3093cd234e
Merge "Move navigation bar to right-hand-side of seascape."
2011-05-31 13:17:33 -07:00
Svetoslav Ganov
8c66904cf0
Merge "Updating the API since I forgot after rebase"
2011-05-31 12:53:12 -07:00
Joe Onorato
bc0cd9353e
Merge "Reduce log spew."
2011-05-31 12:44:13 -07:00
Svetoslav Ganov
ec13f01572
Merge "Accessibility serviceconfiguration via meta-data"
2011-05-31 12:05:54 -07:00
Fabrice Di Meglio
89bc8a6e02
Merge "Fix default for getAbsoluteGravity()"
2011-05-31 11:56:59 -07:00
Gilles Debunne
3cd8eebc37
Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"
2011-05-31 10:41:58 -07:00
Marco Nelissen
d39eaa13ed
Merge "Fix crash when nesting Picture recording."
2011-05-31 10:26:17 -07:00
Eric Laurent
7d0872ddbc
Merge "Removed interface to load audio effects libraries"
2011-05-31 10:26:00 -07:00
Tadashi G. Takaoka
3b8ce48065
Merge "Fix input type judgment of WebTextView"
2011-05-31 01:55:32 -07:00
Elliott Hughes
11d8ad4c55
Merge "FileOutputStream guarantees to open O_TRUNC (unless you explicitly ask otherwise)."
2011-05-27 17:15:55 -07:00
Mathias Agopian
b62013f6aa
9-axis sensor fusion with Kalman filter
...
Add support for 9-axis gravity and linear-acceleration sensors
virtual orientation sensor using 9-axis fusion
Change-Id: I6717539373fce781c10e97b6fa59f68a831a592f
2011-05-27 17:04:55 -07:00
Mathias Agopian
bc00846436
Merge "model rotation can now be controlled by the device's sensors"
2011-05-27 17:02:27 -07:00
Mathias Agopian
837f79fed6
Merge "Fix a few issues with sensors reference-counting"
2011-05-27 17:02:02 -07:00
Svetoslav Ganov
1b9a3c88e3
Merge "Refatoring a bit of accessibility code"
2011-05-27 16:40:17 -07:00
Mathias Agopian
b2da2d817b
Merge "sensorservice can now be ran standalone"
2011-05-27 16:37:51 -07:00
Gilles Debunne
da5f284279
Merge "Replacement spans correctly measured in TextView"
2011-05-27 16:12:19 -07:00
Fabrice Di Meglio
069cfe93fa
Merge "Fix overrides of isLayoutRtl(Drawable dr)"
2011-05-27 15:35:12 -07:00
Adam Powell
fbfa33c2c8
Merge "Fix bug 4399686 - missing menu after returning from fullscreen video playback in browser"
2011-05-27 15:32:44 -07:00
Eric Laurent
2ac9c70ade
Merge "New effect library API"
2011-05-27 15:26:25 -07:00
Adam Powell
540e0ff7e2
Merge "Action bar tab layout tweaks."
2011-05-27 13:44:33 -07:00
Romain Guy
f98ae1da4b
Merge "Fix issue with drawColor(color, Mode.Clear)"
2011-05-27 11:44:44 -07:00
Jason Sams
c30d9820d0
Merge "Cleaup of rsComponent to remove GL types."
2011-05-27 11:37:45 -07:00
Fabrice Di Meglio
faef25a912
Merge "Add support for Gravity BEFORE and AFTER"
2011-05-27 11:28:43 -07:00
Martijn Coenen
b6cf4efd9a
Merge "Fix NdefRecord flags handling."
2011-05-27 10:55:13 -07:00
Amith Yamasani
353b78a84a
Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones."
2011-05-27 10:24:59 -07:00
Romain Guy
da0571898d
Merge "Prettify memory dump."
2011-05-27 10:23:09 -07:00
Brian Carlstrom
5c89ff18ab
Merge "Tracking merge of dalvik-dev to master"
2011-05-27 10:12:34 -07:00
Tadashi G. Takaoka
b081aa693c
Merge "Fix InputType determination of WebTextView"
2011-05-27 09:54:02 -07:00
Gilles Debunne
b4306d2ce8
Merge "EditText notifies the IME when a suggestion is picked."
2011-05-27 09:26:53 -07:00
Adam Powell
485295e39d
Merge "Sync holo button bar styles with UX."
2011-05-26 18:56:08 -07:00
Romain Guy
3293e3a5fd
Merge "Remove extraneous log."
2011-05-26 18:49:30 -07:00
Romain Guy
f57cd7090b
Merge "Fix texture coordinates for sub-bitmap rendering."
2011-05-26 18:40:13 -07:00
Matthew Xie
1124e746dc
Merge "Add wide band speech feature flag"
2011-05-26 18:13:08 -07:00
Romain Guy
8bff0cc2e4
Merge "Correctly implement the CLEAR xfermode."
2011-05-26 16:43:26 -07:00
Jason Sams
d9f8e194f8
Merge "Start splitting allocation into hal and core."
2011-05-26 16:37:09 -07:00
Huahui Wu
15c2b60d40
Merge "b/4452171 Dumping video playbacks to files."
2011-05-26 16:31:28 -07:00
Adam Powell
4954369f72
Merge "Fix bug 4487948 - action bar tabs + configuration change = :("
2011-05-26 15:47:21 -07:00
Eric Fischer
f0d623c3cc
Merge "Import revised translations."
2011-05-26 15:37:27 -07:00
James Dong
f6fa21cc97
Merge "Extract embedded cover art (aka poster frame) in mp4 files"
2011-05-26 12:00:51 -07:00
James Dong
128e496b91
am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-26 11:41:30 -07:00
Jeff Brown
b94d45c30a
am a1a56bd0: (-s ours) am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit 'a1a56bd0e3d730edab327495acd5d90b10a6f1e4':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-26 11:41:12 -07:00
Jeff Brown
a7ebdcd69a
am 23e620b3: (-s ours) am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '23e620b32f9c243e124309681b95fe228feb53b8':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-26 11:40:46 -07:00
Jeff Brown
0c8be91d1b
am 3c2fb024: (-s ours) am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '3c2fb0242b0ec21101959dfa08aad3162a523634':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-26 11:40:20 -07:00
Jeff Brown
3dee7f2651
am 13412d31: (-s ours) am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit '13412d31650366f41b1f3d9f429cb0a01dd575ef':
Add a sprite controller. (DO NOT MERGE)
2011-05-26 11:40:14 -07:00
