drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,554 Commits 1 Branch 0 Tags
Commit Graph

52554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tedbo
cc5278a3e2 Support for setting a ParcelSurfaceTexture as the MediaPlayer sink. 
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.

Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
 2011-06-13 14:27:39 -07:00
James Dong
8aec83eb15 Merge "Avoid duplicated code calculating the stts sample duration" 2011-06-10 16:23:41 -07:00
Romain Guy
c0e9e4293a Merge "Add onSurfaceTextureDestroyed() callback." 2011-06-10 15:45:23 -07:00
Fabrice Di Meglio
40b62b9e66 Merge "Make View respect LAYOUT_DIRECTION_LOCALE" 2011-06-10 15:45:10 -07:00
Romain Guy
451ce44a18 Add onSurfaceTextureDestroyed() callback. 
This is needed for Renderscript and it also makes implementations
of TextureView cleaner. This change also hooks up the onSurfaceTextureSizeCHanged()
callback whenever the view size changes.

Change-Id: I2f972ee4504d800329defefacf32cf20547d31a3
 2011-06-10 15:44:09 -07:00
Nick Pelly
f74b9bf13b Merge "NFC: Submit the missing pieces of previous commit to fix build." 2011-06-10 15:23:37 -07:00
Nick Pelly
195c39cbce NFC: Submit the missing pieces of previous commit to fix build. 
(remove stale code)

Change-Id: I0d08650b6d694ac4493cf0074696d4e1be7d9f87
 2011-06-10 15:22:28 -07:00
Teng-Hui Zhu
4e6c1da41c am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2 
* commit '5a9bbc34cb2a83188b7407c4f7bae47e40593c34':
  fix one NPE when webChromeClient don't have progress view support
 2011-06-10 15:21:26 -07:00
Robert Greenwalt
8b7eede0bc am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 
* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
  CDMALTE: Get roaming status based on SID/NID
 2011-06-10 15:21:22 -07:00
John Reck
b0e81da4b8 Merge "Tweak snap settings" 2011-06-10 14:57:33 -07:00
John Reck
75738725e7 Tweak snap settings 
Different settings for horiz vs. vert snap
 Snap angle increase in snap mode

Change-Id: I105e79b0c6fae239beef0c311cddd748def2ad8b
 2011-06-10 14:51:53 -07:00
Fabrice Di Meglio
26e432d25f Make View respect LAYOUT_DIRECTION_LOCALE 
- update also unit tests for taking care of the locale direction
- code formatting on the layout test files

Change-Id: I4037eac3c572de9abb0178f36ca03803cc2c1522
 2011-06-10 14:30:32 -07:00
Teng-Hui Zhu
5a9bbc34cb am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2 
* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
  fix one NPE when webChromeClient don't have progress view support
 2011-06-10 14:27:13 -07:00
Jean-Baptiste Queru
0bf732b70e Merge "Make AllAudio really include all audio" 2011-06-10 14:27:01 -07:00
Teng-Hui Zhu
b5141a9fc7 am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2 
* commit '90bdb69bf95e5865547a55260dd61744b0bcc911':
  fix one NPE when webChromeClient don't have progress view support
 2011-06-10 14:22:52 -07:00
Teng-Hui Zhu
90bdb69bf9 Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2 2011-06-10 14:19:22 -07:00
Jean-Baptiste Queru
7af77b7a5e Make AllAudio really include all audio 
Change-Id: I14aa532aa6e719d1f4d9e6a39870099553275a57
 2011-06-10 14:18:37 -07:00
Shimeng (Simon) Wang
a8ed4ad80d Merge "Fix reflow for mobile sites." 2011-06-10 14:13:36 -07:00
Robert Greenwalt
75612e9c3f am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
  CDMALTE: Get roaming status based on SID/NID
 2011-06-10 14:13:25 -07:00
Brian Carlstrom
3b765f0462 Merge "New KeyChain API for application access to keystore credentials" 2011-06-10 14:11:15 -07:00
Dianne Hackborn
f7f413e118 am 0a63ccc6: am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '0a63ccc63b833e8034cc941bf55a6e2003037309':
  Commit final (maybe) MR 2 API.
 2011-06-10 14:08:49 -07:00
Dianne Hackborn
4bb506afeb am 15e9d474: am 88748e6d: am d86302df: Quiet the log. 
* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
  Quiet the log.
 2011-06-10 14:08:45 -07:00
Dianne Hackborn
ef42dace44 am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles. 
* commit 'f14dff1219d2a87340dccad657f666f5451d8c6e':
  Okay *now* really enforce the limit on non-public styles.
 2011-06-10 14:08:41 -07:00
