Victoria Lease
5ddfa24776
am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
...
* commit 'fc56015bd3d86e470fdf3ac8449776809124875e':
Possible leak in android_emoji_EmojiFactory_newInstance
2012-12-20 13:47:07 -08:00
Dirk Dougherty
9ed5fd4cb7
am b7f4bf36: am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
...
* commit 'b7f4bf3604df8f3181931835a5dfc414c3072749':
Doc change: point developer landing page featured content to blog post.
2012-12-20 13:29:38 -08:00
Scott Main
b23955be38
am d1ecaf39: am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit 'd1ecaf399d60395c4af4f53edba6de348004b6d3':
docs: SDK r21.0.1 Release Notes
2012-12-20 13:29:33 -08:00
You Kim
218a313bb0
StringBlock_nativeCreate: Possible Leak
...
osb can be leaked when osb->getError() != NO_ERROR
Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
2012-12-21 06:19:38 +09:00
Dirk Dougherty
b7f4bf3604
am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
...
* commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543':
Doc change: point developer landing page featured content to blog post.
2012-12-20 12:55:39 -08:00
Dirk Dougherty
f6c71644dc
am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
...
* commit 'e487e537b0fcc5b9f972c1e247fd1b019150fa05':
Doc change: point developer landing page featured content to blog post.
2012-12-20 12:53:16 -08:00
Dirk Dougherty
e487e537b0
am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
...
* commit '0402b65327aa568c7ea706879d9ddb222436aa87':
Doc change: point developer landing page featured content to blog post.
2012-12-20 12:49:22 -08:00
Dirk Dougherty
0402b65327
Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
2012-12-20 12:46:00 -08:00
Dirk Dougherty
0f08867b93
Doc change: point developer landing page featured content to blog post.
...
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
2012-12-20 12:40:22 -08:00
Scott Main
d1ecaf399d
am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5':
docs: SDK r21.0.1 Release Notes
2012-12-20 12:17:33 -08:00
Scott Main
15423b204d
am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '226e973f3946778078840db46274a2c34b30a6b0':
docs: SDK r21.0.1 Release Notes
2012-12-20 12:15:25 -08:00
Scott Main
226e973f39
am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3':
docs: SDK r21.0.1 Release Notes
2012-12-20 12:12:03 -08:00
Scott Main
732e2de1a0
am 0aa3df58: am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit '0aa3df583f81de90078258781a95fff40237c499':
docs: NDK r8d Release Notes
2012-12-20 12:11:02 -08:00
Victoria Lease
fc56015bd3
Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
2012-12-20 12:09:48 -08:00
Scott Main
0aa3df583f
am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e':
docs: NDK r8d Release Notes
2012-12-20 12:09:13 -08:00
Scott Main
c3261bd840
am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit '76f7774db8e8cba1ad06018f42edf21b8c77131c':
docs: NDK r8d Release Notes
2012-12-20 12:07:58 -08:00
Scott Main
76f7774db8
am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit 'f6e551239017745f88893acaf38b3bac097aceb1':
docs: NDK r8d Release Notes
2012-12-20 12:04:57 -08:00
Scott Main
8afb3ba4da
Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
2012-12-20 12:03:53 -08:00
Scott Main
f6e5512390
Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
2012-12-20 12:02:29 -08:00
Andrew Hsieh
d20df4de9a
am 38dd88ef: am 62ec9588: Merge "Fix typo"
...
* commit '38dd88ef6cecbbe0e344b64741990735f96fbb0c':
Fix typo
2012-12-20 11:07:08 -08:00
Glenn Kasten
8548749404
am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"
...
* commit '2326be4fa9cb3b523a3ea13875e91bdc437da33d':
Leak in ToneGenerator_native_setup
2012-12-20 11:07:04 -08:00
Andrew Hsieh
38dd88ef6c
am 62ec9588: Merge "Fix typo"
...
* commit '62ec9588650327f4fc3f367097b9549635229239':
Fix typo
2012-12-20 11:03:46 -08:00
Glenn Kasten
2326be4fa9
am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"
...
* commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf':
Leak in ToneGenerator_native_setup
2012-12-20 11:03:33 -08:00
Stephen Hines
696a5e04ea
Merge "We can only optimize bitmaps that have USAGE_SHARED."
2012-12-20 10:25:04 -08:00
Craig Mautner
72669d1801
Fixes to clean up icon launching during animations.
...
Several problems were causing animations to jump to the end when
launching an app while a previous app was animating away.
- Keep the two app token lists in tighter synch. These were separated
when we hoped to completely separate layout form animation. This is
not as critical a goal any more.
- Use new test criteria for starting and stopping animations.
Bug 7885350 fixed.
Change-Id: Ib679117f627d0957cda17cc6ffca2bc2cdd6ecdd
2012-12-20 10:15:58 -08:00
Craig Mautner
5b88cd7218
Merge "Fade recents thumbnail to transparent earlier."
2012-12-20 09:48:37 -08:00
Dirk Dougherty
fa0f9be8c5
am 0943862c: am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev
...
* commit '0943862cf5025c74f5343ded76c8d6aaa0abeaa1':
Doc change: update develop landing page.
2012-12-20 09:42:45 -08:00
Dirk Dougherty
0943862cf5
am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev
...
* commit 'edafbe798e7daf18a109fa234b11fe2351c8fe27':
Doc change: update develop landing page.
2012-12-20 09:41:02 -08:00
Dirk Dougherty
edafbe798e
am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev
...
* commit 'a232fa3f831a9ae104c492d321be580ea0c7770e':
Doc change: update develop landing page.
2012-12-20 09:38:56 -08:00
Dirk Dougherty
a232fa3f83
am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev
...
* commit '0f0d9b32cb41acc2e7b0b5556c64b366f5f08709':
Doc change: update develop landing page.
2012-12-20 09:34:47 -08:00
Craig Mautner
321bdf52a1
Fade recents thumbnail to transparent earlier.
...
- Reduce the gpu load by fading the recents thumbnail to an alpha of
0.0 before the remaining animations are completed. When alpha hits
0 the gpu treats the layer as hidden and can render the remaining
layers faster.
- Refactoring of animations to:
o Remove unused setInterpolator() calls on AnimationSet constituents.
o Remove unnecessary setFillBefore() calls.
o Consolidate setDuration() calls into AnimationSet.
o Create Interpolators once.
o Group animation set calls with their Animations.
o Use same animation timing and Interpolator for all animations.
This is a partial fix for 7729214.
Change-Id: Ic3c47bcf7c84944128effb699efcdd1f89200fc4
2012-12-20 09:32:02 -08:00
Dirk Dougherty
0f0d9b32cb
Merge "Doc change: update develop landing page." into jb-mr1-dev
2012-12-20 09:28:37 -08:00
Stephen Hines
d34dc85f8f
We can only optimize bitmaps that have USAGE_SHARED.
...
Change-Id: I1149a9e25738da5ee348e3c18e7fdd7c1948e89e
2012-12-19 19:34:17 -08:00
Craig Mautner
a2303750fb
Merge changes I1dfe21e5,Ia0218bf8
...
* changes:
Clean up warnings.
Minor refactorings.
2012-12-19 16:40:18 -08:00
Siva Velusamy
0c1761bd37
DdmServer: add controls for OpenGL tracing
...
Add a new JDWP packet to allow control of OpenGL tracing.
Change-Id: Ic89e2f6299238a612df2f914581049f2cbba088c
2012-12-19 16:31:56 -08:00
Scott Main
1d25430c95
am f36ced0a: am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
...
* commit 'f36ced0a8c38098eff5dc3652b35b4d527d02aab':
Doc change: add mention of localized promo graphics.
2012-12-19 16:23:42 -08:00
Scott Main
f36ced0a8c
am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
...
* commit 'a6cf72d8ce00b27f00c59ccd34b775cdaf92341e':
Doc change: add mention of localized promo graphics.
2012-12-19 16:21:38 -08:00
Scott Main
a6cf72d8ce
am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
...
* commit '18ac55709de6714459c89086b6924bb697470999':
Doc change: add mention of localized promo graphics.
2012-12-19 16:19:11 -08:00
Scott Main
18ac55709d
am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
...
* commit 'db49d317291861d8f885f3510f9b70b31e592f11':
Doc change: add mention of localized promo graphics.
2012-12-19 16:15:08 -08:00
Scott Main
db49d31729
Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
2012-12-19 16:12:18 -08:00
Andrew Hsieh
62ec958865
Merge "Fix typo"
2012-12-19 16:10:12 -08:00
Marco Nelissen
eca3eb5983
Merge "Don't create weird ByteBuffers"
2012-12-19 15:40:47 -08:00
Marco Nelissen
cbbea8e651
Don't create weird ByteBuffers
...
Ensure that we don't create ByteBuffers with a NULL memory pointer
but nonzero size.
b/7892060
Change-Id: I2fc52e19fd05e698c38d94275e738e23a2999e1f
2012-12-19 14:59:12 -08:00
The Android Open Source Project
6465b03fff
am e25bb3c4: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'e25bb3c44ff27aad753b7a5cb74d5015f327e441':
2012-12-19 14:00:18 -08:00
The Android Open Source Project
e25bb3c44f
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I1bfd455eca23e774d85c3af0ae06d8005218ddbb
2012-12-19 13:58:55 -08:00
The Android Automerger
2d6ed407a7
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-19 13:51:03 -08:00
Tim Murray
0562a0dcc1
Merge "Add USAGE_SHARED for Allocations."
2012-12-19 13:03:38 -08:00
Tim Murray
00bb454bd0
Add USAGE_SHARED for Allocations.
...
Change-Id: I61efafffaa649df68762d9ae29e029cd1e1bc6bc
2012-12-19 13:01:03 -08:00
Tim Murray
e78fb2c680
Merge "Switch to simpler createFromBitmap in ImageProcessing."
2012-12-19 11:59:27 -08:00
Justin Koh
e422737fda
am a90c92a1: am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev
...
* commit 'a90c92a1c97830de5e1766bb64ff421a2a50ed56':
Start RecognitionActivity with an upswipe gesture.
2012-12-19 11:48:41 -08:00