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
Android (Google) Code Review
4e163a0201
Merge change 840 into donut
...
* changes:
TypedProperties: change the file format to be a subset of Java
2009-04-30 16:30:14 -07:00
Android (Google) Code Review
d3a90bb9e9
Merge change 837 into donut
...
* changes:
Make the home screen come up in the simulator.
2009-04-30 15:39:47 -07:00
Android (Google) Code Review
2d2ebdf964
Merge change 838 into donut
...
* changes:
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 15:35:28 -07:00
Mathias Agopian
7be3e5d2d8
Merge commit 'goog/master' into merge_master
...
Conflicts:
libs/surfaceflinger/Layer.cpp
libs/surfaceflinger/SurfaceFlinger.cpp
opengl/libagl/egl.cpp
opengl/libs/EGL/egl.cpp
opengl/libs/GLES_CM/gl.cpp
opengl/libs/GLES_CM/gl_api.in
opengl/libs/gl_entries.in
opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
Android (Google) Code Review
fb5982967e
am 3674252: Merge change 817 into donut
...
Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'
* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
Hide the backup stuff for now
2009-04-30 13:14:48 -07:00
Android (Google) Code Review
a819e505e2
Merge change 817 into donut
...
* changes:
Hide the backup stuff for now
2009-04-30 12:43:33 -07:00
Mike Lockwood
218d125d46
am c21a08f: gps: Fix missing return value in android_location_GpsLocatio
...
Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'
* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
gps: Fix missing return value in android_location_GpsLocationProvider_init
2009-04-30 12:34:13 -07:00
Android (Google) Code Review
44a8abba6f
am 021dce4: Merge change 811 into donut
...
Merge commit '021dce4198afbf602109ba5807a193c437b05361'
* commit '021dce4198afbf602109ba5807a193c437b05361':
Add android.backup.BackupManager
2009-04-30 12:34:10 -07:00
Android (Google) Code Review
1bd1e31c76
Merge change 811 into donut
...
* changes:
Add android.backup.BackupManager
2009-04-30 11:38:54 -07:00
Android (Google) Code Review
36f6524de7
am a039d46: Merge change 792 into donut
...
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'
* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
Allow access to global search by pressing the hard search button again
2009-04-30 11:00:07 -07:00
Android (Google) Code Review
75c16b9a24
Merge change 792 into donut
...
* changes:
Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
2009-04-30 10:07:39 -07:00
android-build SharedAccount
9d8504e30b
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2009-04-30 00:26:40 -07:00
Dan Bornstein
8c01c4787a
am 5fcfcd0: am b4c218e: AI 147994: First cut of CharsetUtils, a utility
...
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'
* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-30 00:02:27 -07:00
Dan Bornstein
1223a0077f
am b4c218e: AI 147994: First cut of CharsetUtils, a utility class that a
...
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut
* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-29 23:31:38 -07:00
Mitsuru Oshima
e71b71736a
am d4ed049: Merge branch \'readonly-p4-donut\' into donut
...
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'
* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
AI 148024: fix NPE when there is no history
2009-04-29 23:20:11 -07:00
Mitsuru Oshima
a6da57cbe2
Merge branch 'readonly-p4-donut' into donut
2009-04-29 17:15:14 -07:00
Android (Google) Code Review
4c86c221f0
am 7fe3b06: Merge change 740 into donut
...
Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'
* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
MIDI render thread was nice 0, should be nice -16.
2009-04-29 15:43:34 -07:00
Android (Google) Code Review
56f383ce68
Merge change 740 into donut
...
* changes:
MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
2009-04-29 15:27:15 -07:00
Christopher Tate
38afcfd8d6
am 487529a: First baby steps towards settings backup
...
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185'
* commit '487529a70cd1479ae8d6bbfb356be7e72542c185':
First baby steps towards settings backup
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
5d3d8df804
am dc67739: Merge change 741 into donut
...
Merge commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375'
* commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375':
Fix typo in searchSuggestThreshold attr doc.
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
d0f2358492
am 73b7184: Merge change 748 into donut
...
Merge commit '73b71842dc9c943d69ce28212776ce671e54bcdb'
* commit '73b71842dc9c943d69ce28212776ce671e54bcdb':
Fix the build.
2009-04-29 15:16:52 -07:00
The Android Open Source Project
c1717c0142
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2009-04-29 15:16:52 -07:00
Android (Google) Code Review
04a255ea14
Merge change 711
...
* changes:
store contact id in messages table instead of contact name string; merge messages and group messages tables.
2009-04-29 14:32:10 -07:00
Android (Google) Code Review
3977565ae6
Merge change 741 into donut
...
* changes:
Fix typo in searchSuggestThreshold attr doc.
2009-04-29 14:30:27 -07:00
Android (Google) Code Review
bc41830139
Merge change 748 into donut
...
* changes:
Fix the build.
2009-04-29 13:51:33 -07:00
Android (Google) Code Review
75bd859bf1
am 9ae8873: Merge change 617 into donut
...
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'
* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:41:23 -07:00