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

98083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siva Velusamy
af80cdd7df Merge "DdmServer: add controls for OpenGL tracing" 2013-01-02 09:10:06 -08:00
Jason Sams
a22f980f99 Merge "Fix color cube tests." 2012-12-28 14:37:44 -08:00
Jason Sams
ddf66ce679 Fix color cube tests. 
Change-Id: I644ac26c6d234bf5b9cf4c549bebdfee67e98f50
 2012-12-28 13:24:03 -08:00
Jason Sams
69bf687e53 Merge "Add API support for 3D allocations." 2012-12-28 11:53:46 -08:00
Elliott Hughes
e2d3156bad am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit '2fbc67abb9c79df942e0bbff118017d6d2476cbf':
  StringBlock_nativeCreate: Possible Leak
 2012-12-28 09:48:23 -08:00
Scott Main
704cbbcd1d am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '1a9c5a5f82786825937c0a4d46457f336cba8f97':
  docs: add class on keyboards
 2012-12-28 09:48:14 -08:00
Scott Main
e3d1258082 am 51627153: am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '51627153b9e6c26d5d2d87ee14ca0676968578e5':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-28 09:48:09 -08:00
James Dong
f3ec15425f am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-28 09:47:46 -08:00
James Dong
cf1df19448 am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit '0c1e566f97a39dd79e563afe953de8879ef66bd9':
  Set "isdrm" info in Mediastore
 2012-12-28 09:47:41 -08:00
The Android Open Source Project
b3c81e3f6c am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '57ebeed61fd7b1a8fb8d1d8d719c10dfabd8aae4':
 2012-12-28 09:47:35 -08:00
kmccormick@google.com
8d3a44bcb0 am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '12f2f8dcd79fc1952b3d606829857b0df4398fa8':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:47:28 -08:00
Irfan Sheriff
fa28d45d59 am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '7f93e7d265509d4ae18f99cbc9a45cca087c4b71':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-28 09:47:03 -08:00
Jean-Michel Trivi
246f4529bb Merge "Remove unused audio source" 2012-12-28 08:46:50 -08:00
Jason Sams
d1c306a9e6 Add API support for 3D allocations. 
Change-Id: I19c525f90135d83caec545e77e8f61a957d220ee
 2012-12-27 20:26:41 -08:00
Jean-Michel Trivi
58a9cad4e8 Remove unused audio source 
Bug 7110996

Change-Id: I90737c14a4e6f9fe662eb7eb5bd0483da823083b
 2012-12-27 15:31:47 -08:00
Kristian Monsen
d05e4d820d Merge "Update Geolocation.getInstance() comment." 2012-12-26 16:00:25 -08:00
Craig Mautner
273fa2708a Merge "Fixes to clean up icon launching during animations." 2012-12-26 11:56:30 -08:00
Jean-Michel Trivi
c30f45b97f Add comments in AudioService focus and media button stack traversal 
Add comments to reflect where and why the audio focus and media
 button stacks are traversed with an iterator, which traverses
 the stack from bottom to top.

Change-Id: I462a522195e742295d13eff5fc727e59a5d7e830
 2012-12-26 10:46:29 -08:00
Elliott Hughes
2fbc67abb9 am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit '5cb0f2184656642160e9ac032d0646f766058a5b':
  StringBlock_nativeCreate: Possible Leak
 2012-12-21 18:13:29 -08:00
Elliott Hughes
5cb0f21846 Merge "StringBlock_nativeCreate: Possible Leak" 2012-12-21 17:17:42 -08:00
Scott Main
1a9c5a5f82 am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '96f0e00825cf1bf0f14c358b87394b426020a77b':
  docs: add class on keyboards
 2012-12-21 16:40:25 -08:00
Scott Main
96f0e00825 am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '481102eed6d8eaff07489717bde7fc59a5dea5bf':
  docs: add class on keyboards
 2012-12-21 16:38:09 -08:00
