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

123104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
c8577b384a Merge "Revert "Cache display lists for Drawables"" 2014-01-31 21:07:51 +00:00
Alan Viverette
fe0ea8c21f Merge "Allow specification of View theme override as a theme attribute" 2014-01-31 21:05:24 +00:00
Alan Viverette
16f1d81d47 Revert "Cache display lists for Drawables" 
This reverts commit c062c7003f34999632fe4ad721dcd47cd71b2159.

Change-Id: I96d4f0482b927101f52140b667f4c38ffc8687f5
 2014-01-31 13:04:38 -08:00
Alan Viverette
14a11eeeff Merge "Simplify GradientDrawable's use of ColorStateList" 2014-01-31 21:01:01 +00:00
Alan Viverette
40df781539 Simplify GradientDrawable's use of ColorStateList 
BUG: 12816352
Change-Id: Icff432ee5d460ca733866185b8bf61fd50248cfc
 2014-01-31 12:58:43 -08:00
Jason Sams
cf9c894a9b Check that bound allocations are 1D 
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.

Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
 2014-01-31 12:35:19 -08:00
Tim Murray
b75c27e870 Fix debug context. 
bug 12477551

Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
 2014-01-31 12:35:19 -08:00
Tim Murray
504abb3626 Enable asynchronous destruction of BaseObjs. 
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c

Conflicts:
	rs/java/android/renderscript/BaseObj.java
 2014-01-31 12:35:18 -08:00
Tim Murray
e926dddb21 Fix most logging macros for context pointers. 
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
 2014-01-31 12:35:18 -08:00
Tim Murray
e6eaaf6a8e Fix getBytesSize for YUV allocations. 
bug 12134914

Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
 2014-01-31 12:35:17 -08:00
Tim Murray
355707e4f6 Move RenderScript from graphics/ to new fw/base subdirectory rs. 
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
 2014-01-31 12:35:17 -08:00
John Spurlock
17b79985f4 am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit '47e276db2a938ca4ff9767cba28062b892e81629':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-01-31 20:25:40 +00:00
John Spurlock
47e276db2a am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit 'cbd156c1d574dfe5eced42ec640989ab7de7d5e7':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-01-31 20:19:41 +00:00
John Spurlock
cbd156c1d5 Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 2014-01-31 20:17:49 +00:00
Craig Mautner
624e98f539 am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit 'd5f1fcb7a4d6cc11b727bdf79fab7693a5dd7117':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-01-31 19:32:18 +00:00
Craig Mautner
d5f1fcb7a4 am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit '56bf2f670c800f569fc72102e79fd555b6102677':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-01-31 19:26:17 +00:00
Craig Mautner
56bf2f670c Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 2014-01-31 19:23:36 +00:00
Alan Viverette
8b725dcbe1 Merge "Improve encapsulation of Resources" 2014-01-31 19:22:24 +00:00
Craig Mautner
e1f3fa2482 Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage 
Fixes bug 12592453.

Change-Id: Ib64559727d59b3433c3753f9fda88329effc7e26
 2014-01-31 11:20:40 -08:00
Chris Wren
5c57c44eea Merge "record the notification style" 2014-01-31 19:19:23 +00:00
Alan Viverette
562a6a8d83 Improve encapsulation of Resources 
Change-Id: Ic408915d2695ac8906231da1d2dc127f94bdd0cc
 2014-01-31 11:18:28 -08:00
Tim Murray
7a629fac82 Convert Java/JNI to 64-bit, part 2. 
This changes BaseObj to support 64-bit IDs. There are a few caveats:

1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.

bug 11332320

Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
 2014-01-31 11:16:09 -08:00
Tim Murray
a78e9adb86 Convert Java/JNI to 64-bit, part 1. 
This converts context and device storage to use long instead of int.

bug 11332320

Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
 2014-01-31 11:15:33 -08:00
Jason Sams
29868dfae2 Add long/double read support. 
Change-Id: I1957f7ac18262a3004a4adcb7c31055212e483c2
 2014-01-31 11:15:27 -08:00
Jason Sams
6fcf2e196b Use Object + type in place of specific array 
Changed to avoid the explosion of entry points in the JNI layer.

