Commit Graph

676 Commits

Author SHA1 Message Date
Scott Main
4bca8aedf4 am 5c6f93f: am eb086d6: AI 148270: remove references to AbsoluteLayout b
Merge commit '5c6f93f1422647c7f914a15bfad00992685c3eac'

* commit '5c6f93f1422647c7f914a15bfad00992685c3eac':
  AI 148270: remove references to AbsoluteLayout because it's been deprecated
2009-05-04 13:27:02 -07:00
Wu-cheng Li
535faea98f am fa3e556: Change error message.
Merge commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5'

* commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5':
  Change error message.
2009-05-04 13:27:00 -07:00
Romain Guy
07315838ca am 6a1ae64: Fix another HTML formatting in android.os.AsyncTask
Merge commit '6a1ae64f7735a3817713a223096bf8034f78a620'

* commit '6a1ae64f7735a3817713a223096bf8034f78a620':
  Fix another HTML formatting in android.os.AsyncTask
2009-05-04 13:26:59 -07:00
Android (Google) Code Review
e3b678511b am 8d121ce: Merge change 917 into donut
Merge commit '8d121ce945204e96d90d3338ecafe637b0494ed8'

* commit '8d121ce945204e96d90d3338ecafe637b0494ed8':
  Fix HTML formatting in android.os.AsyncTask
2009-05-04 13:26:54 -07:00
The Android Open Source Project
87d15c214f no change; doing a 'merge', previous change was a cherry-pick
Merge commit '821427eac75d88f1388935e0a2f0564be8979e58'
2009-05-04 13:23:36 -07:00
Scott Main
160ec24064 am eb086d6: AI 148270: remove references to AbsoluteLayout because it\'s
Merge commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18' into donut

* commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18':
  AI 148270: remove references to AbsoluteLayout because it's been deprecated
2009-05-04 13:22:36 -07:00
Android (Google) Code Review
e146b65728 Merge change 917 into donut
* changes:
  Fix HTML formatting in android.os.AsyncTask
2009-05-02 22:42:00 -07:00
Android (Google) Code Review
634acfc9a3 am 7db4860: Merge change 845 into donut
Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38'

* commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38':
  Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
2009-05-01 23:25:28 -07:00
Android (Google) Code Review
427176b619 am 854c8c7: Merge change 896 into donut
Merge commit '854c8c78c1bce214f6479772d94147070ec6764f'

* commit '854c8c78c1bce214f6479772d94147070ec6764f':
  make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
2009-05-01 23:25:28 -07:00
Android (Google) Code Review
cc0380355a am ef65477: Merge change 844 into donut
Merge commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6'

* commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6':
  clean up cdma sms creation and parsing
2009-05-01 23:25:27 -07:00
Android (Google) Code Review
b657639a27 Merge change 847 into donut
* changes:
  Config: Deprecate most fields, and hook into ConfigBuildFlags
2009-05-01 18:32:46 -07:00
Android (Google) Code Review
e826baf613 Merge change 845 into donut
* changes:
  Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
2009-05-01 18:32:37 -07:00
Android (Google) Code Review
eb14aeb370 Merge change 896 into donut
* changes:
  make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
2009-05-01 16:32:21 -07:00
Android (Google) Code Review
7dfe44d5db Merge change 898
* changes:
  Fix the build
2009-05-01 14:42:38 -07:00
Android (Google) Code Review
6cb60e5077 Merge change 844 into donut
* changes:
  clean up cdma sms creation and parsing
2009-05-01 14:22:20 -07:00
Android (Google) Code Review
d0feafe5a3 am e117ff6: Merge change 860 into donut
Merge commit 'e117ff6e29df64b5945a4a242434f62abd117a9b'

* commit 'e117ff6e29df64b5945a4a242434f62abd117a9b':
  Change 79 in git master branch
2009-05-01 14:09:13 -07:00
Android (Google) Code Review
5b08702e06 Merge change 860 into donut
* changes:
  Change 79 in git master branch
2009-05-01 14:09:03 -07:00
Dirk Dougherty
f638a879af am 75e44a1: am a417ee5: AI 148197: Add a link in "Community" page to the
Merge commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5'

* commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5':
  AI 148197: Add a link in "Community" page to the android market discussion forum.
2009-05-01 13:44:27 -07:00
Dirk Dougherty
ebe256437f am a417ee5: AI 148197: Add a link in "Community" page to the android mar
Merge commit 'a417ee5afa8133d42d76691d6501741dc6c7178d' into donut

* commit 'a417ee5afa8133d42d76691d6501741dc6c7178d':
  AI 148197: Add a link in "Community" page to the android market discussion forum.
2009-05-01 13:40:01 -07:00
Dirk Dougherty
c2dfef13d3 am 4f50893: am 392d29a: AI 148193: More misc fixes in format, links, con
Merge commit '4f508936342dd866d1183ca418ca091437a5ddf6'

