ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
34,680 Commits 2 Branches 0 Tags 54 MiB
de335ca8ec
Commit Graph

34680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Debashish Chatterjee
de335ca8ec Merge "framework/base changes to add new voicemail provider sample." 2011-05-26 07:45:28 -07:00
Daniel Sandler
198b7d0d9e Merge "Framework support for Android Dreams." 2011-05-26 06:01:41 -07:00
Joe Onorato
db53a23dc0 am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
  Make adb shell am display-size persistent.
 2011-05-25 21:29:07 -07:00
Dianne Hackborn
09f8d45589 am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 21:28:39 -07:00
Amith Yamasani
f0654ca13d am 361c286d: (-s ours) am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '361c286d095a22152750e73b01bfc6b1d2076a4d':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 21:28:31 -07:00
Russell Brenner
48567a8ad8 am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 21:27:41 -07:00
Mike Lockwood
cba23fa4cd Merge "Environment: Fix default mount point for external storage" 2011-05-25 20:36:05 -07:00
Dianne Hackborn
128682606b Merge "resolved conflicts for merge of 77dd616e to master" 2011-05-25 20:35:04 -07:00
Gloria Wang
4bb4da8653 Merge "For out of band timed text support (timed text in a separate file)." 2011-05-25 20:11:25 -07:00
Romain Guy
0d56207474 Merge "Rename test to be able to launch it on crespo." 2011-05-25 17:49:50 -07:00
Dianne Hackborn
717d0dee49 resolved conflicts for merge of 77dd616e to master 
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
 2011-05-25 16:36:50 -07:00
Eric Laurent
2f3a10cff5 Merge "Issue 4364098: bluetooth SCO not working" 2011-05-25 16:22:36 -07:00
Jamie Gennis
e2c8543391 Merge changes I09a74538,I08d96b38,Ic1d3344b 
* changes:
  SurfaceTexture: disable a failing test.
  SurfaceTexture: fix an error check in dequeueBuffer.
  SurfaceTexture: clean up some comments, tests, etc.
 2011-05-25 15:54:35 -07:00
James Dong
ff0e84432f Merge "Convert line breaks to Unix style" 2011-05-25 12:37:07 -07:00
Jamie Gennis
8dda6b7bf8 SurfaceTexture: disable a failing test. 
The SurfaceTextureSyncModeWaitRetire test was disabled.  It is failing
because of the synchronization hacks that were added to SurfaceTexture
to work around bugs in vendor device drivers.

Change-Id: I09a74538bfe14a04833acb6847471e00826cc7fc
 2011-05-25 12:27:33 -07:00
Jamie Gennis
c2c8dfd71b SurfaceTexture: fix an error check in dequeueBuffer. 
This change fixes the MIN_UNDEQUEUED_BUFFERS error check in
dequeueBuffer.  The check should only be performed if a buffer has been
queued since the last time the buffer count was changed by the client.
The check must be applied conditionally because video decoders require
all the bufferes to be dequeued and registered before beginning the
decode.

Change-Id: I08d96b380544e395c2fcf0f3983a199bfd695b09
 2011-05-25 12:27:33 -07:00
Jamie Gennis
8cd5ba4b7f SurfaceTexture: clean up some comments, tests, etc. 
This change fixes up some stale comments, member variable names, log
messages and disables a failing test.

Change-Id: Ic1d3344b18066cf710e4a42838b2417c6b1f2f6c
 2011-05-25 12:27:33 -07:00
Kristian Monsen
d958485844 Merge "Merge chromium to 10.0.634.0: Compile fix" 2011-05-25 12:09:56 -07:00
Kristian Monsen
da846dd889 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Adam Powell
21ab86c0ec Merge "Action bar tab layout" 2011-05-25 12:01:00 -07:00
Joe Onorato
dd96bb7e08 am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
  Make adb shell am display-size persistent.
 2011-05-25 11:46:28 -07:00
