Commit Graph

968 Commits

Author SHA1 Message Date
Dirk Dougherty
e2e52a8d5c am 33a31b3: AI 148752: Fix description of breakText() param.
Merge commit '33a31b314f571ddcbef003e8a399c20ddeff6905'

* commit '33a31b314f571ddcbef003e8a399c20ddeff6905':
  AI 148752: Fix description of breakText() param.
2009-05-12 22:39:17 -07:00
Android (Google) Code Review
cc5209fa21 am 6347c32: Merge change 1436 into donut
Merge commit '6347c322b36cdf6a30a35e80d205d00d40368e61'

* commit '6347c322b36cdf6a30a35e80d205d00d40368e61':
  Density Compatibility mode for SurfaceView
2009-05-12 22:39:17 -07:00
Dianne Hackborn
c887f8ad31 am ade3eca: Implement issue #1783881 (manifest option for adb-install-on
Merge commit 'ade3ecad94d1f4431576f53bae26c35efbf7a2c9'

* commit 'ade3ecad94d1f4431576f53bae26c35efbf7a2c9':
  Implement issue #1783881 (manifest option for adb-install-only apps)
2009-05-12 22:39:08 -07:00
Android (Google) Code Review
227229943c am 807f23b: Merge change 1057 into donut
Merge commit '807f23b2d8c7148cf6fc95bb88cfc2f78e4be66a'

* commit '807f23b2d8c7148cf6fc95bb88cfc2f78e4be66a':
  * Add regoin scaling for transparent support
2009-05-12 22:39:07 -07:00
Romain Guy
32e4d520f0 am 2bb3ea1: Fix native core runtime. A messy declaration was causing a p
Merge commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9'

* commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9':
  Fix native core runtime. A messy declaration was causing a problem at boot time.
2009-05-12 22:39:06 -07:00
The Android Open Source Project
398faec118 Merge commit 'c64322c' 2009-05-12 22:37:35 -07:00
Dirk Dougherty
51a827c86e am f7a480d: AI 148759: Add download page for NDK 1.5 r1.
Merge commit 'f7a480de8c0402850a25db34ad25d86e6d82e699' into donut

* commit 'f7a480de8c0402850a25db34ad25d86e6d82e699':
  AI 148759: Add download page for NDK 1.5 r1.
2009-05-12 18:50:55 -07:00
Dirk Dougherty
211e2dba0f am c214de5: AI 148752: Fix description of breakText() param.
Merge commit 'c214de5897da8d81378553e25a855c18372d1d29' into donut

* commit 'c214de5897da8d81378553e25a855c18372d1d29':
  AI 148752: Fix description of breakText() param.
2009-05-12 18:50:54 -07:00
Android (Google) Code Review
4351a7aa06 Merge change 1436 into donut
* changes:
  Density Compatibility mode for SurfaceView * use fixed size when requested. Otherwise, give the original size instead of scaled down size. * scale back the motion event to original size when surface view is using the orignal size.
2009-05-12 18:17:53 -07:00
Android (Google) Code Review
0de796d3a1 Merge change 1057 into donut
* changes:
  * Add regoin scaling for transparent support
2009-05-12 15:45:25 -07:00
Android (Google) Code Review
b6d5f8ad14 am 3e3439d: Merge change 1478 into donut
Merge commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b'

* commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b':
  Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
2009-05-12 13:34:18 -07:00
Android (Google) Code Review
963b8c30eb Merge change 1478 into donut
* changes:
  Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
2009-05-12 13:33:07 -07:00
Android (Google) Code Review
e0f2c0a003 Merge change 1470
* changes:
  Make android.content.ComponentName implement java.lang.Comparable.
2009-05-12 12:00:55 -07:00
Android (Google) Code Review
4954238919 am e51f3a0: Merge change 1297 into donut
Merge commit 'e51f3a012b146d57a01b9f7cc7c043b9da3c600d'

* commit 'e51f3a012b146d57a01b9f7cc7c043b9da3c600d':
  Check the size of the data to write for STATIC AudioTrack objects.
2009-05-12 11:56:32 -07:00
Android (Google) Code Review
e8b7117c8d Merge change 1297 into donut
* changes:
  Check the size of the data to write for STATIC AudioTrack objects. Extracted actual writing from write jni function so it can be reused in an upcoming change.
2009-05-12 11:53:05 -07:00
Android (Google) Code Review
63a3f83e0f am da33d0d: Merge change 1424 into donut
Merge commit 'da33d0d139531ff184a1a339b734de00f1cc0743'

* commit 'da33d0d139531ff184a1a339b734de00f1cc0743':
  Fixes 1844680. Interrupted scrolling could lead to rendering artifacts. The ListView was invalidating itself in opaque mode but before the drawing could happen, it was getting rid of its scrolling cache, thus becoming translucent again.
