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

97987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
b6ed68ccb2 Revert "Update AudioTrack comments" 
This reverts commit 3f411cacbe4204c779a794451a5d5b0f67e03416

Change-Id: Ieb32310bc007bf2c6a2dc324db4873e7128177fa
 2012-12-18 11:50:28 -08:00
Glenn Kasten
72a274de4f Merge "Update AudioTrack comments" 2012-12-18 11:27:39 -08:00
Andy McFadden
d47f7d8b5f Rename ISurfaceTexture and SurfaceTexture 
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
 2012-12-18 11:22:21 -08:00
Ben Pietrzak
05cb363bf3 Start RecognitionActivity with an upswipe gesture. 
Change-Id: I7dd91bef3eb551bb7617307cc9a4777226b5ded7
 2012-12-18 11:12:47 -08:00
Robert Greenwalt
9b64c4906b Merge "Return error upon attempt to use non-existent APN" 2012-12-18 11:02:52 -08:00
John Spurlock
4e7ec240ca Merge "Remove remaining doc references to StyledAttributes." 2012-12-18 10:17:55 -08:00
Craig Mautner
0bf6ec9e37 Clean up warnings. 
Change-Id: I1dfe21e5f64364c90565b594e28074cabe7daa64
 2012-12-18 10:03:21 -08:00
Glenn Kasten
3f411cacbe Update AudioTrack comments 
Change-Id: I0cdca92e3ac63088ed919c4dcfb309d3ccb59092
 2012-12-18 10:00:49 -08:00
The Android Open Source Project
c25961dbe4 am efd80c92: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'efd80c92f45f5ba9c1b7912b859792bcdd9dba3e':
 2012-12-18 09:46:49 -08:00
The Android Open Source Project
efd80c92f4 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ib82925ec511d04952e13627e52f188ecb3ceebb7
 2012-12-18 09:44:25 -08:00
John Spurlock
330dd53484 Remove remaining doc references to StyledAttributes. 
It appears StyledAttributes was renamed to TypedArray
prior to fw 1.0.  Leaving references to the old name
around in the public docs is confusing.

Deliberating leaving...
   tests/coretests/src/android/widget/LabelView.java
... as is - it's clearly unused.

Change-Id: I3f66e5f9cbe945d9d86530d37b88369b401f054d
 2012-12-18 12:03:11 -05:00
Mikael Hedegren
342a7cb69f Return error upon attempt to use non-existent APN 
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.

Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
 2012-12-18 15:32:48 +01:00
Peter Ng
9e83ea46b7 am b4ad9989: am 897ce15d: am 4cc5de51: am 4fcaa382: am bed43546: am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev 
* commit 'b4ad998906c79cfbfeba4d714cded2d2a65a9bc7':
 2012-12-17 23:47:16 -08:00
Brian Carlstrom
f8465c8d2b am dd27d2c6: am cfc7adfb: am b6982bf7: am 1dc426c2: am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit 'dd27d2c6bff016ac5bff36d1f60bd7537ce0f730':
 2012-12-17 23:47:11 -08:00
Peter Ng
5d4b9b10a0 am ccc9a8a9: am 188ce277: am 073f2d9f: am 65558d5d: am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev 
* commit 'ccc9a8a954907c4308d22846569801f17badd466':
 2012-12-17 23:47:01 -08:00
Peter Ng
badd34232f am 779d04ae: am 5625a892: am c542959e: am 8dda8194: am f42bd744: am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit '779d04aece395618c412d6ddb89c8f7f72ddfa91':
 2012-12-17 23:46:56 -08:00
Kenny Root
8dc9ec2054 am e4af2b9c: am 8b7a4cd7: am df8c2248: am 00efe449: am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit 'e4af2b9c7ce8ea6f77674f11a25b601abc5055a6':
 2012-12-17 23:46:47 -08:00