* commit '4f508936342dd866d1183ca418ca091437a5ddf6':
  AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
2009-05-01 13:06:10 -07:00
Dirk Dougherty
d973852074 am 392d29a: AI 148193: More misc fixes in format, links, content for And
Merge commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de' into donut

* commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de':
  AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
2009-05-01 13:03:34 -07:00
Mike Lockwood
e019fe6126 am 275555c: location: Add support for location providers outside of the
Merge commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e'

* commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e':
  location: Add support for location providers outside of the system process.
2009-05-01 12:39:03 -07:00
Scott Main
916e096474 am 767db0a: am 003eaa2: AI 148189: update the NotepadCodelab zip file to
Merge commit '767db0a1ec760042b145e7c19a672c7180ad10f3'

* commit '767db0a1ec760042b145e7c19a672c7180ad10f3':
  AI 148189: update the NotepadCodelab zip file to remove R.java, other project/bin files and erratic hidden files;
2009-05-01 12:00:22 -07:00
Romain Guy
4a1299d41f am 9a81736: Add the ability to specify the onClick handler with XML.
Merge commit '9a81736176f507489f262344b6e3d55bbe53be7c'

* commit '9a81736176f507489f262344b6e3d55bbe53be7c':
  Add the ability to specify the onClick handler with XML. The new android:onClick attribute defines the name of the method in the Activity to invoke when the button is clicked. The method has to be public and get one View parameter.
2009-05-01 12:00:19 -07:00
Dirk Dougherty
163f992467 am 15d98b2: am 1432cd8: AI 148183: Add missing android namespace to minS
Merge commit '15d98b23ca83e7cd25ee14945e55c2701e75994f'

* commit '15d98b23ca83e7cd25ee14945e55c2701e75994f':
  AI 148183: Add missing android namespace to minSdkVersion
2009-05-01 12:00:18 -07:00
Scott Main
5d3648e6cb am 003eaa2: AI 148189: update the NotepadCodelab zip file to remove R.ja
Merge commit '003eaa2808e1e41d85ec6a5612de96e3ae575664' into donut

* commit '003eaa2808e1e41d85ec6a5612de96e3ae575664':
  AI 148189: update the NotepadCodelab zip file to remove R.java, other project/bin files and erratic hidden files;
2009-05-01 11:56:48 -07:00
Dirk Dougherty
fda61c9a6c am 1432cd8: AI 148183: Add missing android namespace to minSdkVersion
Merge commit '1432cd874af2250f021d2e21d0ae048be08cbdc7' into donut

* commit '1432cd874af2250f021d2e21d0ae048be08cbdc7':
  AI 148183: Add missing android namespace to minSdkVersion
2009-05-01 10:05:29 -07:00
Android (Google) Code Review
a5e2c1e993 am e5c4725: Merge change 873 into donut
Merge commit 'e5c4725666da25138193bed83831b66b9c0b2c45'

* commit 'e5c4725666da25138193bed83831b66b9c0b2c45':
  pass original ptrs to JNI release functions (instead of += index to them)
2009-05-01 07:59:31 -07:00
Android (Google) Code Review
6a18270f90 Merge change 873 into donut
* changes:
  pass original ptrs to JNI release functions (instead of += index to them)
2009-05-01 07:58:48 -07:00
Mike Lockwood
9b71807491 am 15e3d0f: location: Use ILocationProvider Binder interface for all loc
Merge commit '15e3d0f082d551f8819fbe4b0d502cc108627876'

* commit '15e3d0f082d551f8819fbe4b0d502cc108627876':
  location: Use ILocationProvider Binder interface for all location providers.
2009-05-01 05:26:44 -07:00
Bjorn Bringert
744586aaee am a56b318: NEW_API: Expose includeInGlobalSearch searchable attribute
Merge commit 'a56b318cf2d4c3700899f9de394c5635761dda66'

* commit 'a56b318cf2d4c3700899f9de394c5635761dda66':
  NEW_API: Expose includeInGlobalSearch searchable attribute
2009-05-01 02:11:01 -07:00
Bjorn Bringert
ef93c4a4fe am 232cd50: NEW_API: Expose searchSuggestThreshold searchable attribute
Merge commit '232cd50f152b919f0918ee3f9fbdaf6ee1ae9f63'

* commit '232cd50f152b919f0918ee3f9fbdaf6ee1ae9f63':
  NEW_API: Expose searchSuggestThreshold searchable attribute
2009-05-01 02:10:58 -07:00
Android (Google) Code Review
b495e46aab am 83b395c: Merge change 743 into donut
Merge commit '83b395ceace724e55490aa6f2c0117c8b31e3723'

* commit '83b395ceace724e55490aa6f2c0117c8b31e3723':
  Add RIL_UNSOL_OEM_HOOK_RAW.
2009-04-30 23:51:14 -07:00
Android (Google) Code Review
365207af2f Merge change 743 into donut
* changes:
  Add RIL_UNSOL_OEM_HOOK_RAW.