Change-Id: I7d6cc565c8853b06560eb891fdd5e8acf05c9779
 2014-01-31 11:14:47 -08:00
John Spurlock
4fda2d5ab7 Update READ&WRITE_DREAM_STATE to signature|system. 
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
 2014-01-31 14:14:19 -05:00
Jason Sams
4b7f37891b Utility API for creating types. 
Change-Id: I3263cb4440ef3a60cd418f0559b8c5638a9b8bf3
 2014-01-31 11:14:09 -08:00
Jason Sams
2e05973560 Remove old hidden API. 
This was never shipped and long since replaced by ioReceive().

Change-Id: Ieba7fd4305c2c561cc36154c57414783e4bf502b
 2014-01-31 11:12:53 -08:00
Jason Sams
1887d523a5 Remove hidden API setSurfaceTexture. 
Change-Id: Ib6a3c5b84550932168f314375e74059507fc01ae
 2014-01-31 11:12:39 -08:00
Chris Craik
494db9e4bb Merge "Simplify umbra calculation" 2014-01-31 18:57:25 +00:00
Chris Craik
1d89563ff8 Merge "Add initial hidden outline APIs" 2014-01-31 18:56:41 +00:00
Chris Craik
12d9526dd2 Simplify umbra calculation 
Reuse pre-computed values

Change-Id: Ia7725be0ec3ac58af477fcb8de375f5faa05abf4
 2014-01-31 10:43:42 -08:00
Chris Wren
91ad563da3 record the notification style 
Bug: 10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
 2014-01-31 12:15:03 -05:00
Narayan Kamath
90b8eaa68b am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 17:12:42 +00:00
Narayan Kamath
8396b56e0a am d49babe5: (-s ours) am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit 'd49babe50d61e0264a9f4fbf0b4e182cc56635db':
  Change ResourceType cookies to int32_t.
 2014-01-31 17:12:38 +00:00
Narayan Kamath
fd6a44d0b5 am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'ff62e966b60bb20dc7c3384485816b1e7bf06057':
  Fixed cancel() not working correctly
 2014-01-31 16:41:42 +00:00
Igor Murashkin
5ec133b9a0 am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit 'ed5d7a6f147c75c8af73328bdf816707b58afd90':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 16:41:38 +00:00
Narayan Kamath
797b5adcb4 am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 16:29:23 +00:00
Narayan Kamath
d49babe50d am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.
 2014-01-31 16:29:19 +00:00
Narayan Kamath
ff62e966b6 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
 2014-01-31 16:29:16 +00:00
Igor Murashkin
ed5d7a6f14 am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 16:29:06 +00:00
George Mount
56f57ccbd4 Revert "Add Path trimming." 
Bug 12489442
This reverts commit 7fe03a267e6edb65142444765ce29ad5ff126052.

Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
 2014-01-31 07:54:53 -08:00
Narayan Kamath
77a1986c69 am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 07:30:21 -08:00
Narayan Kamath
9af955744d am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '1cadc07dd1e3711fb1e57548038e3026682c5ef8':
  Change ResourceType cookies to int32_t.
 2014-01-31 07:30:18 -08:00
Narayan Kamath
149510e010 am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'b9f960e094d53440be5c7e8759a74dbb0ab57317':
  Fixed cancel() not working correctly
 2014-01-31 07:30:15 -08:00
Igor Murashkin
4463a4ef26 am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit 'e05b7b50e234e8ed2471f5ad96bb3d715067e9f3':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 07:30:12 -08:00
Zhijun He
10586ad2a6 am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '4f840dd16db41a2d4442667193d57260f84af04a':
  Release locked buffer when it fails to acquire graphics buffer
 2014-01-31 15:12:38 +00:00
Narayan Kamath
b9fd12ac53 am dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp 
* commit 'dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 15:12:34 +00:00
Narayan Kamath
3a5e470553 am 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit '5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-31 15:12:30 +00:00
Narayan Kamath
13701e4822 am 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit '133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
  change Surface constructor arg to 64bit
 2014-01-31 15:06:21 +00:00