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

123215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
f7c12817dc am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'b180bff575b25ab6b692327a3be244310fd90c5e':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:24:28 +00:00
Ricardo Cervera
b180bff575 am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'ccec0906bd358ffa9fbac8f8c882f582c43b6092':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:21:18 +00:00
Ricardo Cervera
ccec0906bd Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 2014-02-04 17:18:59 +00:00
Scott Main
80ddc85515 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
	docs/html/tools/samples/index.jd
 2014-02-04 08:57:20 -08:00
Scott Main
c8f4070018 am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 15:39:46 +00:00
Alan Viverette
8eea3ea559 Add APIs for obtaining themed Drawable from Theme, Context 
BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
 2014-02-03 18:42:24 -08:00
Scott Main
e4cf272967 am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:11:48 +00:00
Alan Viverette
a8b2edec93 Clean up RotateDrawable, add getters and setters for XML properties 
Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c
 2014-02-03 18:08:34 -08:00
Scott Main
5ae21db112 am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:08:28 +00:00
Scott Main
a7f84f3bd4 am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '28a828fa198122a13d053eae2e46f18487818e91':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:06:01 +00:00
Scott Main
28a828fa19 am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '56783a742458968a6ec5daf4d9e7a72f755f5ce5':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:01:33 +00:00
Ruben Brunk
90bc34e5bf camera3: Update maxRegions tag. 
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
 2014-02-03 17:54:24 -08:00
Ruben Brunk
8cff1a370e Merge "camera3: Update awbRegions tag." 2014-02-04 01:18:08 +00:00
Ruben Brunk
f59521d3b1 camera3: Update awbRegions tag. 
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
 2014-02-03 17:14:33 -08:00
Ricardo Cervera
641fc0f751 docs: Added note on multiple build.gradle files. Bug: 12870006 
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
 2014-02-03 17:08:31 -08:00
Scott Main
56783a7424 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
 2014-02-03 17:07:27 -08:00
Glenn Kasten
77c86261ee Add adb over Wi-Fi 
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
 2014-02-03 16:49:34 -08:00
Andy McFadden
0112757995 Merge "Remove setFlags()" 2014-02-04 00:39:16 +00:00
Jake Hamby
8f9b33e776 Add new RIL commands to read/write NV items and reset NV config. 
Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
 2014-02-03 15:52:18 -08:00
Tim Murray
6faecbb8d2 am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit 'fd71ddfd4378de331e231fbe22beb92f1efcd196':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 23:20:03 +00:00
Tim Murray
430986178d am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit '5d331c7c89d2ae7254c06f188cd02f91cd467f45':
  Check that bound allocations are 1D
 2014-02-03 23:19:59 +00:00
Tim Murray
f593000eac am 64788f1b: am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit '64788f1b6857c87a14e67044f51c2405195b407c':
  Fix debug context.
 2014-02-03 23:19:54 +00:00
Tim Murray
63aec6acbf am 4cd7f2d8: am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '4cd7f2d8c745977d3b12fdb26a13a1373832c6b8':
  Enable asynchronous destruction of BaseObjs.
 2014-02-03 23:19:50 +00:00
Tim Murray
2ee23f3dbf am 95b3568d: am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit '95b3568d38c65f556a59aa6e8e35c3e8ef14c356':
  Fix most logging macros for context pointers.
 2014-02-03 23:19:46 +00:00
Tim Murray
02eefa0f4a am d642dbd8: am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit 'd642dbd891ff5a9955de15a5f743ff0bf4baa9a8':
  Fix getBytesSize for YUV allocations.
 2014-02-03 23:19:43 +00:00
Tim Murray
6be5817d42 am 2905039d: am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '2905039d523610c5253b247dd77292c7bda830b7':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-02-03 23:19:38 +00:00
Tim Murray
da1192ae31 am 47f295e8: (-s ours) am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." 
* commit '47f295e8cb26991fe4b1d5f0a218222a0728d9a2':
  Convert Java/JNI to 64-bit, part 2.
 2014-02-03 23:19:34 +00:00
Tim Murray
7d02a5fcb7 am 041c77ac: (-s ours) am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac 
* commit '041c77ac440efc6c61b7d1f68b885ad3a8015237':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
 2014-02-03 23:13:28 +00:00
