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

119334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
34b84e691c am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:00:43 +00:00
Stephen Hines
eadd69413a am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89':
  Add message to RS docs about application vs. library packaging.
 2014-02-04 17:57:11 -08:00
Stephen Hines
bc80e40b16 Merge "Add message to RS docs about application vs. library packaging." 2014-02-05 01:52:32 +00:00
Scott Main
555e1c9c00 add google cast feature page 
edit other feature pages for consistent call to action paragraph
and remove 'preview' notice from Drive page

Change-Id: I75f1f24fbae51852246ae0624b355aa23b14e60a
 2014-02-04 17:43:52 -08:00
Craig Mautner
323601475e am df88d730: Add IIntentSender to ActivityContainer.startActivity 
* commit 'df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
  Add IIntentSender to ActivityContainer.startActivity
 2014-02-04 23:38:28 +00:00
Craig Mautner
df88d73092 Add IIntentSender to ActivityContainer.startActivity 
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.

Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.

Fixes bug 12747909.

Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
 2014-02-04 15:10:13 -08:00
Scott Main
35a2545547 am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '70f908d7af916bf0e5b6af2913752dca431b837f':
  dashbaord update for feb '14
 2014-02-04 19:25:04 +00:00
Scott Main
70f908d7af am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '3e80914d1683d1641fd6a01f14f126452e17f5c7':
  dashbaord update for feb '14
 2014-02-04 19:22:02 +00:00
Scott Main
3e80914d16 am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit 'eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
  dashbaord update for feb '14
 2014-02-04 19:19:38 +00:00
Scott Main
eea15edcd4 am 749120f3: dashbaord update for feb \'14 
* commit '749120f39bdac49a96771d06d25b7f9edf70be67':
  dashbaord update for feb '14
 2014-02-04 19:15:36 +00:00
Scott Main
749120f39b dashbaord update for feb '14 
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
 2014-02-04 10:57:47 -08:00
Glenn Kasten
9d2ad12181 am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '830d4ffcb79fd2a676942a87d9fe661725d745f3':
  Add adb over Wi-Fi
 2014-02-04 18:40:09 +00:00
Adam Lesinski
1b5b60d696 am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)
 2014-02-04 18:36:10 +00:00
Glenn Kasten
830d4ffcb7 am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
  Add adb over Wi-Fi
 2014-02-04 18:35:30 +00:00
Glenn Kasten
74dc4bd09e am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '983a9381b87519ddd1c6e12e44a8762dc805894a':
  Add adb over Wi-Fi
 2014-02-04 18:32:10 +00:00
Adam Lesinski
203356a34a Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 2014-02-04 18:31:23 +00:00
Glenn Kasten
983a9381b8 am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '11263b24230a0d5db363d76ad199d692bcff1b35':
  Add adb over Wi-Fi
 2014-02-04 18:29:17 +00:00
Glenn Kasten
11263b2423 Merge "Add adb over Wi-Fi" into klp-docs 2014-02-04 18:27:13 +00:00
Ricardo Cervera
1441acdd6d am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit '6dea46b2e567f614244100f542dce04e44c26bee':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:29:40 +00:00
Ricardo Cervera
6dea46b2e5 am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:26:58 +00:00
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
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
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
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
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
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
Tim Murray
42e4aee598 am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
  Enable asynchronous destruction of BaseObjs.
 2014-02-03 14:41:27 -08:00
Tim Murray
42955bab2a am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit 'd8b4dd9555e987df92206562061080b327598f41':
  Fix most logging macros for context pointers.
 2014-02-03 14:41:24 -08:00
Tim Murray
d39e19eb8a am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit '351879df3aff02987a6f4c4485bf004a96fcb150':
  Fix getBytesSize for YUV allocations.
 2014-02-03 14:41:21 -08:00
Tim Murray
16e9362e5f am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '8fced3174ad45e5d618f28c82d69bd21261f6108':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-02-03 14:41:17 -08:00