Robert Greenwalt
a12d9e9146 am 93f53ad0: am 4658defe: am 9e94a834: am 36b536be: Merge "Reduce log spam." into jb-mr1-dev 
* commit '93f53ad0e7a5404211aaed6aa869fbd9b369842b':
 2012-12-17 23:46:42 -08:00
Nick Pelly
640517565c am 970d0034: (-s ours) am 23e89348: (-s ours) am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '970d00347dfc8e66ba11bb5909905d5c63f24121':
 2012-12-17 23:46:37 -08:00
The Android Open Source Project
5568a7cef8 am ecccbbc4: am 9ead33be: am d8d0e2f2: Sync with jb-mr1-dev 
* commit 'ecccbbc4ac84379b4b4f40fc9c958af886d5e4e5':
 2012-12-17 23:46:32 -08:00
Mikhail Naganov
d8e83315fc am d7d3a575: am f415f3d7: Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." 
* commit 'd7d3a575b781f413aa46e744a3a41d27113cb223':
 2012-12-17 23:46:26 -08:00
James Dong
2f2dbef9c6 am 628e8c4d: am 150275ec: am d9e72eae: am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 
* commit '628e8c4db135dbb601a26f5c688e4367676ca6b4':
 2012-12-17 23:46:21 -08:00
Peter Ng
014fd408a4 am 496cc614: am 367f55f2: am 3d964c4e: am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '496cc614e58ce73656150373bd607f7a9483e042':
 2012-12-17 23:46:17 -08:00
Ying Wang
372bcde7ba am aedd525a: (-s ours) am e24a090e: (-s ours) am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'aedd525a432bb7ecb0aeaed43c79b6d437117c42':
 2012-12-17 23:46:13 -08:00
The Android Open Source Project
97f84a7cf8 am 798a68a2: am 27a2c849: am a21a6075: Reconcile with jb-mr1-release 
* commit '798a68a2715621e18e14c3ee8c4bd648aa422fad':
 2012-12-17 23:46:08 -08:00
The Android Open Source Project
2b08485b09 am a90af045: am 905272a4: am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release 
* commit 'a90af045a4523c2a61a6795d15d8cfdf4c0f3821':
 2012-12-17 23:46:03 -08:00
Peter Ng
8e09392f63 am 0454f291: am dcdd2575: am 09f18477: am a1f89c7b: am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit '0454f29139d48ff974cdb20905e3d07fa2a5f365':
 2012-12-17 23:45:57 -08:00
Fabrice Di Meglio
729f8e56ca am d724796a: am b3df96ea: am 85c1765e: am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit 'd724796ade4664e3347e0087b4e750ad424a2038':
 2012-12-17 23:45:52 -08:00
Adam Powell
bf87ec2f08 am 77a12739: am 7dd2157e: am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev 
* commit '77a1273964b1a9810e89ba4b7bc26805eb2a97c3':
 2012-12-17 23:45:42 -08:00
Ying Wang
47ed949131 am f4c123ac: (-s ours) am fdfb676d: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'f4c123acaab757af6c18864ea00c5c027c2b47ee':
 2012-12-17 23:45:38 -08:00
Ying Wang
530e58f91d am 434956ab: (-s ours) am 7570ca32: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '434956ab4ecd583c6fe0c1caa54773d254736024':
 2012-12-17 23:45:32 -08:00
James Dong
99905c1fd4 am ff66370b: am 34f48b78: am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 
* commit 'ff66370b7d7b4a06998c5ed5b77d120a12f0ef9f':
 2012-12-17 23:45:24 -08:00
Winson Chung
b25053b1d9 am 52ef24bb: am 21dd5622: Merge "Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)" 
* commit '52ef24bbb4259222f584a2d49720dcbcf59d463f':
 2012-12-17 23:45:17 -08:00
Adam Powell
41fbe0d4ef am 83b4ef5c: am 35466be1: am c2ced7be: am e72a6e97: am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit '83b4ef5c6f4764c4bdfdb36a4c0eb80f5898c9b2':
 2012-12-17 23:45:12 -08:00
