Commit Graph

935 Commits

Author SHA1 Message Date
Bill Napier
43c52008ac am 4ce6430: AI 148803: Update 1.xml and 2.xml for methods that take Gene
Merge commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7' into donut

* commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7':
  AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs.  This will allow the CTS Signature Test to be run against older android releases.
2009-05-13 15:30:25 -07:00
Android (Google) Code Review
59062e6de0 am 541ff5d: Merge change 1566 into donut
Merge commit '541ff5df00984580e0245b3ae2c89b93e76b7c08'

* commit '541ff5df00984580e0245b3ae2c89b93e76b7c08':
  Fix issue #1838944: Application sync settings cant be changed with auto sync on
2009-05-13 15:26:55 -07:00
Android (Google) Code Review
4f5405c140 Merge change 1566 into donut
* changes:
  Fix issue #1838944: Application sync settings cant be changed with auto sync on
2009-05-13 15:25:35 -07:00
Android (Google) Code Review
a04d0df605 am 6063a9c: Merge change 1491 into donut
Merge commit '6063a9c9ee91a647680653a4520dfcad83985592'

* commit '6063a9c9ee91a647680653a4520dfcad83985592':
  Make pressing the search button within an app that does not support
2009-05-13 14:29:12 -07:00
Android (Google) Code Review
626fde1319 Merge change 1491 into donut
* changes:
  Make pressing the search button within an app that does not support search bring up global search. This still respects the case where an app has chosen to disable search entirely by overriding onSearchRequested() to return false.
2009-05-13 14:26:45 -07:00
Android (Google) Code Review
731f0b8205 am a0f87f6: Merge change 1565 into donut
Merge commit 'a0f87f680cb1dc2a163f89118ffdf38f4c964628'

* commit 'a0f87f680cb1dc2a163f89118ffdf38f4c964628':
  Enable filtering <select> lists.
2009-05-13 13:25:45 -07:00
Android (Google) Code Review
78e70822ba Merge change 1565 into donut
* changes:
  Enable filtering <select> lists.
2009-05-13 13:25:16 -07:00
Android (Google) Code Review
fe0092fbec Merge change 1466
* changes:
  define Intent.ACTION_REMOTE_INTENT, which replaces the old GTalk data messaging intent "android.intent.action.GTALK_DATA_MESSAGE_RECEIVED".
2009-05-13 13:23:45 -07:00
Dianne Hackborn
bb3e1a0d87 am e7fe35b: Whoops fix installing. I am dumb.
Merge commit 'e7fe35b88aa77766d322b8a683995a2bdae6210d'

* commit 'e7fe35b88aa77766d322b8a683995a2bdae6210d':
  Whoops fix installing.  I am dumb.
2009-05-13 12:52:03 -07:00
Android (Google) Code Review
54c3551c61 am a2a34a5: Merge change 1528 into donut
Merge commit 'a2a34a5711bde03475b40edfe3cc052ece02700a'

* commit 'a2a34a5711bde03475b40edfe3cc052ece02700a':
  should help fix the Simulator build.
2009-05-13 12:52:03 -07:00
Android (Google) Code Review
fe0d7d79fb Merge change 1528 into donut
* changes:
  should help fix the Simulator build.
2009-05-13 00:20:49 -07:00
Mathias Agopian
eccc8cfb2f should help fix the Simulator build. 2009-05-13 00:19:22 -07:00
Joe Onorato
a6c93fa24a am 8ad0281: With this, the BackupService onBackup method is called.
Merge commit '8ad028117d4b99883bbc52b29f097b2fb1d9b0c2'

* commit '8ad028117d4b99883bbc52b29f097b2fb1d9b0c2':
  With this, the BackupService onBackup method is called.
2009-05-12 22:49:11 -07:00
Joe Onorato
6723c8a53f am d39afbd: Make android.content.ComponentName implement java.lang.Compa
Merge commit 'd39afbdc92e95e597c311e78ac32edaad27fcf0d'

* commit 'd39afbdc92e95e597c311e78ac32edaad27fcf0d':
  Make android.content.ComponentName implement java.lang.Comparable.
2009-05-12 22:39:19 -07:00
Mitsuru Oshima
7a308baf58 am c5b0e6e: don\'t scale trackball event
Merge commit 'c5b0e6e4eb09a4dd8fc1cfcfca959262705d84d0'

* commit 'c5b0e6e4eb09a4dd8fc1cfcfca959262705d84d0':
  don't scale trackball event
2009-05-12 22:39:19 -07:00
Dirk Dougherty
373b4d8c8b am 2466bdf: am f7a480d: AI 148759: Add download page for NDK 1.5 r1.
Merge commit '2466bdfb9aac11f41ed82ad14cf8635aaefc6281'

* commit '2466bdfb9aac11f41ed82ad14cf8635aaefc6281':
  AI 148759: Add download page for NDK 1.5 r1.
2009-05-12 22:39:18 -07:00
Dirk Dougherty
303bfd4d66 am 63fbf39: am c214de5: AI 148752: Fix description of breakText() param.
Merge commit '63fbf39dbabe8aee236017da095291224f0e1cee'

* commit '63fbf39dbabe8aee236017da095291224f0e1cee':
  AI 148752: Fix description of breakText() param.
2009-05-12 22:39:18 -07:00
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