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

34917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Romain Guy
74fb159816 Merge "Code cleanup." 2011-05-24 15:00:52 -07:00
Shimeng (Simon) Wang
ca3482c9b0 Merge "Use fixed viewport for all devices in wide viewport mode." 2011-05-24 14:42:44 -07:00
Jeff Brown
24b3ca7d83 Merge "Disable pointer debug logging." 2011-05-24 14:42:18 -07:00
Jeff Brown
96c4b900e8 Merge "Input device protocol enhancements." 2011-05-24 14:39:53 -07:00
Jeff Brown
50f160901c Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-05-24 14:26:18 -07:00
Jason parks
d9436839c8 Merge "Add public API to do NDEF push." 2011-05-24 13:49:51 -07:00
Jeffrey Tinker
0bf285186e am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-24 12:57:22 -07:00
Mike Lockwood
05ae4cbf66 am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '859443f2a4d6a2b72c3e9c75720d32d4e4c09489':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-24 12:57:17 -07:00
Amith Yamasani
53b228eb5e am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-24 12:57:08 -07:00
Mike Lockwood
f38b2edd3e am 49b9449b: am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-24 12:56:56 -07:00
John Reck
6b81725890 am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit 'f656d95078fbcb65df7753ba8c04679c5389e15c':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-24 12:56:32 -07:00
Dianne Hackborn
627147ac99 Merge "resolved conflicts for merge of bbca8133 to master" 2011-05-24 12:44:07 -07:00
Jeff Brown
95e24e04e0 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
 2011-05-24 12:01:25 -07:00
RoboErik
4120eaaad5 Merge "Add original_id definition for cal db v301" 2011-05-24 11:34:45 -07:00
Dianne Hackborn
3ae00fabc7 resolved conflicts for merge of bbca8133 to master 
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
 2011-05-24 11:27:11 -07:00
Kristian Monsen
f7636e9668 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 '18a259fe37861a78632a0667d746ea7d06356ced':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 11:22:39 -07:00