2009-05-12 11:33:08 -07:00
Android (Google) Code Review
44037796b9 am c70b644: Merge change 1463 into donut
Merge commit 'c70b64441029b9748eea7f260f1b3521dc58eb91'

* commit 'c70b64441029b9748eea7f260f1b3521dc58eb91':
  Fixes #1846038. DrawableContainer was wrongly returning its opacity by ignoring the visibility of the currently selected layer. This change simply reports a TRANSPARENT opacity if there is no currently selected layer of if the selected layer is not visible. Otherwise it reports the opacity computed by the state class.
2009-05-12 11:33:07 -07:00
Android (Google) Code Review
3e3e20dbc8 Merge change 1424 into donut
* changes:
  Fixes 1844680. Interrupted scrolling could lead to rendering artifacts. The ListView was invalidating itself in opaque mode but before the drawing could happen, it was getting rid of its scrolling cache, thus becoming translucent again.
2009-05-12 11:13:04 -07:00
Android (Google) Code Review
af56b45d59 Merge change 1463 into donut
* changes:
  Fixes #1846038. DrawableContainer was wrongly returning its opacity by ignoring the visibility of the currently selected layer. This change simply reports a TRANSPARENT opacity if there is no currently selected layer of if the selected layer is not visible. Otherwise it reports the opacity computed by the state class.
2009-05-12 11:10:34 -07:00
Android (Google) Code Review
95d04eb8c6 am 7813767: Merge change 1441 into donut
Merge commit '7813767b3ab2a0db3847ef62274b51a3d394a5e8'

* commit '7813767b3ab2a0db3847ef62274b51a3d394a5e8':
  removing log message checked in by acccident.
2009-05-12 10:10:01 -07:00
Android (Google) Code Review
d7490e408b Merge change 1441 into donut
* changes:
  removing log message checked in by acccident.
2009-05-12 10:06:39 -07:00
Mike Lockwood
d97d2771f6 am 3681f26: LocationManager: Recover if process containing NetworkLocat
Merge commit '3681f2614fa8c10560c790f6b4287f65d6fd2663'

* commit '3681f2614fa8c10560c790f6b4287f65d6fd2663':
  LocationManager:  Recover if process containing NetworkLocation provider crashes
2009-05-12 07:58:55 -07:00
Mike Lockwood
56fde1a25f am 2677d0d: LocationManager: Fix a Javadoc comment.
Merge commit '2677d0da34acad93cd7f164d587ccc30c46facc6'

* commit '2677d0da34acad93cd7f164d587ccc30c46facc6':
  LocationManager: Fix a Javadoc comment.
2009-05-12 06:26:37 -07:00
Android (Google) Code Review
2527db51a8 am 7e3e04c: Merge change 1408 into donut
Merge commit '7e3e04c144182c6807c66646b3f988beaba1720e'

* commit '7e3e04c144182c6807c66646b3f988beaba1720e':
  * update all metrics data when updating density.
2009-05-11 21:22:01 -07:00
Android (Google) Code Review
d43d65741f Merge change 1408 into donut
* changes:
  * update all metrics data when updating density. * Keyboard should use DisplayMetrics from Resource rather than getting it from WindowManager as   the display metrics can differ under compatibility mode.
2009-05-11 21:20:55 -07:00
Guang Zhu
0bddcc785a am 4010ac3: added reliability test usding DumpRenderTree
Merge commit '4010ac35b1e49d659d7a32cc191302b8e2d8758a'

* commit '4010ac35b1e49d659d7a32cc191302b8e2d8758a':
  added reliability test usding DumpRenderTree
2009-05-11 20:43:18 -07:00
Android (Google) Code Review
f1fa35ab59 Merge change 1012
* changes:
  added reliability test usding DumpRenderTree
2009-05-11 20:07:37 -07:00
Android (Google) Code Review
298446199a am 1e6dab1: Merge change 1406 into donut
Merge commit '1e6dab1852a56125106bee8affeca661ab7b7408'

* commit '1e6dab1852a56125106bee8affeca661ab7b7408':
  Internal APIs to get/set SMSC address.
2009-05-11 18:26:31 -07:00
Android (Google) Code Review
7f0a767b93 am 08f3b52: Merge change 1404 into donut
Merge commit '08f3b5261fc31813e35cf04225ed8260f8a3bbe0'

* commit '08f3b5261fc31813e35cf04225ed8260f8a3bbe0':
  Fix the build
2009-05-11 18:26:29 -07:00
Romain Guy
721f78584e am 7ed6acd: Remove useless logging on every draw.
Merge commit '7ed6acdc084f5cbd37bd9b9d5422d75fa31f43ce'

* commit '7ed6acdc084f5cbd37bd9b9d5422d75fa31f43ce':
  Remove useless logging on every draw.