Scott Main
51627153b9 am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '8c8fd247a6a7f49031251ba11036779a41d9a2bf':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:33:40 -08:00
Scott Main
8c8fd247a6 am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'cee5267b766ce44ddf2faa1f32f2b79d49f088ac':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:30:33 -08:00
Scott Main
481102eed6 am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '0dae634b06f5dc6039a5aaa9c0f00250e10c6547':
  docs: add class on keyboards
 2012-12-21 16:29:16 -08:00
Scott Main
0dae634b06 Merge "docs: add class on keyboards" into jb-mr1-dev 2012-12-21 16:25:50 -08:00
Scott Main
cee5267b76 am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'dc2c1a0f80042c42768fd868791e21412c3839b9':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:25:36 -08:00
Scott Main
c8a6f8a041 docs: add class on keyboards 
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
 2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80 docs: add explanation of default permissions to Permission guide 
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930
 2012-12-21 16:19:52 -08:00
James Dong
edde28fd09 am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit '5d5526aa86888cb0891f535823dc93e154f38b2e':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-21 14:42:42 -08:00
James Dong
0c1e566f97 am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit 'c8db3b8ae34c76430e8e97418e485dedc44d0954':
  Set "isdrm" info in Mediastore
 2012-12-21 14:42:37 -08:00
The Android Open Source Project
57ebeed61f Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ibb842a678a67174de54e4174345379e67bc7bf8d
 2012-12-21 14:10:56 -08:00
James Dong
5d5526aa86 Merge "Handle errors from AudioEffect::queryNumberEffects" 2012-12-21 14:05:09 -08:00
The Android Automerger
ceb464b6a6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-21 13:46:51 -08:00
James Dong
c8db3b8ae3 Merge "Set "isdrm" info in Mediastore" 2012-12-21 13:34:42 -08:00
kmccormick@google.com
12f2f8dcd7 am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '87d852a84de0d691bce127f65bc7c4ba75883e2e':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:52:28 -08:00
kmccormick@google.com
87d852a84d am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit 'ec6d08475ee1a2020556b43b4698b60dcb56a9c6':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:51:02 -08:00
kmccormick@google.com
ec6d08475e am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '5b03460fcb69394b984fad1a63e244f9aa798886':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:46:03 -08:00
&& repo sync -j8
5b03460fcb Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 2012-12-21 12:43:20 -08:00
Irfan Sheriff
7f93e7d265 am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-21 10:07:24 -08:00
Craig Mautner
2d1eb74a8e Merge "Save most recent thumbnail Bitmap for reuse." 2012-12-20 16:45:06 -08:00
Craig Mautner
b12428a128 Save most recent thumbnail Bitmap for reuse. 
This keeps Recents from taking two identical screenshots, one for
the Recents thumbnail and one for the pause activity thumbnail.

Fixes bug 7351766.

Change-Id: Ia4d12802151666ec36e4d9b395cf10e1e02dc37f
 2012-12-20 16:24:58 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
The Android Open Source Project
a8e4314604 am ac0fd124: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'ac0fd124133b04f555047df8804ecc46ef3751e9':
 2012-12-20 15:50:06 -08:00
The Android Open Source Project
ac0fd12413 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
 2012-12-20 15:46:28 -08:00
Raph Levien
0925131933 Merge "Suppress horizontal scrolling with trailing blanks" 2012-12-20 15:46:23 -08:00
Raph Levien
afe8e9b6d0 Suppress horizontal scrolling with trailing blanks 
The existing behavior of EditText is that trailing blanks can cause a
line to exceed the layout width, causing the cursor to extend past the
line, which in turn causes horizontal scrolling. This patch clamps the
cursor to the layout width in the non-scrolling case, which makes the
spaces effectively invisible when they're at the end of the line, but at
least suppresses the scrolling.

The clamping only works reliably in left-to-right alignments, so this
patch checks for than and only enables the clamping in those cases.

Fix for bug 7699295.

Change-Id: I22bc4e6c9ded3d7716edfcf10dd2b5c31a5da9de
 2012-12-20 15:42:47 -08:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
The Android Automerger
345f7fcfaf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-20 14:31:16 -08:00
Victoria Lease
d07d7fd016 am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit '5ddfa24776f971d45e5fc80189abb3edd715818d':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:49:46 -08:00