Fabrice Di Meglio
b95e8f56ec am 7f32ddff: am cb57869c: am e2a7c66d: am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 
* commit '7f32ddff9199e93953edde190af8e86d96268ef6':
 2012-12-17 23:45:06 -08:00
Elliott Hughes
26e192aba8 am 1533b514: am 77670822: Merge "Fix Time.parse and Time.parse3339 crashing bugs." 
* commit '1533b514429fc4a3c772fd75a0c16466b698f3d2':
 2012-12-17 23:45:01 -08:00
Mikhail Naganov
167575c639 am cbf9c4e1: am ce76ca51: Add \'getValue\' methods to WebSettings.TextSize and ZoomDensity enums. 
* commit 'cbf9c4e196f2ba7b5c2660d04410372963c35d35':
 2012-12-17 23:44:50 -08:00
Joe Fernandez
257742ef87 am 0c1badc6: am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3 
* commit '0c1badc64e5340b643640d37120bf926142dda1b':
  docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
 2012-12-17 23:44:39 -08:00
Jamie Gennis
ed38893568 am f8f147d1: (-s ours) am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev 
* commit 'f8f147d167ed2a6cf5ba4b1b3a633401ecc5d384':
  Fade recents thumbnail to transparent earlier.
 2012-12-17 23:44:35 -08:00
Peter Ng
b4ad998906 am 897ce15d: am 4cc5de51: am 4fcaa382: am bed43546: am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev 
* commit '897ce15d4d8f8abb9a04d67e06b78b9b7055da74':
 2012-12-17 23:04:55 -08:00
Brian Carlstrom
dd27d2c6bf am cfc7adfb: am b6982bf7: am 1dc426c2: am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit 'cfc7adfb1ec08355a248e10c4694e1d93bedc03f':
 2012-12-17 23:04:39 -08:00
Peter Ng
ccc9a8a954 am 188ce277: am 073f2d9f: am 65558d5d: am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev 
* commit '188ce277e1e734753593cfe31996c0165461235b':
 2012-12-17 23:04:19 -08:00
Peter Ng
779d04aece am 5625a892: am c542959e: am 8dda8194: am f42bd744: am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit '5625a89214b447e39c8b62f2a3b48db115a519a5':
 2012-12-17 23:03:59 -08:00
Kenny Root
e4af2b9c7c am 8b7a4cd7: am df8c2248: am 00efe449: am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit '8b7a4cd769ecc50906a9954aa3c5d68110962fac':
 2012-12-17 23:03:38 -08:00
Robert Greenwalt
93f53ad0e7 am 4658defe: am 9e94a834: am 36b536be: Merge "Reduce log spam." into jb-mr1-dev 
* commit '4658defef910b55b9af1f534a57bea5031ba0079':
 2012-12-17 23:03:21 -08:00
Nick Pelly
970d00347d am 23e89348: (-s ours) am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '23e89348ff00b9bfffd08f58e4cbeced50085869':
 2012-12-17 23:03:01 -08:00
The Android Open Source Project
ecccbbc4ac am 9ead33be: am d8d0e2f2: Sync with jb-mr1-dev 
* commit '9ead33be76efce14cc253a14a04b0aeead0f0db3':
 2012-12-17 23:02:43 -08:00
Mikhail Naganov
d7d3a575b7 am f415f3d7: Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." 
* commit 'f415f3d72bbea4c08f6d52b74bb207b587cde722':
  Deprecate WebSettings.LOAD_NORMAL cache mode.
 2012-12-17 23:02:27 -08:00
James Dong
628e8c4db1 am 150275ec: am d9e72eae: am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 
* commit '150275ec72b67591c368446e2113e3c950e12ace':
 2012-12-17 23:02:11 -08:00
Peter Ng
496cc614e5 am 367f55f2: am 3d964c4e: am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '367f55f2da565d7ce6b92d83d919204064ddc149':
 2012-12-17 23:01:57 -08:00