Romain Guy
d315ee93c6
Fix memory leak in LocalActivityManager. Also properly removes embedded activities.
...
Bug #2738247
Change-Id: Ib75be22fde5f1408250947566c69174c6f248c98
2010-06-03 11:03:18 -07:00
Daisuke Miyakawa
d94e4c50b4
Merge "Remove stale and inappropriate dependency."
2010-06-02 13:36:25 -07:00
Jason Sams
b8b1e1fcfa
Merge "Disabble vertex logging. bug 2734616"
2010-06-02 12:41:05 -07:00
Jason Sams
ab67fb9a80
Disabble vertex logging.
...
bug 2734616
Change-Id: Ibad63dfbf0f2ea3c7e475c7cf0689fd487d12be4
2010-06-02 12:40:19 -07:00
Daisuke Miyakawa
4de2d4d154
Remove stale and inappropriate dependency.
...
Change-Id: I2e9412075c157a8649ac06e89a8987a36544d78b
2010-06-02 12:18:17 -07:00
Romain Guy
812ccbeb3c
Add new hardwareAccelerated manifest attribute to enable HW drawing.
...
Change-Id: I2bb0252f3699cb720e7f5b6868419c9904e4fb35
2010-06-02 10:41:59 -07:00
The Android Open Source Project
76b704982a
am 8f1259be: am b705eea7: am 1bd7597b: merge from open-source master
2010-06-02 09:06:34 -07:00
The Android Open Source Project
8f1259bec9
am b705eea7: am 1bd7597b: merge from open-source master
2010-06-02 09:05:18 -07:00
The Android Open Source Project
b705eea702
am 1bd7597b: merge from open-source master
...
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken
* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
Replaced raw string arguments for Context.getSystemService() with final Context variables
2010-06-02 09:03:04 -07:00
The Android Open Source Project
ed06eccce0
am afca60dd: am 59c82376: am c8763858: merge from open-source master
2010-06-02 08:58:37 -07:00
The Android Open Source Project
afca60ddfd
am 59c82376: am c8763858: merge from open-source master
2010-06-02 08:56:19 -07:00
The Android Open Source Project
59c82376e5
am c8763858: merge from open-source master
...
Merge commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken
* commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
Fix for issue 895 (missing android: prefix), Removed unused imports
2010-06-02 08:54:59 -07:00
The Android Open Source Project
1bd7597b8c
merge from open-source master
...
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
2010-06-02 08:54:47 -07:00
The Android Open Source Project
c8763858cf
merge from open-source master
...
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
2010-06-02 08:41:59 -07:00
Ben Murdoch
347d50fb1f
Merge "Frameworks changes to enable File Reader and blob.slice APIs."
2010-06-02 04:29:39 -07:00
Grace Kloba
c46efdb9b4
Merge "If the WebView can't be scaled, don't check for double tap. This will make the click event on the non-scalable page much responsive."
2010-06-01 22:58:49 -07:00
Kenny Root
cc4ecb69bc
am 112ad01d: am 501b2b40: am a6703415: am 85fb2066: Amend previous ndc commit
2010-06-01 20:58:30 -07:00
Kenny Root
112ad01dbb
am 501b2b40: am a6703415: am 85fb2066: Amend previous ndc commit
2010-06-01 20:55:59 -07:00
Kenny Root
501b2b400a
am a6703415: am 85fb2066: Amend previous ndc commit
...
Merge commit 'a6703415ead229d6387973c25f5b833cefd26e9b' into kraken
* commit 'a6703415ead229d6387973c25f5b833cefd26e9b':
Amend previous ndc commit
2010-06-01 20:54:21 -07:00
Kenny Root
a6703415ea
am 85fb2066: Amend previous ndc commit
...
Merge commit '85fb20665feadda526ad422c093b859e8c4d40bc' into froyo-plus-aosp
* commit '85fb20665feadda526ad422c093b859e8c4d40bc':
Amend previous ndc commit
2010-06-01 20:52:38 -07:00
Kenny Root
85fb20665f
Amend previous ndc commit
...
Submitted wrong patchset. This includes the delta for the latest
patchset.
Change-Id: I30f8fa1503cda2459ec7284eb9fa199c9fd5ef9b
2010-06-01 20:50:21 -07:00
Kenny Root
3507a887aa
am dcb1901f: am 7c1cf2e2: am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo
2010-06-01 20:01:52 -07:00
Kenny Root
dcb1901f52
am 7c1cf2e2: am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo
2010-06-01 19:59:57 -07:00
Kenny Root
7c1cf2e27d
am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo
...
Merge commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a' into kraken
* commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a':
Add more error checking for ndc
2010-06-01 19:58:32 -07:00
Kenny Root
847b82d8a6
am 89bc1395: Merge "Add more error checking for ndc" into froyo
...
Merge commit '89bc1395748a0a139db82adbf01166ed6fa79766' into froyo-plus-aosp
* commit '89bc1395748a0a139db82adbf01166ed6fa79766': (392 commits)
Add more error checking for ndc
Add javadoc for camera scene modes.
more clean-up in preparation of bigger changes
Fix a typo in Singleton<>
Avoid copying for input recording frames in CameraSource
Add video frame parameter.
more clean-up of Surfaceflinger's client management
Better sniffing of MPEG4 content by checking for a compatible sub-brand.
Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
Add support for gps altitude EXIF tags.
minor clean-up GLclampx -> GLclampf
clean-up dead-code
Make sure to use filtering while in fixed-size mode
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
Avoid repeatedly allocating and freeing memory in CameraSource
After failing to create an AudioTrack, only stop the source if we were the ones starting it.
Convert a number of assertions into runtime errors (OggExtractor)
fix [2712278] The preview buffer left some black borders in left and bottom edges
Fix 2667859: change text back to default size
Support for thumbnail extraction in the Matroska extractor.
...
2010-06-01 19:56:42 -07:00
Kenny Root
89bc139574
Merge "Add more error checking for ndc" into froyo
2010-06-01 19:55:01 -07:00
Grace Kloba
ec9a104ce9
If the WebView can't be scaled, don't check for
...
double tap. This will make the click event on the
non-scalable page much responsive.
Fix http://b/issue?id=2645880
2010-06-01 19:00:23 -07:00
Grace Kloba
6660740cfa
Merge "Expose canZoomIn and canZoomOut for WebView."
2010-06-01 17:23:37 -07:00
Konstantin Lopyrev
10280fc8fa
Merge "Fix 2571872: Showing an error message on wrong password/pin entered."
2010-06-01 17:14:13 -07:00
Konstantin Lopyrev
f9a166ab82
Fix 2571872: Showing an error message on wrong password/pin entered.
...
Change-Id: I78463112326ebd1ac7d43d083e22d506518e84fd
2010-06-01 17:00:47 -07:00
Jason Sams
be5cd38a84
Merge "Remove RS_KIND from vertex arrays types. Legacy vertex programs now bind by name just like the user programs. This removes the need for two different ways of declairing the same information."
2010-06-01 16:58:25 -07:00
Jason Sams
9e83c02917
Merge "types update."
2010-06-01 16:58:15 -07:00
Mathias Agopian
491271d3f5
am 7258fd92: am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken
2010-06-01 16:11:31 -07:00
Dirk Dougherty
2e477f02dd
am 27d1e656: am 1b9dcb7b: am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 16:11:12 -07:00
Dan Egnor
dd27f14da2
am b8dd6b19: am 1e1e292e: am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 16:10:49 -07:00
Andreas Huber
06ea159849
am 7bd9a6a5: am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth.
2010-06-01 16:10:29 -07:00
Dirk Dougherty
d645a0fbfc
am d64263b7: am 7fad207e: am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 16:10:01 -07:00
Grace Kloba
6164ef1b78
Expose canZoomIn and canZoomOut for WebView.
2010-06-01 16:09:58 -07:00
Wu-cheng Li
e28f7b80d3
am c3cfd10a: am 00e21f8e: Add javadoc for camera scene modes.
2010-06-01 16:09:32 -07:00
Mathias Agopian
bd69e1b851
am 5220af87: am 770492cb: more clean-up in preparation of bigger changes
2010-06-01 16:08:48 -07:00
Mathias Agopian
6c2faea435
am 4f0a9114: am cdfd5fe2: Fix a typo in Singleton<>
2010-06-01 16:08:16 -07:00
Mathias Agopian
7258fd92d0
am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken
2010-06-01 16:01:29 -07:00
Mathias Agopian
5be7de5f62
Merge "fix a bug where fading in/out of opaque 32-bits windows wasn't working" into kraken
2010-06-01 16:00:07 -07:00
Mathias Agopian
a0612e41dd
fix a bug where fading in/out of opaque 32-bits windows wasn't working
...
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).
we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
2010-06-01 15:57:44 -07:00
Dirk Dougherty
27d1e6568f
am 1b9dcb7b: am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:48:52 -07:00
Jason Sams
8cb39de03a
Remove RS_KIND from vertex arrays types.
...
Legacy vertex programs now bind by name just like the user programs.
This removes the need for two different ways of declairing the same
information.
Change-Id: I0178c0962842a1bbffb6726984ae1b8f5bb7529c
2010-06-01 15:47:01 -07:00
Dirk Dougherty
1b9dcb7b8e
am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:46:53 -07:00
Dirk Dougherty
8799cdfb01
am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:45:24 -07:00
Dirk Dougherty
de56c27dab
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:44:02 -07:00
Dan Egnor
b8dd6b19be
am 1e1e292e: am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 15:31:26 -07:00