2009-04-30 18:59:52 -07:00
The Android Open Source Project
b27097692e am 3500f01: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '3500f016bfc43a42b19cfc51f5472b1be87b8369'

* commit '3500f016bfc43a42b19cfc51f5472b1be87b8369':
  Fixes #1712631. Whenever a View loses focus/selection, reset its pressed state.
2009-04-30 18:12:48 -07:00
Eric Fischer
f028afe12c am 222f079: am b78c31d: AI 148147: Import lots of zh_TW translation chan
Merge commit '222f079a6e180ed20a73d001d26262ee2cbf5ea3'

* commit '222f079a6e180ed20a73d001d26262ee2cbf5ea3':
  AI 148147: Import lots of zh_TW translation changes.
2009-04-30 18:12:47 -07:00
The Android Open Source Project
e2e9c61ebe Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-04-30 17:59:19 -07:00
Android (Google) Code Review
e162c51689 Merge change 842 into donut
* changes:
  Fixes #1712631. Whenever a View loses focus/selection, reset its pressed state.
2009-04-30 17:58:28 -07:00
Eric Fischer
1ca982db24 am b78c31d: AI 148147: Import lots of zh_TW translation changes.
Merge commit 'b78c31d0644a9d91fdf705db4b39865f495287be' into donut

* commit 'b78c31d0644a9d91fdf705db4b39865f495287be':
  AI 148147: Import lots of zh_TW translation changes.
2009-04-30 17:37:21 -07:00
Android (Google) Code Review
9f074f7019 Merge change 804
* changes:
  decouple SyncAdapter from ContentProvider
2009-04-30 17:28:41 -07:00
Eric Fischer
8a5b932d99 am a4d8e5c: am f8a33c3: AI 148026: Update zh_TW translations.
Merge commit 'a4d8e5ce72a299d09b40fe835ee0ec889123a256'

* commit 'a4d8e5ce72a299d09b40fe835ee0ec889123a256':
  AI 148026: Update zh_TW translations.
2009-04-30 17:24:17 -07:00
Eric Fischer
4a1fe11c31 am c27eaa4: am 0ca686b: AI 148020: Restore accidentally-deleted zh_CN an
Merge commit 'c27eaa45fdfca8e0b3f78a80a37ce3f49c1b396b'

* commit 'c27eaa45fdfca8e0b3f78a80a37ce3f49c1b396b':
  AI 148020: Restore accidentally-deleted zh_CN and zh_TW map centers.
2009-04-30 17:24:17 -07:00
Eric Fischer
30ed8418a2 am f8a33c3: AI 148026: Update zh_TW translations.
Merge commit 'f8a33c313f93896115d81b4f14adbb7628aa5d93' into donut

* commit 'f8a33c313f93896115d81b4f14adbb7628aa5d93':
  AI 148026: Update zh_TW translations.
2009-04-30 17:10:27 -07:00
Eric Fischer
ed7840e104 am 0ca686b: AI 148020: Restore accidentally-deleted zh_CN and zh_TW map
Merge commit '0ca686b57ea11fa701be8ccaff22cb4b75c9d695' into donut

* commit '0ca686b57ea11fa701be8ccaff22cb4b75c9d695':
  AI 148020: Restore accidentally-deleted zh_CN and zh_TW map centers.
2009-04-30 17:10:27 -07:00
Android (Google) Code Review
79208d90cf am 2bc9e13: Merge change 841 into donut
Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'

* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
  TypedProperties: add getStringInfo() to help deal with null strings
2009-04-30 17:03:26 -07:00
Android (Google) Code Review
01a165aa46 am 52a3cb5: Merge change 840 into donut
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'

* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
  TypedProperties: change the file format to be a subset of Java
2009-04-30 17:03:26 -07:00
Android (Google) Code Review
359be6157b am 2cd006c: Merge change 837 into donut
Merge commit '2cd006c8f927d3e364c32f946b844377bdc56d3e'

* commit '2cd006c8f927d3e364c32f946b844377bdc56d3e':
  Make the home screen come up in the simulator.
2009-04-30 17:03:26 -07:00
Android (Google) Code Review
59434fd30f am 980d12b: Merge change 838 into donut
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'

* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
  Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
2009-04-30 17:03:25 -07:00
Marco Nelissen
87c4b55947 am d859331: Don\'t crash when /proc/wakelocks can\'t be opened. Might make
Merge commit 'd8593312296fd2193a070c1a074840d83b7f49cb'

* commit 'd8593312296fd2193a070c1a074840d83b7f49cb':
  Don't crash when /proc/wakelocks can't be opened. Might make board bringup easier.
2009-04-30 17:03:25 -07:00
Android (Google) Code Review
7a31a87c34 Merge change 841 into donut
* changes:
  TypedProperties: add getStringInfo() to help deal with null strings
2009-04-30 16:31:00 -07:00