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

101166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
a0d99936ff Reconcile with jb-mr2-release - do not merge 
Change-Id: I23e62c9126054bf0b34fe9125bca81bf6791006f
 2013-03-05 07:53:23 -08:00
Adam Koch
ab999fe44f am 25a3b1dd: am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '25a3b1ddeb470737ba8d05baabd6f3e5ad394ab0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 14:40:20 +00:00
Adam Koch
25a3b1ddeb am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit 'cc3fec699d9fdf57a080106e6ca7b3ae845f1446':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 14:38:30 +00:00
Adam Koch
cc3fec699d am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '0c8dfd7d281d037df3d427ccb6bf4642b2617a63':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:36:31 -08:00
Adam Koch
0c8dfd7d28 am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1061c578b1a341ecb7286009daa9173e0b7e0dc0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:33:56 -08:00
Adam Koch
1061c578b1 am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '095aa4b611472f64bdbd1499d05b747cebc3f792':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:32:13 -08:00
Adam Koch
095aa4b611 am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:30:03 -08:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
The Android Automerger
4017550be9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-05 05:55:36 -08:00
Marco Nelissen
8c6b3b93e2 am daa95754: am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'daa95754a53a9f90c4afaa4eccdc25f08fd2d264':
  Performance increase in thumbnail handling
 2013-03-05 05:42:37 +00:00
Marco Nelissen
daa95754a5 am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit '056c610c9ba83fbf68e15fa4557620dc7820f087':
  Performance increase in thumbnail handling
 2013-03-05 05:40:40 +00:00
Romain Guy
370929f4bf am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 
* commit 'd23b2747eff9ae3203f96039794068e9f1b0c71b':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
 2013-03-05 03:14:14 +00:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas 
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
 2013-03-04 19:08:02 -08:00
Mathias Agopian
e94fcd6c49 am 188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 
* commit '188f8c5e4b266429b07b4381d58d33b1e771be48':
  screenshots can now go into a Surface from java
 2013-03-05 02:35:07 +00:00
Mathias Agopian
188f8c5e4b Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 2013-03-05 02:31:15 +00:00
Romain Guy
e89156968d am 836f93dc: Merge "Never resize a Bitmap down to 0 at load time Bug #8313929" into jb-mr2-dev 
* commit '836f93dc5f00536baa56f7c035c424a130f9c2a3':
  Never resize a Bitmap down to 0 at load time Bug #8313929
 2013-03-05 02:02:03 +00:00
Romain Guy
836f93dc5f Merge "Never resize a Bitmap down to 0 at load time Bug #8313929" into jb-mr2-dev 2013-03-05 01:57:26 +00:00
Romain Guy
fe28ef84f2 Never resize a Bitmap down to 0 at load time 
Bug #8313929

Change-Id: Ic9b691319f162228c72ad1afed4dfe0b4181c422
 2013-03-04 17:55:55 -08:00
Mathias Agopian
0449a40586 screenshots can now go into a Surface from java 
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
 2013-03-04 17:45:26 -08:00
Brian Carlstrom
31167ffb2d am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '42ca4975dc6ec2c206f8e7e883e1d0d549b44c95':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 01:00:06 +00:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 00:56:05 +00:00
Marco Nelissen
056c610c9b am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
  Performance increase in thumbnail handling
 2013-03-04 16:31:26 -08:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Jeff Sharkey
cab8201526 am a096f241: am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'a096f241657eec46c1202f9194907efb7073e247':
  Tighten enforcement of file modes.
 2013-03-05 00:01:37 +00:00
Jeff Sharkey
a096f24165 am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '237940a0923ff7642cf2a043e65950297e91cf75':
  Tighten enforcement of file modes.
 2013-03-04 23:56:56 +00:00
Dave Burke
1976dd91ed am 71f6426a: Merge "Add nullness check." into jb-mr2-dev 
* commit '71f6426ac3787f22a0078ed42dbf8f568eebf2f8':
  Add nullness check.
 2013-03-04 23:37:48 +00:00