Tim Murray
4e634bd313 am 923da98f: (-s ours) am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" 
* commit '923da98f792d97638f78f311ac80cac53e306408':
  Use Object + type in place of specific array
 2014-02-03 23:07:29 +00:00
Alan Viverette
e5aea3bb0c Merge "Fix ordering of dimension caching during ImageView.setResource()" 2014-02-03 23:03:20 +00:00
Tim Murray
e0abb66167 am 4e5e654e: (-s ours) am 69914882: am e559d7ee: Merge "Utility API for creating types." 
* commit '4e5e654e7aac2212e40915df16fe6ad8598fb4bc':
  Utility API for creating types.
 2014-02-03 23:01:29 +00:00
Tim Murray
e32f9988be am b0a79d35: am 271c3b74: am b1c1518e: Merge "Remove old hidden API." 
* commit 'b0a79d35929d874628c3e0add672eff498e26b83':
  Remove old hidden API.
 2014-02-03 22:55:18 +00:00
Tim Murray
693265ae55 am a392cdf3: am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." 
* commit 'a392cdf375e4f43bea8c5398ed2b3bc993a31a77':
  Remove hidden API setSurfaceTexture.
 2014-02-03 22:55:13 +00:00
Tim Murray
fd71ddfd43 am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit '6ceac9f099b0ef7ca29351bbefa128df8101b5c2':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 22:45:26 +00:00
Tim Murray
5d331c7c89 am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit 'b1bec0d916c00c7ceb09c691f1e5977909ba698d':
  Check that bound allocations are 1D
 2014-02-03 22:45:23 +00:00
Tim Murray
64788f1b68 am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit '67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
  Fix debug context.
 2014-02-03 22:45:20 +00:00
Tim Murray
4cd7f2d8c7 am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
  Enable asynchronous destruction of BaseObjs.
 2014-02-03 22:45:11 +00:00
Tim Murray
95b3568d38 am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit '42955bab2a275f3ea22d5a50b556cec88697a573':
  Fix most logging macros for context pointers.
 2014-02-03 22:45:08 +00:00
Tim Murray
d642dbd891 am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit 'd39e19eb8af54683d03ae955a5a58fea48a58754':
  Fix getBytesSize for YUV allocations.
 2014-02-03 22:45:05 +00:00
Tim Murray
2905039d52 am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '16e9362e5f5b4f09a46198218380bb386fee28e5':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-02-03 22:45:02 +00:00
Tim Murray
47f295e8cb am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." 
* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
  Convert Java/JNI to 64-bit, part 2.
 2014-02-03 22:44:58 +00:00
Tim Murray
041c77ac44 am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac 
* commit '72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
 2014-02-03 22:44:54 +00:00
Tim Murray
923da98f79 am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" 
* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
  Use Object + type in place of specific array
 2014-02-03 22:44:51 +00:00
Igor Murashkin
eff19d36fc Merge "camera2: Revise android.sensor.maxFrameDuration definition" 2014-02-03 22:44:50 +00:00
Tim Murray
4e5e654e7a am 69914882: am e559d7ee: Merge "Utility API for creating types." 
* commit '69914882509b8ad81c23eadd1ebae53fb532042b':
  Utility API for creating types.
 2014-02-03 22:44:47 +00:00
Tim Murray
b0a79d3592 am 271c3b74: am b1c1518e: Merge "Remove old hidden API." 
* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
  Remove old hidden API.
 2014-02-03 22:44:44 +00:00
Tim Murray
a392cdf375 am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." 
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.
 2014-02-03 22:44:39 +00:00
Tim Murray
6ceac9f099 am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit 'f5294ed57cf388973a1db29b062b1577966f90d1':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 14:41:42 -08:00
Tim Murray
b1bec0d916 am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit '3fb6feacc62e1021c705b53d46e915ecf50582d2':
  Check that bound allocations are 1D
 2014-02-03 14:41:39 -08:00
Tim Murray
67d9e0be8e am 0cc37f4c: Merge "Fix debug context." 
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
  Fix debug context.
 2014-02-03 14:41:30 -08:00