OSDN Git Service
Wink Saville [Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)]
resolved conflicts for merge of
74af525e to master
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
Jeff Brown [Fri, 13 May 2011 19:14:27 +0000 (12:14 -0700)]
Merge "Add initial API for stylus and mouse buttons."
Jeff Brown [Sat, 7 May 2011 01:20:01 +0000 (18:20 -0700)]
Add initial API for stylus and mouse buttons.
Added the concept of pointer properties in a MotionEvent.
This is currently used to track the pointer tool type to enable
applications to distinguish finger touches from a stylus.
Button states are also reported to application as part of touch events.
There are no new actions for detecting changes in button states.
The application should instead query the button state from the
MotionEvent and take appropriate action as needed.
A good time to check the button state is on ACTION_DOWN.
As a side-effect, applications that do not support multiple buttons
will treat primary, secondary and tertiary buttons identically
for all touch events.
The back button on the mouse is mapped to KEYCODE_BACK
and the forward button is mapped to KEYCODE_FORWARD.
Added basic plumbing for the secondary mouse button to invoke
the context menu, particularly in lists.
Added clamp and split methods on MotionEvent to take care of
common filtering operations so we don't have them scattered
in multiple places across the framework.
Bug:
4260011
Change-Id: Ie992b4d4e00c8f2e76b961da0a902145b27f6d83
Dianne Hackborn [Fri, 13 May 2011 19:06:45 +0000 (12:06 -0700)]
Merge "resolved conflicts for merge of
ec85619f to master"
Romain Guy [Fri, 13 May 2011 18:50:06 +0000 (11:50 -0700)]
Merge "Fix waaayyy too many documentation links."
Guang Zhu [Fri, 13 May 2011 18:12:48 +0000 (11:12 -0700)]
Merge "even more logging"
Fabrice Di Meglio [Fri, 13 May 2011 18:09:19 +0000 (11:09 -0700)]
Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache"
Eric Laurent [Fri, 13 May 2011 17:24:24 +0000 (10:24 -0700)]
Merge "Fix audio effect framework issues"
Alex Sakhartchouk [Fri, 13 May 2011 17:24:19 +0000 (10:24 -0700)]
Merge "Cleanup mesh creation."
Gilles Debunne [Fri, 13 May 2011 16:41:57 +0000 (09:41 -0700)]
Merge "SuggestionSpans are preserved when picked."
Wink Saville [Fri, 13 May 2011 16:20:08 +0000 (09:20 -0700)]
am
55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '
55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
Wink Saville [Fri, 13 May 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Add getLteOnCdamMode." into honeycomb-LTE
Steve Block [Fri, 13 May 2011 13:44:57 +0000 (06:44 -0700)]
Merge "Fix WebCore include paths due to merge to WebKit r75315"
Dianne Hackborn [Fri, 13 May 2011 01:25:57 +0000 (18:25 -0700)]
resolved conflicts for merge of
ec85619f to master
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
Christopher Tate [Fri, 13 May 2011 00:47:12 +0000 (17:47 -0700)]
Use pax extended tar format to support long filenames etc.
'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes. We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.
Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
Dianne Hackborn [Fri, 13 May 2011 00:42:14 +0000 (17:42 -0700)]
Dianne Hackborn [Fri, 13 May 2011 00:39:30 +0000 (17:39 -0700)]
am
d46849a5: am
a8138732: MR2 is going to be API 13.
* commit '
d46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:39:22 +0000 (17:39 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:39:07 +0000 (17:39 -0700)]
am
91a46046: (-s ours) am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
91a460469a20529938e0f740ce24e0fdaddb7fa6':
DO NOT MERGE Add DhcpStateMachine
Irfan Sheriff [Fri, 13 May 2011 00:37:06 +0000 (17:37 -0700)]
am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
Dianne Hackborn [Fri, 13 May 2011 00:35:35 +0000 (17:35 -0700)]
am
a8138732: MR2 is going to be API 13.
* commit '
a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:35:20 +0000 (17:35 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:31:25 +0000 (17:31 -0700)]
am
55fa681a: (-s ours) am
bb09485b: Merge commit \'
09564fbb\' into manualmerge
* commit '
55fa681ac774240509def9d75ad7e16ea5515dd1':
DO NOT MERGE Define Protocol class
Jean-Baptiste Queru [Fri, 13 May 2011 00:25:26 +0000 (17:25 -0700)]
Merge from honeycomb-plus-aosp
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
Jean-Baptiste Queru [Fri, 13 May 2011 00:23:29 +0000 (17:23 -0700)]
Merge from honeycomb-plus-aosp
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
Irfan Sheriff [Fri, 13 May 2011 00:19:56 +0000 (17:19 -0700)]
Merge commit '
01ea7f01' into manualmerge1
Dianne Hackborn [Fri, 13 May 2011 00:15:22 +0000 (17:15 -0700)]
Merge "resolved conflicts for merge of
0e59729b to master"
John Reck [Fri, 13 May 2011 00:00:38 +0000 (17:00 -0700)]
Merge "Adding functions to query the state of a WebElement."
Chia-chi Yeh [Thu, 12 May 2011 23:55:58 +0000 (16:55 -0700)]
Merge "Add a method to create ParcelFileDescriptors from DatagramSockets."
Dima Zavin [Thu, 12 May 2011 23:06:20 +0000 (16:06 -0700)]
Merge "update for new audio.h header location"
Irfan Sheriff [Thu, 12 May 2011 23:02:43 +0000 (16:02 -0700)]
am
bb09485b: Merge commit \'
09564fbb\' into manualmerge
* commit '
bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
DO NOT MERGE Define Protocol class
Jean-Baptiste Queru [Thu, 12 May 2011 22:54:13 +0000 (15:54 -0700)]
am
2d7d3f78: (-s ours) am
f247e545: Merge "Adapt to latest skia"
* commit '
2d7d3f78c90734c8067ab76b8f5daca84a311c92':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:16 +0000 (15:52 -0700)]
am
a84d29cb: am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:12 +0000 (15:52 -0700)]
am
20fd3f0d: am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:03 +0000 (15:52 -0700)]
am
e8b669cb: (-s ours) am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
e8b669cbd7b690349c908ce6c9ce3b342139de04':
Switch to SkSafeUnref for better portability
Irfan Sheriff [Thu, 12 May 2011 22:47:28 +0000 (15:47 -0700)]
Merge commit '
09564fbb' into manualmerge
Dianne Hackborn [Thu, 12 May 2011 22:39:41 +0000 (15:39 -0700)]
resolved conflicts for merge of
0e59729b to master
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:18 +0000 (15:38 -0700)]
am
f247e545: Merge "Adapt to latest skia"
* commit '
f247e545b521584bb778e79710c1e60ab814839e':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:15 +0000 (15:38 -0700)]
am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
6714e6774063aae7a8a7a80c36c89ec60170cb27':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:11 +0000 (15:38 -0700)]
am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:07 +0000 (15:38 -0700)]
am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
71d25778c61327bf82d0e81cd78175a9ee74420a':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 22:09:51 +0000 (15:09 -0700)]
Merge "Adapt to latest skia"
Teng-Hui Zhu [Thu, 12 May 2011 22:05:29 +0000 (15:05 -0700)]
am
a0e661b4: am
c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit '
a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
Fix the Uri parsing issue
Dianne Hackborn [Thu, 12 May 2011 22:05:19 +0000 (15:05 -0700)]
am
97280816: am
0f1de9ad: New compat mode front end: UI and persistence.
* commit '
972808164adde6c0784e9c836d06219a9cf7eb7f':
New compat mode front end: UI and persistence.
Teng-Hui Zhu [Thu, 12 May 2011 22:01:56 +0000 (15:01 -0700)]
am
c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit '
c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
Fix the Uri parsing issue
Dianne Hackborn [Thu, 12 May 2011 22:01:53 +0000 (15:01 -0700)]
am
0f1de9ad: New compat mode front end: UI and persistence.
* commit '
0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
New compat mode front end: UI and persistence.
Chet Haase [Thu, 12 May 2011 21:57:51 +0000 (14:57 -0700)]
Merge "Antialiasing for rectangles"
Jean-Baptiste Queru [Thu, 12 May 2011 21:24:09 +0000 (14:24 -0700)]
Merge "Ninepatch tweaks for better interop"
Jean-Baptiste Queru [Thu, 12 May 2011 21:19:41 +0000 (14:19 -0700)]
Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
Jean-Baptiste Queru [Thu, 12 May 2011 21:19:26 +0000 (14:19 -0700)]
Merge "Switch to SkSafeUnref for better portability"
Irfan Sheriff [Thu, 12 May 2011 21:18:03 +0000 (14:18 -0700)]
Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
Irfan Sheriff [Thu, 12 May 2011 21:17:51 +0000 (14:17 -0700)]
Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2
Teng-Hui Zhu [Thu, 12 May 2011 21:11:25 +0000 (14:11 -0700)]
Merge "Fix the Uri parsing issue" into honeycomb-mr2
Wink Saville [Thu, 12 May 2011 21:08:05 +0000 (14:08 -0700)]
am
9c7c8794: am
76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '
9c7c87941446cdd1263a87a8c4cc5672082c7e12':
Fix initialization of RouteInfo
Wink Saville [Thu, 12 May 2011 21:03:31 +0000 (14:03 -0700)]
am
76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '
76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
Fix initialization of RouteInfo
Svetoslav Ganov [Thu, 12 May 2011 20:43:35 +0000 (13:43 -0700)]
Merge "Propagating hover events to JavaScript in WebView"
Andreas Huber [Thu, 12 May 2011 20:40:37 +0000 (13:40 -0700)]
Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
Wink Saville [Thu, 12 May 2011 20:26:44 +0000 (13:26 -0700)]
Merge "Fix initialization of RouteInfo" into honeycomb-LTE
Andreas Huber [Thu, 12 May 2011 20:01:29 +0000 (13:01 -0700)]
Merge "The decoder wrapper is no longer needed. Also disable building old-style decoders."
Alex Sakhartchouk [Thu, 12 May 2011 17:15:17 +0000 (10:15 -0700)]
Merge "rsLib cleanup"
Andreas Huber [Thu, 12 May 2011 16:29:20 +0000 (09:29 -0700)]
Merge "Squashed commit of the following:"
Mathias Agopian [Thu, 12 May 2011 03:37:47 +0000 (20:37 -0700)]
fix (Again) adding OES postfix when looking for gl functions
Change-Id: Ib14723ed5355fdc423226ec20a32e26fe7dd68fe
Mathias Agopian [Thu, 12 May 2011 03:33:43 +0000 (20:33 -0700)]
Merge "add OES postfix without truncating function"
Chia-chi Yeh [Thu, 12 May 2011 01:33:22 +0000 (18:33 -0700)]
Merge "Extract NetworkManagementService out from Tethering to ConnectivityService."
Jeff Boody [Fri, 28 Jan 2011 01:12:09 +0000 (18:12 -0700)]
add OES postfix without truncating function
Change-Id: Id47304cf38914190cec58d703801f456ab916f63
Mathias Agopian [Wed, 11 May 2011 22:05:29 +0000 (15:05 -0700)]
fix onFrameAvailable
Change-Id: I391fe9f6684ac9fd4f91416ce18b583f7087d966
Mathias Agopian [Tue, 10 May 2011 02:08:33 +0000 (19:08 -0700)]
Add SurfaceTexture logging
Change-Id: If1b74be5230813fb76429935d88b9d4a7c41700c
Mathias Agopian [Tue, 3 May 2011 02:51:12 +0000 (19:51 -0700)]
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Change-Id: I8382e346ddaa2c4c8ff56ac3ffd7f0109572f188
Mathias Agopian [Tue, 26 Apr 2011 21:57:10 +0000 (14:57 -0700)]
new tests for SurfaceTexture synchronous mode
Change-Id: Icfdaa625238246f8d0224efe28fdf2c1c24203f8
Mathias Agopian [Fri, 22 Apr 2011 01:52:51 +0000 (18:52 -0700)]
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Change-Id: Ic94cbab092953243a0746e04bbe1b2eb0cc930ef
Mathias Agopian [Wed, 20 Apr 2011 21:20:59 +0000 (14:20 -0700)]
unify SurfaceTexture and Surface
Change-Id: I49da2f5d8408e4cd7e148cfb777bb4ff68cd8f37
Mathias Agopian [Tue, 26 Apr 2011 03:22:14 +0000 (20:22 -0700)]
Fix a bug where setgeometry couldn't be undone
This change the binder protocol between SurfaceTextureClient
and SurfaceTexture. dequeueBuffer() now takes the requested
parameters for the buffer. SurfaceTexture decides if the
buffer needs to be reallocated and does the allocation
if needed. In that case it returns BUFFER_NEEDS_REALLOCATION
to tell SurfaceTextureClient that it needs to call
requestBuffer (which all parameters have been removed) to
acquire a pointer to the buffer.
dequeueBuffer and requestBuffer could be folded into a single
IPC call, but we chose to optimize the case where buffers are
not created and avoid some complexity in the marshalling code.
Change-Id: I097a7f6f40a3491e10f3f3742eab33999286c304
James Dong [Thu, 12 May 2011 00:52:32 +0000 (17:52 -0700)]
Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"
RoboErik [Wed, 11 May 2011 23:47:17 +0000 (16:47 -0700)]
Merge "Update Calendars table to v300"
John Reck [Wed, 11 May 2011 23:12:00 +0000 (16:12 -0700)]
Merge "Add ROOT_ID to Accounts column"
James Dong [Wed, 11 May 2011 22:59:29 +0000 (15:59 -0700)]
Merge "Expose the track informational event for testing"
Mathias Agopian [Wed, 11 May 2011 20:43:04 +0000 (13:43 -0700)]
Merge "fix libagl surface initialization"
Mathias Agopian [Wed, 11 May 2011 20:41:09 +0000 (13:41 -0700)]
fix libagl surface initialization
this broke recently when removing copybit support.
Change-Id: I5cc7ff7f49268411c6c2cfb2d97590d52b13dbd5
Irfan Sheriff [Wed, 11 May 2011 20:12:19 +0000 (13:12 -0700)]
am
f450fd6a: am
aa1fd701: (-s ours) am
8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '
f450fd6af61248b90ddb9ed0bb9780c0d3378029':
Move Wifi Ap configuration to flat file
Robert Ly [Wed, 11 May 2011 20:12:16 +0000 (13:12 -0700)]
am
9d93c9c4: am
65bab344: am
f3cdea93: am
a45e4f4d: doc change: adding link to pic board
* commit '
9d93c9c4d761aa25fb61988bf40a900a18de79ae':
doc change: adding link to pic board
Wink Saville [Wed, 11 May 2011 20:11:17 +0000 (13:11 -0700)]
am
e86dbac5: am
db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
* commit '
e86dbac583f442e37bfaa95f9427f491b62d53f3':
Refactor IccRecords and IccCard
Conley Owens [Wed, 11 May 2011 20:10:56 +0000 (13:10 -0700)]
am
041aa34e: am
87d86044: am
bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
* commit '
041aa34e089d7b194a5d93c682c3af3d3116d3f3':
Add missing clean-up of idmap file descriptors.
Jake Hamby [Wed, 11 May 2011 20:09:42 +0000 (13:09 -0700)]
am
ee60f3fb: resolved conflicts for merge of
18cc814c to honeycomb-plus-aosp
* commit '
ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
Enable support for SMS national language shift tables.
Eric Fischer [Wed, 11 May 2011 20:09:13 +0000 (13:09 -0700)]
am
6819c677: (-s ours) am
98041f02: am
270fbfed: am
37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
6819c677b9d8d9a5f60f1a35e045300b1a8aec96':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 11 May 2011 20:08:50 +0000 (13:08 -0700)]
am
ca43ef6b: (-s ours) am
affca8fa: am
f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
ca43ef6bc7ea52efb17718017e1f883e33504c05':
Import revised translations. DO NOT MERGE
Joe Onorato [Wed, 11 May 2011 20:07:55 +0000 (13:07 -0700)]
am
0fe56853: am
37c077d3: am
81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '
0fe56853fd88c34aba37b04be256a0e51c1bbff7':
Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets.
Robert Greenwalt [Wed, 11 May 2011 20:07:38 +0000 (13:07 -0700)]
am
441bc9a6: am
e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit '
441bc9a6f41ca1678a6c965bec7e2f18227ac100':
Fix the adding of host routes.
Christopher Tate [Wed, 11 May 2011 19:51:31 +0000 (12:51 -0700)]
Merge "Full local backup infrastructure"
Dianne Hackborn [Wed, 11 May 2011 19:50:39 +0000 (12:50 -0700)]
Merge "resolved conflicts for merge of
037b54cf to master"
Dianne Hackborn [Wed, 11 May 2011 17:59:54 +0000 (10:59 -0700)]
resolved conflicts for merge of
037b54cf to master
Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a
Irfan Sheriff [Wed, 11 May 2011 17:06:33 +0000 (10:06 -0700)]
am
aa1fd701: (-s ours) am
8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '
aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
Move Wifi Ap configuration to flat file
Irfan Sheriff [Wed, 11 May 2011 16:45:36 +0000 (09:45 -0700)]
am
8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '
8dd85f80ba9c463f5616b47eceb620fe21203f4f':
Move Wifi Ap configuration to flat file
Daniel Sandler [Wed, 11 May 2011 16:31:08 +0000 (09:31 -0700)]
Merge changes I21e9629e,I535ed3ba
* changes:
Create an XML config flag to turn the navbar off.
It's lights out for you, navigation bar!
Irfan Sheriff [Wed, 11 May 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Move Wifi Ap configuration to flat file" into gingerbread
Robert Ly [Wed, 11 May 2011 16:11:41 +0000 (09:11 -0700)]
am
65bab344: am
f3cdea93: am
a45e4f4d: doc change: adding link to pic board
* commit '
65bab344789b248cdc9334523e3b04f5a2c155b4':
doc change: adding link to pic board
Robert Ly [Wed, 11 May 2011 16:08:42 +0000 (09:08 -0700)]
am
f3cdea93: am
a45e4f4d: doc change: adding link to pic board
* commit '
f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
doc change: adding link to pic board
Robert Ly [Wed, 11 May 2011 16:04:52 +0000 (09:04 -0700)]
am
a45e4f4d: doc change: adding link to pic board
* commit '
a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
doc change: adding link to pic board
Andreas Huber [Wed, 11 May 2011 15:11:11 +0000 (08:11 -0700)]
Merge "Leave the number of output buffers up to surface flinger and friends."
Andreas Huber [Wed, 11 May 2011 15:10:42 +0000 (08:10 -0700)]
Merge "Make sure the ogg extractor returns appropriate error codes."
Guang Zhu [Wed, 11 May 2011 02:15:58 +0000 (19:15 -0700)]
Merge "add more logging into DRT"