Dave Burke
71f6426ac3 Merge "Add nullness check." into jb-mr2-dev 2013-03-04 23:33:26 +00:00
Dave Burke
c9b6be7c40 Add nullness check. 
Bug: 8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
 2013-03-04 15:20:42 -08:00
Nick Kralevich
0e5b5f6619 am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 
* commit '0841c4cbdcedd32bfea4126d17876c6c892875e8':
  EntropyMixer: Write entropy at shutdown / reboot / power
 2013-03-04 22:44:03 +00:00
Irfan Sheriff
bfadb84f9d am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev 
* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine
 2013-03-04 22:40:35 +00:00
Nick Kralevich
0841c4cbdc Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 2013-03-04 22:40:17 +00:00
Irfan Sheriff
f9d3020c57 Merge "Clean up statemachine" into jb-mr2-dev 2013-03-04 22:38:30 +00:00
Christopher Tate
f9ed8be17d am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev 
* commit '8edd78499e2656916e89eeae91aa0f023f69eddc':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached
 2013-03-04 22:13:33 +00:00
Christopher Tate
8edd78499e Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev 2013-03-04 22:11:43 +00:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached 
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
 2013-03-04 14:02:29 -08:00
Romain Guy
f2f3988ecb am e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 
* commit 'e7d32b19b46c65ff37001e456bedf68222599119':
  Take text scale/skew into account only when rendering into a layer
 2013-03-04 21:53:42 +00:00
Romain Guy
e7d32b19b4 Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 2013-03-04 21:49:16 +00:00
Romain Guy
19d4dd8599 Take text scale/skew into account only when rendering into a layer 
3D rotations can undo scale/skew transforms; since FreeType only accepts
2x2 matrices we can end up generating very large glyphs that are drawn
at a 1:1 scale on screen. For instance, if the current transform has a
scale of 2000 set on both X and Y axis and a perspective Z factor set to
Z, the actual scale factor on screen ends up being 1. We would however
generate glyphs with a scale factor of 2000 causing the font renderer
to blow up.

Change-Id: Ia5c3618d36644e817825cb9c89e2f53aece2074e
 2013-03-04 13:48:43 -08:00
Nick Kralevich
79619ddbfe EntropyMixer: Write entropy at shutdown / reboot / power 
Write out entropy if we're shutting down or rebooting,
or if someone plugs in the power.

Bug: 8312061
Change-Id: Id9a48064a7bdfe6c05a9227ea95a1bdbd0e9b8ae
 2013-03-04 13:46:45 -08:00
Irfan Sheriff
fd7adc58ec Clean up statemachine 
- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs

Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
 2013-03-04 13:41:50 -08:00
Ben Murdoch
87adbaa3e0 am 4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 
* commit '4c333e177220387cf6746d47e1948bbfcc374512':
  Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
 2013-03-04 19:43:37 +00:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
The Android Open Source Project
e5e78ccb3d Reconcile with jb-mr2-release - do not merge 
Change-Id: I1bf36dd86f8c7a12978de0de6d9c19ec615f78e6
 2013-03-04 11:06:41 -08:00
Chris Craik
3e7dbf5373 Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev 2013-03-04 18:58:19 +00:00
JP Abgrall
62f16bfc5e jni: net.TrafficStats: fix getIfaceStat, have it use the iface. 
Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
 2013-03-04 18:53:07 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-04 10:52:49 -08:00
Chris Craik
a5ef27da95 Document that degenerate lines wont be drawn 
bug:7658830

Skia and the HW acceleration path don't render anything for degenerate
lines.

Change-Id: I5ea6fe8f16533e5045a7cd10475f4240f6c311b6
 2013-03-04 10:41:55 -08:00
Irfan Sheriff
d2bfa3bdc0 Merge "Fix copy constructor" into jb-mr2-dev 2013-03-04 18:32:49 +00:00
Irfan Sheriff
90082124aa Fix copy constructor 
Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
 2013-03-04 10:28:42 -08:00