OSDN Git Service
Eric Laurent [Tue, 26 Oct 2010 15:17:07 +0000 (08:17 -0700)]
am
ecae8a43: am
1a58d9c3: Merge "Partial fix for issue
3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:14:48 +0000 (08:14 -0700)]
am
1a58d9c3: Merge "Partial fix for issue
3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue
3124895." into gingerbread
Ben Murdoch [Tue, 26 Oct 2010 14:44:34 +0000 (07:44 -0700)]
Merge "Update WebView useragent string for merge to WebKit r70209"
Jeff Hamilton [Tue, 26 Oct 2010 14:28:57 +0000 (07:28 -0700)]
am
6a49bff5: am
79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Joe Onorato [Tue, 26 Oct 2010 14:28:51 +0000 (07:28 -0700)]
am
a1e74744: am
11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:24:57 +0000 (07:24 -0700)]
am
79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Joe Onorato [Tue, 26 Oct 2010 14:24:41 +0000 (07:24 -0700)]
am
11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread
Chet Haase [Tue, 26 Oct 2010 13:59:19 +0000 (06:59 -0700)]
Merge "DisplayList optimizations and fixes."
Jaikumar Ganesh [Tue, 26 Oct 2010 07:32:06 +0000 (00:32 -0700)]
Merge "Add logs to debug incoming A2DP connection issue."
Jaikumar Ganesh [Tue, 26 Oct 2010 07:18:31 +0000 (00:18 -0700)]
Merge "Clean up some logging to make it more useful to debug."
Jim Miller [Tue, 26 Oct 2010 03:33:48 +0000 (20:33 -0700)]
Merge "Fix
3117937: Add simplified "recent apps"."
Jaikumar Ganesh [Tue, 26 Oct 2010 02:41:57 +0000 (19:41 -0700)]
Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent."
Jack Palevich [Tue, 26 Oct 2010 02:39:20 +0000 (19:39 -0700)]
Merge "Do not exit the GLSurfaceView thread when detached from a window."
Gil Dobjanschi [Tue, 26 Oct 2010 02:13:32 +0000 (19:13 -0700)]
Merge "Transition bug fix"
Jeff Brown [Tue, 26 Oct 2010 01:51:57 +0000 (18:51 -0700)]
Merge "Tweak log messages a bit."
Joe Onorato [Tue, 26 Oct 2010 01:48:08 +0000 (18:48 -0700)]
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread
Romain Guy [Tue, 26 Oct 2010 01:46:04 +0000 (18:46 -0700)]
Merge "Small cleanup."
Romain Guy [Tue, 26 Oct 2010 01:36:13 +0000 (18:36 -0700)]
Merge "Don't change texture unit when not needed."
Romain Guy [Tue, 26 Oct 2010 01:06:45 +0000 (18:06 -0700)]
Merge "Don't change textures wrap modes on every draw."
James Dong [Tue, 26 Oct 2010 01:02:44 +0000 (18:02 -0700)]
Merge "Remove OMX.PV.* components from OMXCodec.cpp"
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:59:49 +0000 (17:59 -0700)]
am
55744530: Merge "resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '
55744530222288c79a5e1aa61b65f7f6b2262fab'
* commit '
55744530222288c79a5e1aa61b65f7f6b2262fab':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked
Scott Main [Tue, 26 Oct 2010 00:56:40 +0000 (17:56 -0700)]
Merge "resolved conflicts for merge of
f0b3fa60 to master"
James Dong [Tue, 26 Oct 2010 00:56:14 +0000 (17:56 -0700)]
Merge "Don't change the video recording frame rate if it is not requested."
Scott Main [Tue, 26 Oct 2010 00:54:33 +0000 (17:54 -0700)]
resolved conflicts for merge of
f0b3fa60 to master
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
Adam Powell [Tue, 26 Oct 2010 00:44:35 +0000 (17:44 -0700)]
Merge "Holo: vertical dividers, group button states, default window backgrounds."
Jeff Brown [Tue, 26 Oct 2010 00:37:46 +0000 (17:37 -0700)]
Tweak log messages a bit.
Change-Id: Ifadf78c1ab8db49106216c70086f98860795c65f
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:28:29 +0000 (17:28 -0700)]
Merge "resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:27:16 +0000 (17:27 -0700)]
resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Justin Ho [Tue, 26 Oct 2010 00:25:02 +0000 (17:25 -0700)]
am
41d21efd: (-s ours) am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
41d21efd61157c9a4c49b2f7a6580ae0cbb58397'
* commit '
41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
DO NOT MERGE - Updated ringtone assets for crespo
Scott Main [Tue, 26 Oct 2010 00:23:10 +0000 (17:23 -0700)]
am
3d40cd50: am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp
* commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
update featured videos
Scott Main [Tue, 26 Oct 2010 00:15:50 +0000 (17:15 -0700)]
am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread
* commit '
c9ac1079696b93a294f504c6561397ef731a46f9':
update featured videos
Jaikumar Ganesh [Tue, 26 Oct 2010 00:09:16 +0000 (17:09 -0700)]
Merge "Fix docs builds."
Gloria Wang [Mon, 25 Oct 2010 23:56:49 +0000 (16:56 -0700)]
resolved conflicts for merge of
965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
Justin Ho [Mon, 25 Oct 2010 23:50:34 +0000 (16:50 -0700)]
am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '
044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Jaikumar Ganesh [Mon, 25 Oct 2010 23:43:41 +0000 (16:43 -0700)]
Merge "Expose Vendor Specific Headset Event Intent."
Gloria Wang [Mon, 25 Oct 2010 23:39:11 +0000 (16:39 -0700)]
Merge "resolved conflicts for merge of
9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jaikumar Ganesh [Mon, 25 Oct 2010 23:38:48 +0000 (16:38 -0700)]
Merge "Make setting the adapter properties asynchronous."
Joe Malin [Mon, 25 Oct 2010 23:27:15 +0000 (16:27 -0700)]
am
96bdc500: am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
96bdc500104c3e162495a9bfcf90799467e45c3d'
* commit '
96bdc500104c3e162495a9bfcf90799467e45c3d':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:26:58 +0000 (16:26 -0700)]
am
b2ddeee2: (-s ours) am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'
* commit '
b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b':
Import revised translations. DO NOT MERGE
Joe Malin [Mon, 25 Oct 2010 23:22:46 +0000 (16:22 -0700)]
am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:19:42 +0000 (16:19 -0700)]
am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE
Joe Malin [Mon, 25 Oct 2010 23:19:18 +0000 (16:19 -0700)]
Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Eric Fischer [Mon, 25 Oct 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Gloria Wang [Mon, 25 Oct 2010 22:23:04 +0000 (15:23 -0700)]
resolved conflicts for merge of
9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
Romain Guy [Mon, 25 Oct 2010 22:36:18 +0000 (15:36 -0700)]
Merge "Don't initialize the hw renderer without a valid surface. Bug #
3054952"
Jean-Baptiste Queru [Mon, 25 Oct 2010 22:32:12 +0000 (15:32 -0700)]
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
Jeff Hamilton [Mon, 25 Oct 2010 21:56:34 +0000 (14:56 -0700)]
am
fecc5f06: am
106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '
fecc5f066d7aa84ce3474912f1137a10bd77bb8e'
* commit '
fecc5f066d7aa84ce3474912f1137a10bd77bb8e':
Add a RHS status bar slot for NFC.
Jeff Hamilton [Mon, 25 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am
106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '
106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp
* commit '
106165b5102be226eb8049d2f7f62d7e26034e8a':
Add a RHS status bar slot for NFC.
Jeff Hamilton [Mon, 25 Oct 2010 21:46:45 +0000 (14:46 -0700)]
Merge "Add a RHS status bar slot for NFC." into gingerbread
Adam Cohen [Mon, 25 Oct 2010 21:11:00 +0000 (14:11 -0700)]
Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1"
Mike Lockwood [Mon, 25 Oct 2010 21:00:38 +0000 (14:00 -0700)]
am
6c8d8d89: am
8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread
Merge commit '
6c8d8d8927373fdb9ad1c853396b5dbc8295f996'
* commit '
6c8d8d8927373fdb9ad1c853396b5dbc8295f996':
GPS: Disable verbose logging
Mike Lockwood [Mon, 25 Oct 2010 20:55:27 +0000 (13:55 -0700)]
am
8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread
Merge commit '
8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp
* commit '
8c32bddfac259543f4ed87341fce42bc5ed60506':
GPS: Disable verbose logging
Mathias Agopian [Mon, 25 Oct 2010 20:53:33 +0000 (13:53 -0700)]
am
e1ca532d: am
457bed2b: Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Merge commit '
e1ca532d72cbfacdce794f8bb4d439e609ec9871'
* commit '
e1ca532d72cbfacdce794f8bb4d439e609ec9871':
fix [
3123221] Video sticks playing back upside down following orientation switch
Mathias Agopian [Mon, 25 Oct 2010 20:53:26 +0000 (13:53 -0700)]
am
b4645353: am
ce4d36ad: Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit '
b4645353090f1bdd5cc1d4ab98feac7ccf966368'
* commit '
b4645353090f1bdd5cc1d4ab98feac7ccf966368':
fix [
3118445] Transform * Transform does not work as expected
Daniel Sandler [Mon, 25 Oct 2010 20:52:42 +0000 (13:52 -0700)]
Merge "Swipe up to open the settings panel. Tap anywhere to close."
Mike Lockwood [Mon, 25 Oct 2010 20:49:13 +0000 (13:49 -0700)]
Merge "GPS: Disable verbose logging" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:38:15 +0000 (13:38 -0700)]
am
457bed2b: Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Merge commit '
457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp
* commit '
457bed2bc6561dd67429dde238453fee8602fa9b':
fix [
3123221] Video sticks playing back upside down following orientation switch
Mathias Agopian [Mon, 25 Oct 2010 20:38:11 +0000 (13:38 -0700)]
am
ce4d36ad: Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit '
ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp
* commit '
ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
fix [
3118445] Transform * Transform does not work as expected
Mathias Agopian [Mon, 25 Oct 2010 20:31:11 +0000 (13:31 -0700)]
Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:31:03 +0000 (13:31 -0700)]
Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Andreas Huber [Mon, 25 Oct 2010 20:13:04 +0000 (13:13 -0700)]
Merge "We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets."
Gloria Wang [Mon, 25 Oct 2010 19:23:35 +0000 (12:23 -0700)]
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback"
Adam Powell [Mon, 25 Oct 2010 19:13:56 +0000 (12:13 -0700)]
am
67bb6741: (-s ours) am
17efcde1: Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '
67bb6741965c0b9f3bf6b4caf2647efc564e287e'
* commit '
67bb6741965c0b9f3bf6b4caf2647efc564e287e':
DO NOT MERGE Fix bug
3124899 - timeout in CTS test
Marco Nelissen [Mon, 25 Oct 2010 19:10:01 +0000 (12:10 -0700)]
Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. b/
2764237"
Vasu Nori [Mon, 25 Oct 2010 19:08:46 +0000 (12:08 -0700)]
Merge "increase sql statement printed in finalier warnings from 100 to 1000"
Vasu Nori [Mon, 25 Oct 2010 19:07:57 +0000 (12:07 -0700)]
Merge "when printing cache-full warning, print the sql statements in cache"
Adam Powell [Mon, 25 Oct 2010 19:07:51 +0000 (12:07 -0700)]
am
17efcde1: Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '
17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp
* commit '
17efcde161cbcbc0d98bf809036c5e640497f001':
DO NOT MERGE Fix bug
3124899 - timeout in CTS test
Daniel Sandler [Mon, 25 Oct 2010 19:00:40 +0000 (12:00 -0700)]
Merge "Fix drags from the shirt pocket"
Adam Powell [Mon, 25 Oct 2010 18:43:03 +0000 (11:43 -0700)]
Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Scott Main [Mon, 25 Oct 2010 18:37:08 +0000 (11:37 -0700)]
resolved conflicts for merge of
177b05d6 to master
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
Scott Main [Mon, 25 Oct 2010 18:27:55 +0000 (11:27 -0700)]
am
abb50f15: Merge "docs: fix a couple api links" into gingerbread
Merge commit '
abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp
* commit '
abb50f152879cc8dff1bf5cbc4d6375e959305cd':
docs: fix a couple api links
Scott Main [Mon, 25 Oct 2010 18:18:28 +0000 (11:18 -0700)]
Merge "docs: fix a couple api links" into gingerbread
Adam Powell [Mon, 25 Oct 2010 17:28:53 +0000 (10:28 -0700)]
Merge "Fix ratingBarStyleSmall style in Holo theme."
Nick Pelly [Mon, 25 Oct 2010 16:24:41 +0000 (09:24 -0700)]
am
4c8fda62: am
79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '
4c8fda62e1bf21318d22f4b85aaa1c729da976cf'
* commit '
4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
Fixed NdefTag parcelable conversion methods.
Wu-cheng Li [Mon, 25 Oct 2010 16:24:33 +0000 (09:24 -0700)]
am
b877a54a: (-s ours) am
89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '
b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'
* commit '
b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Nick Pelly [Mon, 25 Oct 2010 16:09:37 +0000 (09:09 -0700)]
am
79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '
79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp
* commit '
79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
Fixed NdefTag parcelable conversion methods.
Wu-cheng Li [Mon, 25 Oct 2010 16:09:26 +0000 (09:09 -0700)]
am
89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '
89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp
* commit '
89821204379816f6bee6902c4f132c014700c3b0':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Nick Pelly [Mon, 25 Oct 2010 15:58:00 +0000 (08:58 -0700)]
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Wu-cheng Li [Mon, 25 Oct 2010 15:55:54 +0000 (08:55 -0700)]
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Leon Scroggins [Mon, 25 Oct 2010 13:25:24 +0000 (06:25 -0700)]
Merge "Provide strings for text selection options in WebView."
Steve Block [Mon, 25 Oct 2010 11:44:41 +0000 (04:44 -0700)]
Merge "Add a JNI method to determine which HTTP stack is in use"
Nick Pelly [Mon, 25 Oct 2010 05:16:39 +0000 (22:16 -0700)]
am
d6abaf32: am
145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '
d6abaf326ba4e0ff342cf28a828b75a334beba69'
* commit '
d6abaf326ba4e0ff342cf28a828b75a334beba69':
Document getPollBytes() and getActivationBytes().
Nick Pelly [Mon, 25 Oct 2010 05:11:52 +0000 (22:11 -0700)]
am
145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '
145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp
* commit '
145550a00ea59ff20133acc95315e463628e16db':
Document getPollBytes() and getActivationBytes().
Nick Pelly [Mon, 25 Oct 2010 05:06:15 +0000 (22:06 -0700)]
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Adam Powell [Mon, 25 Oct 2010 02:31:23 +0000 (19:31 -0700)]
Merge "Fix bug
2964954 - Lists blow up if their adapter changes while detached."
Mathias Agopian [Mon, 25 Oct 2010 02:03:58 +0000 (19:03 -0700)]
fix [
3123221] Video sticks playing back upside down following orientation switch
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.
Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
Dianne Hackborn [Mon, 25 Oct 2010 01:42:12 +0000 (18:42 -0700)]
am
c2f78020: am
23656899: Merge "Fix issue #
3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '
c2f78020d3887539fc90230d96465e4b1dc84d8e'
* commit '
c2f78020d3887539fc90230d96465e4b1dc84d8e':
Fix issue #
3126018: No way to specify NativeActivity's native method
Dianne Hackborn [Mon, 25 Oct 2010 01:38:11 +0000 (18:38 -0700)]
am
23656899: Merge "Fix issue #
3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '
236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp
* commit '
236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #
3126018: No way to specify NativeActivity's native method
Dianne Hackborn [Mon, 25 Oct 2010 01:33:36 +0000 (18:33 -0700)]
Merge "Fix issue #
3126018: No way to specify NativeActivity's native method" into gingerbread
Adam Powell [Sun, 24 Oct 2010 23:57:21 +0000 (16:57 -0700)]
Merge "Fix bug
3005359 - onListItemClick and ActionMode conflict"
Adam Cohen [Sun, 24 Oct 2010 22:35:23 +0000 (15:35 -0700)]
Merge "Fixing the case of less than or equal to 5 items in StackView"
Jeff Brown [Sun, 24 Oct 2010 22:22:06 +0000 (15:22 -0700)]
Add test stubs for newly added methods.
Change-Id: I44139adebbbed1358f613fbcbfcddac6617ef5bd
Mathias Agopian [Sun, 24 Oct 2010 21:53:05 +0000 (14:53 -0700)]
fix [
3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.
We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.
Also added a simple test for Transform.
Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
Jeff Brown [Sun, 24 Oct 2010 21:36:23 +0000 (14:36 -0700)]
am
2ef36763: am
860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '
2ef36763700eff5679d6012e7f078c57f1a4c465'
* commit '
2ef36763700eff5679d6012e7f078c57f1a4c465':
Add unit tests for native input and fix bugs identified.
Jeff Brown [Sun, 24 Oct 2010 21:31:41 +0000 (14:31 -0700)]
am
860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '
860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp
* commit '
860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
Add unit tests for native input and fix bugs identified.
Joe Onorato [Sun, 24 Oct 2010 21:31:22 +0000 (14:31 -0700)]
Merge "make the back (previous track) button into a cancel button."
Jeff Brown [Sun, 24 Oct 2010 21:18:19 +0000 (14:18 -0700)]
Merge "Add unit tests for native input and fix bugs identified." into gingerbread
OSDN Git Service
