Commit Graph

16830 Commits

Author SHA1 Message Date
Scott Main
e66d578d71 Merge "docs: a couple doc bug fixes" into froyo 2010-06-02 13:43:18 -07:00
Daisuke Miyakawa
78b2469f36 Merge "Remove stale and inappropriate dependency." 2010-06-02 13:36:25 -07:00
Jason Sams
d0b9910da0 Merge "Disabble vertex logging. bug 2734616" 2010-06-02 12:41:05 -07:00
Daisuke Miyakawa
6fd83a7cb6 Remove stale and inappropriate dependency.
Change-Id: I2e9412075c157a8649ac06e89a8987a36544d78b
2010-06-02 12:18:17 -07:00
The Android Open Source Project
a67e979043 am 8f1259be: am b705eea7: am 1bd7597b: merge from open-source master 2010-06-02 09:06:34 -07:00
The Android Open Source Project
1832fcf316 am b705eea7: am 1bd7597b: merge from open-source master 2010-06-02 09:05:18 -07:00
The Android Open Source Project
f4a87686cc 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
aad8fd541f am afca60dd: am 59c82376: am c8763858: merge from open-source master 2010-06-02 08:58:37 -07:00
The Android Open Source Project
c3ea373c05 am 59c82376: am c8763858: merge from open-source master 2010-06-02 08:56:19 -07:00
The Android Open Source Project
0fa2fb72dc 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
44cb1fe3e4 merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
2010-06-02 08:54:47 -07:00
The Android Open Source Project
c99c7120c3 merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
2010-06-02 08:41:59 -07:00
Ben Murdoch
8beda8273a Merge "Frameworks changes to enable File Reader and blob.slice APIs." 2010-06-02 04:29:39 -07:00
Grace Kloba
20ea4d1ae6 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
792e065b20 Merge "Improved error-handling in Rfc822Tokenizer" 2010-06-01 22:56:39 -07:00
Kenny Root
59870641f0 am 112ad01d: am 501b2b40: am a6703415: am 85fb2066: Amend previous ndc commit 2010-06-01 20:58:30 -07:00
Kenny Root
dadc673a6d am 501b2b40: am a6703415: am 85fb2066: Amend previous ndc commit 2010-06-01 20:55:59 -07:00
Kenny Root
5b439d2a60 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
edcac7ba6c 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
c7cea2af09 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
fc9724f718 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
ae3449f7d7 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
2846041031 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
caf742fdf5 Merge "Add more error checking for ndc" into froyo 2010-06-01 19:55:01 -07:00
Grace Kloba
256c8207cb Merge "Expose canZoomIn and canZoomOut for WebView." 2010-06-01 17:23:37 -07:00
Konstantin Lopyrev
1a30f14387 Merge "Fix 2571872: Showing an error message on wrong password/pin entered." 2010-06-01 17:14:13 -07:00
Jason Sams
70570f35a3 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
45ac54d9b8 Merge "types update." 2010-06-01 16:58:15 -07:00
Mathias Agopian
7704f5da75 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
a006a59d53 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
2a9a7a891e 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
5ea13b0ac8 am 7bd9a6a5: am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth. 2010-06-01 16:10:29 -07:00
Dirk Dougherty
7f911f63d8 am d64263b7: am 7fad207e: am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo 2010-06-01 16:10:01 -07:00
Wu-cheng Li
0da0384c70 am c3cfd10a: am 00e21f8e: Add javadoc for camera scene modes. 2010-06-01 16:09:32 -07:00
Mathias Agopian
d13f23fca6 am 5220af87: am 770492cb: more clean-up in preparation of bigger changes 2010-06-01 16:08:48 -07:00
Mathias Agopian
daa717000f am 4f0a9114: am cdfd5fe2: Fix a typo in Singleton<> 2010-06-01 16:08:16 -07:00
Mathias Agopian
0841cfb457 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
6d2f3973f6 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
49753266d2 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
e3225b0f69 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
Dirk Dougherty
f1ad0d9c74 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
7c7eadeb4f 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
4005afd071 Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 2010-06-01 15:44:02 -07:00
Dan Egnor
314e4d4d31 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
Evan Millar
6da7a38c05 Merge "Bring ServiceTestCase in line with current Service APIs and remove unnecessary asserts." 2010-06-01 15:10:20 -07:00
Dan Egnor
5220f48338 am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken

* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:44:35 -07:00
Andreas Huber
7a1dd66435 am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth. 2010-06-01 14:42:25 -07:00
Dan Egnor
d691a841f6 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b Merge "Comment-only change to add documentation for FileObserver" into froyo 2010-06-01 14:09:20 -07:00
Derek Sollenberger
c32e646746 Merge "eoving Zoom animation logic from WebView into ZoomManager. This is pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."" 2010-06-01 13:52:17 -07:00