Robert Greenwalt
1ea549e899 Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 2011-06-10 14:08:28 -07:00
Nick Pelly
e14674d515 Merge "NfcAdapter: Remove dead AIDL methods." 2011-06-10 13:55:36 -07:00
Shimeng (Simon) Wang
e86cdeb86c Fix reflow for mobile sites. 
1. use correct mDefaultScale instead of 1.0f.
2. ignore mMinZoomScaleFixed in case of using wide viewport since
sometimes mobile site will impose a min scale while the web content
will make it bigger than overview scale.

issue: 4257815

Change-Id: Ib4ca9b4dab8585827081a32432076eeeaedecd38
 2011-06-10 13:42:32 -07:00
John Reck
60f36a52ac Merge "Expose hook for crash backup" 2011-06-10 13:10:52 -07:00
Dianne Hackborn
173e4c79b4 am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
  Ummm...  f*, stop breaking the build.
 2011-06-10 13:00:41 -07:00
Dianne Hackborn
32ed8448d2 Merge "resolved conflicts for merge of f51ded0f to master" 2011-06-10 12:47:12 -07:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Svetoslav Ganov
8dffad68c7 Bug fixes in the accessibility interrogation APIs 
1. AccessibilityNodeInfo was not overriding equals.

2. ViewAncestor was not calling the callback for
   setting the result of an interrogation request
   thus making the system process wait upto the
   maximal timeout.

Change-Id: I040a3c12d97f48aee319ba6414879546e71e9b8e
 2011-06-10 12:43:00 -07:00
Adam Powell
679dd99cdc Merge "Fix some measurement/sizing with split action bars" 2011-06-10 11:59:03 -07:00
James Dong
a7ea9f935e Avoid duplicated code calculating the stts sample duration 
o This also speeds up the MediaRecorder.stop() call.
o Also fix incorrect start time compensation in stts box

Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
 2011-06-10 11:55:40 -07:00
Adam Powell
cc2e5bea7d Fix some measurement/sizing with split action bars 
Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac
 2011-06-10 11:55:09 -07:00
Philip Milne
08b992c88e Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices." 2011-06-10 11:54:39 -07:00
RoboErik
a2aee84eee Merge "Upgrade of Calendar db to 305" 2011-06-10 11:36:15 -07:00
Nick Pelly
c17a7a57d7 NfcAdapter: Remove dead AIDL methods. 
Change-Id: Ia848c86dffcbe9f661d63fab6b32af41bbd8ee81
 2011-06-10 11:36:13 -07:00
Dan Morrill
75f27b56a6 Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight." 2011-06-10 11:01:48 -07:00
RoboErik
9734df5f0c Upgrade of Calendar db to 305 
Name changes for db upgrade and reorganization for easier
referencing of calendar/event columns.

Change-Id: Ic892729e1fa11c7971d99ec17d930db9300d44e9
 2011-06-10 10:58:31 -07:00
Chet Haase
ec609d3a36 Merge "Change Property.set() to throw UnsupportedOperationException by default" 2011-06-10 10:58:26 -07:00
Teng-Hui Zhu
2302fe5226 fix one NPE when webChromeClient don't have progress view support 
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
 2011-06-10 10:56:33 -07:00
Dan Morrill
5ffe6bc98d Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to 
master do to a merge conflict oversight.

Change-Id: I35e7b0e3ad008b2c350ce720848d1b91e2e9fc5b
 2011-06-10 10:53:43 -07:00
Philip Milne
f474870fe1 Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices. 
Change-Id: Iafb25b17fec9391664c81a7e213eeaa918254912
 2011-06-10 10:51:45 -07:00
Brian Carlstrom
42f6528b98 New KeyChain API for application access to keystore credentials 
The KeyChain API is Currently in use by Browser and validated by Email
for client certificate authentication.

Change-Id: Ifeab416be594457a05747406e31656e71795cb53
 2011-06-10 10:43:02 -07:00
Robert Greenwalt
9e7c20635f am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE 
* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
  Set locale based on SIM preferred language.
 2011-06-10 10:33:23 -07:00
James Dong
0964c759d3 am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-10 10:32:21 -07:00
Mike Lockwood
8df5fcfa62 am 6d60190a: am e502c536: am b3174c46: UsbService: Fix JNI reference leak 
* commit '6d60190a3156e0ac69c800bbb10691b70ae9bd54':
  UsbService: Fix JNI reference leak
 2011-06-10 10:32:16 -07:00
Justin Ho
b2ba51e6de am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
  Updating default wallpaper of large devices to match xlarge
 2011-06-10 10:32:10 -07:00
Xavier Ducrohet
2dcb6e80b9 am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '48305f327ff3839ddbfa5a6fb42a57150a69480c':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-10 10:31:52 -07:00
Conley Owens
8c6d777da0 am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'e668c0b69896996040f394e0a95f71dd4b9c6257':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-10 10:30:38 -07:00