2009-05-11 18:26:29 -07:00
Android (Google) Code Review
72f8accabd am a2ea1d3: Merge change 1371 into donut
Merge commit 'a2ea1d376524346e3f601694751e423ce2711d6b'

* commit 'a2ea1d376524346e3f601694751e423ce2711d6b':
  Fixes #1596240. Optimize invalidate/draw passes by marking opaque views and avoiding drawing them. Whenever a View requests an invalidate its parent check whether the view is opaque or not. When the view is not opaque, the framework behaves as it used to. However, when a view is opaque, the parent marks itself as being dirty because of an opaque view. Its parent then does the same, and so on. When the framework then starts drawing the views, it does not draw views marked as dirty opaque. If a view is dirty opaque and receives an invalidate request from a non-opaque view, it then clears the dirty opaque flag and behaves as before.
2009-05-11 18:26:28 -07:00
Android (Google) Code Review
493ab7b29c am e292086: Merge change 1391 into donut
Merge commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22'

* commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22':
  Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.
2009-05-11 18:26:23 -07:00
Guang Zhu
bbfd2e076a merged 25fdf35, resolved conflicts 2009-05-11 18:09:51 -07:00
Android (Google) Code Review
97c4c6cb2b Merge change 1406 into donut
* changes:
  Internal APIs to get/set SMSC address.
2009-05-11 17:08:19 -07:00
Android (Google) Code Review
97ba2df538 Merge change 1404 into donut
* changes:
  Fix the build
2009-05-11 15:19:48 -07:00
Android (Google) Code Review
f3a6b79910 Merge change 1371 into donut
* changes:
  Fixes #1596240. Optimize invalidate/draw passes by marking opaque views and avoiding drawing them. Whenever a View requests an invalidate its parent check whether the view is opaque or not. When the view is not opaque, the framework behaves as it used to. However, when a view is opaque, the parent marks itself as being dirty because of an opaque view. Its parent then does the same, and so on. When the framework then starts drawing the views, it does not draw views marked as dirty opaque. If a view is dirty opaque and receives an invalidate request from a non-opaque view, it then clears the dirty opaque flag and behaves as before.
2009-05-11 14:04:23 -07:00
Android (Google) Code Review
8ee6f8f77e Merge change 1391 into donut
* changes:
  Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.
2009-05-11 14:04:10 -07:00
Android (Google) Code Review
0e8e63ffbb Merge change 1299 into donut
* changes:
  Added Java callback for JavaScript execution timeout.
2009-05-11 14:03:56 -07:00
Android (Google) Code Review
982f6b946f am 7f2ae49: Merge change 1370 into donut
Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'

* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
  Fix a JNI layer crash due to null camera object passed to get_native_camera()
2009-05-11 12:20:20 -07:00
Android (Google) Code Review
cb069f70bc am 3b30d80: Merge change 1377 into donut
Merge commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4'

* commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4':
  Fix typo in javadoc
2009-05-11 12:20:20 -07:00
Android (Google) Code Review
e738108828 Merge change 1370 into donut
* changes:
  Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
2009-05-11 12:18:55 -07:00
Android (Google) Code Review
0b25a05c3e Merge change 1377 into donut
* changes:
  Fix typo in javadoc
2009-05-11 12:18:20 -07:00
Android (Google) Code Review
b322e9f49c am 6ee44d1: Merge change 1258 into donut
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'

* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
  Fix 1840639 to support overlays with zz_ZZ.
2009-05-11 11:22:25 -07:00
Android (Google) Code Review
b8673dddee Merge change 1258 into donut
* changes:
  Fix 1840639 to support overlays with zz_ZZ. Everything but strings worked fine before but a new default string would generate a build error.
2009-05-11 11:19:49 -07:00
Dianne Hackborn
24b9c7e006 am 1655be4: Fix issue #1837610 and #1753079
Merge commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21'

* commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21':
  Fix issue #1837610 and #1753079
2009-05-11 11:18:24 -07:00
Android (Google) Code Review
376d13c45f Merge change 720
* changes:
  Move ACTION_BATTERY_LOW logic to BatteryService (bug 1630733).
2009-05-11 10:57:23 -07:00
Android (Google) Code Review
2cda8bb632 am 5e1d8ae: Merge change 1355 into donut
Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'

* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:37:20 -07:00
Android (Google) Code Review
c83a1b1a56 Merge change 1355 into donut
* changes:
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:34:33 -07:00
Android (Google) Code Review
700f14224d Merge change 1324
* changes:
  Fix #1807059. If it is "POST", always use BasicHttpEntityEnclosingRequest even bodyProvider is null. This ensures the content-type, content-encoding and content-length are set correctly.
2009-05-11 10:11:50 -07:00
Android (Google) Code Review
fa1df1c644 am 3022a11: Merge change 1239 into donut
Merge commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472'

* commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472':
  Modify camera framework to use new streamlined binder interface.
2009-05-11 10:00:49 -07:00