Joe Onorato
cc5dee303a am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.
 2011-05-25 11:43:06 -07:00
Joe Onorato
53cf6971a0 Merge "Make adb shell am display-size persistent." into honeycomb-mr2 2011-05-25 11:40:59 -07:00
Dianne Hackborn
ca09978883 am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit 'd6f29cd8f92b098330818227428f5a42836097b7':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:18:59 -07:00
Dianne Hackborn
b6c674f85c am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '2a15eb559cfc18800b3e345995df76695a3ae4b2':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:14:13 -07:00
Dianne Hackborn
55f6d6e82b Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 2011-05-25 11:10:15 -07:00
Amith Yamasani
d7756a38c9 am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:08:30 -07:00
Russell Brenner
0accfc6025 Merge "merge from honeycomb mr2" 2011-05-25 11:04:28 -07:00
Amith Yamasani
d8b5ac8ca9 am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '99a8e1d2931f4deb35c54f144de26fc6124de5fc':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:02:01 -07:00
Amith Yamasani
c207d53276 Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 2011-05-25 10:58:24 -07:00
Brian Carlstrom
6bd7414b12 Merge "Remove need for onActivityResult from KeyChain API" 2011-05-25 10:30:36 -07:00
Eric Laurent
416b5cc521 Merge "Bluetooth SCO audio API improvements." 2011-05-25 10:13:49 -07:00
Russell Brenner
01faed6931 am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit '8b98284b97b81a4cc85d9fc26e79160e9c38ff1c':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 09:14:50 -07:00
Russell Brenner
331c27672b am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit '64796477f61f2fb5435e5043820c67dead4ec577':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 09:05:55 -07:00
Russell Brenner
e2888ad71b Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
Narayan Kamath
95a2929035 Merge "Add a separate thread for writing to audiotracks." 2011-05-25 08:26:38 -07:00
Steve Block
a85d686ad9 Merge "Merge WebKit at r78450: Update useragent string" 2011-05-25 08:15:34 -07:00
Kristian Monsen
2225a2ff73 am bc533dd3: (-s ours) am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2 
* commit 'bc533dd3201afdcf421070cc47250dd7471b77aa':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 19:54:15 -07:00
John Reck
790eab9300 am 00bcea1a: am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 
* commit '00bcea1ac3be490e2730d15a6406541341dd3853':
  Update the Desktop UA to Chrome
 2011-05-24 19:54:11 -07:00
Wink Saville
978ac1a19d am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
  Handle ProvideLocalInfo stk command.
 2011-05-24 19:53:59 -07:00
Irfan Sheriff
e4cc1b727d am c2ff0e70: am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE 
* commit 'c2ff0e7031b54810d26e1d2a1ba9cdb529f25306':
  Clear network id when invalid
 2011-05-24 19:53:04 -07:00
Dianne Hackborn
d059deebd6 am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2 
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
  More compatibility mode improvements.
 2011-05-24 19:13:45 -07:00
Dianne Hackborn
c04b3bf282 am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2 
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
  More compatibility mode improvements.
 2011-05-24 19:10:53 -07:00
Dianne Hackborn
964ce8d835 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Ying Wang
acc8b13a3b Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Chet Haase
c62befcd5f Merge "Add more functionality to ViewPropertyAnimator." 2011-05-24 16:07:02 -07:00
Andreas Huber
f6afc90502 Merge "Make sure all references to the decoder plugin are accounted for" 2011-05-24 15:58:09 -07:00
Andreas Huber
337d887f09 Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer" 2011-05-24 15:56:42 -07:00
Chet Haase
fc5eac2b68 Merge "Add ability to transition parent hierarchy in layout transitions" 2011-05-24 15:55:15 -07:00
Shimeng (Simon) Wang
c2bc3099b1 Merge "Simplify viewport logic in webviewcore and zoom-manager." 2011-05-24 15:27:14 -07:00