Commit Graph

1049 Commits

Author SHA1 Message Date
Android (Google) Code Review
0180a05fda am 04561a55: Merge change 2359 into donut
Merge commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf'

* commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf':
  Fix for the simultor build breakage.
2009-05-23 14:07:35 -07:00
Android (Google) Code Review
ca7b80e431 Merge change 2359 into donut
* changes:
  Fix for the simultor build breakage.
2009-05-23 14:05:50 -07:00
Android (Google) Code Review
666dce10e2 am d9a874a4: Merge change 2397 into donut
Merge commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd'

* commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd':
  Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
2009-05-23 13:29:42 -07:00
Android (Google) Code Review
7cd5339b11 Merge change 2397 into donut
* changes:
  Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
2009-05-23 13:27:18 -07:00
Mike Lockwood
8a488f8258 am 270e87f7: Sensors: Use a native_handle for the data channel instead of a single file descriptor.
Merge commit '270e87f71abc2edf446dbec20c725c823e8c7f37'

* commit '270e87f71abc2edf446dbec20c725c823e8c7f37':
  Sensors: Use a native_handle for the data channel instead of a single file descriptor.
2009-05-23 10:36:58 -07:00
Android (Google) Code Review
198f31b513 am fea1a459: Merge change 2364 into donut
Merge commit 'fea1a459aaebc5fd66b12520312ddbe09547f094'

* commit 'fea1a459aaebc5fd66b12520312ddbe09547f094':
  Initial checkin for App Fuel Gauge infrastructure.
2009-05-22 19:41:36 -07:00
Android (Google) Code Review
9ec1f94ab8 Merge change 2364 into donut
* changes:
  Initial checkin for App Fuel Gauge infrastructure.
2009-05-22 19:40:33 -07:00
Dianne Hackborn
fc7c35192d am b181118b: Define TARGET_CPU_ABI for finding native code in .apks
Merge commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a'

* commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 18:47:12 -07:00
Android (Google) Code Review
28bb47435e Merge change 2362
* changes:
  Add the Renderscript library. (Not in the build by default yet.)
2009-05-22 17:13:58 -07:00
Dirk Dougherty
3a2bd23592 am 5b6a5cee: am 3f9de8b6: AI 149211: Doc updates for Android 1.5 SDK, r2. BUG=1790234
Merge commit '5b6a5cee4c48fd2ffc35f07ebe9f24eb53086b9a'

* commit '5b6a5cee4c48fd2ffc35f07ebe9f24eb53086b9a':
  AI 149211: Doc updates for Android 1.5 SDK, r2.
2009-05-22 16:08:05 -07:00
Dirk Dougherty
43c8d87aac am 3f9de8b6: AI 149211: Doc updates for Android 1.5 SDK, r2. BUG=1790234
Merge commit '3f9de8b6caa3fe9119b363c64e79d13bb72aec76' into donut

* commit '3f9de8b6caa3fe9119b363c64e79d13bb72aec76':
  AI 149211: Doc updates for Android 1.5 SDK, r2.
2009-05-22 16:05:59 -07:00
Android (Google) Code Review
20d321e1da am 17af14d8: Merge change 2289 into donut
Merge commit '17af14d8133f99b5e886d830e92e38ba1da7cc2d'

* commit '17af14d8133f99b5e886d830e92e38ba1da7cc2d':
  Add AIDL files for the TTS service and the associated callback service (to signal synthesis completion).
2009-05-22 16:01:24 -07:00
Android (Google) Code Review
f6472092d9 Merge change 2289 into donut
* changes:
  Add AIDL files for the TTS service and the associated callback service (to signal synthesis completion).
2009-05-22 15:59:29 -07:00
Nicolas Catania
b4c4265f9e Fix for the simultor build breakage.
Added missing include sys/time.h for utimes.

Detects when stat64 uses a timespec for the modif and access times
and work around the missing st_*time_nsec.

Apologies for the whitespace changes, emacs removed them automatically.
2009-05-22 15:54:26 -07:00
Jean-Baptiste Queru
61a826af81 am 02e57214: Merge open-source donut back into internal tree
Merge commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80'

* commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80':
2009-05-22 15:45:29 -07:00
Jean-Baptiste Queru
1a15abad22 Merge open-source donut back into internal tree
Merge commit '4cf03d381b2dff908857fceff0bec445f8d44f36' into HEAD
2009-05-22 15:43:13 -07:00
Android (Google) Code Review
7c446467dc am 53cf55c6: Merge change 2349 into donut
Merge commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6'

* commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6':
  Change the media key algorithm to also ignore double quotes.
2009-05-22 15:36:52 -07:00
Android (Google) Code Review
e56f65cc2d Merge change 2349 into donut
* changes:
  Change the media key algorithm to also ignore double quotes.
2009-05-22 15:35:26 -07:00
Dirk Dougherty
447ce2b0ea am 73c551d2: am 22629944: AI 149208: Remove statement about WIndows codecs and licensing. BUG=1839672
Merge commit '73c551d2582c2704cf60c7530fbc77eab846f4ed'

* commit '73c551d2582c2704cf60c7530fbc77eab846f4ed':
  AI 149208: Remove statement about WIndows codecs and licensing.
2009-05-22 15:15:35 -07:00
Dirk Dougherty
39c7e96b2a am 22629944: AI 149208: Remove statement about WIndows codecs and licensing. BUG=1839672
Merge commit '226299446197689499bc3c7dc44d0026745da677' into donut

* commit '226299446197689499bc3c7dc44d0026745da677':
  AI 149208: Remove statement about WIndows codecs and licensing.
2009-05-22 15:13:06 -07:00
Android (Google) Code Review
4e97f8c62f am d50a458b: Merge change 2351 into donut
Merge commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3'

* commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3':
  Fix a major bug in Bundle when unparcelling from AIDL.
2009-05-22 14:53:18 -07:00
Android (Google) Code Review
19fbae088e am 4e1afc1a: Merge change 2361 into donut
Merge commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca'

* commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca':
  Fixes #1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
2009-05-22 14:51:25 -07:00
Android (Google) Code Review
b6333b34a2 Merge change 2351 into donut
* changes:
  Fix a major bug in Bundle when unparcelling from AIDL.
2009-05-22 14:51:22 -07:00
Android (Google) Code Review
3f256f34e2 Merge change 2361 into donut
* changes:
  Fixes #1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
2009-05-22 14:49:19 -07:00
Jean-Baptiste Queru
512837cef2 Reconcile cupcake history into donut
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD
2009-05-22 14:35:33 -07:00
Dianne Hackborn
8af0f82d89 Fix a major bug in Bundle when unparcelling from AIDL.
There was a serious problem in the Bundle(Parcel) and readFromParcel() methods,
where it wasn't doing the copying of the Parcel that Parcel.readBundle() does
and is a basic requirement for it to work correctly.

This re-arranges the code to make all of these functions (hopefully) correct.

Also fix a problem in Parcel where we were not duping fds when copying data from
one Parcel to another.
2009-05-22 13:51:47 -07:00
Marco Nelissen
8f9ede0f6d am 7198030f: This should fix the simulator build.
Merge commit '7198030fce4b54820a65a10d54fae18a1ab5df84'

* commit '7198030fce4b54820a65a10d54fae18a1ab5df84':
  This should fix the simulator build.
2009-05-22 12:30:07 -07:00
Marco Nelissen
d95aabc9eb This should fix the simulator build. 2009-05-22 12:25:56 -07:00
Jean-Michel Trivi
a4e40fa924 Add AIDL files for the TTS service and the associated callback service (to signal synthesis completion). 2009-05-22 11:45:26 -07:00
Android (Google) Code Review
ece3e3b231 am 9d892a8e: Merge change 2336 into donut
Merge commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a'

* commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a':
  dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
2009-05-22 11:32:01 -07:00
Android (Google) Code Review
3a253bd4e4 am 9681a5e0: Merge change 2230 into donut
Merge commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98'

* commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98':
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it
2009-05-22 11:26:04 -07:00
Android (Google) Code Review
5752912e4b am 36e862a6: Merge change 2318 into donut
Merge commit '36e862a699aa2a23df1543665f39b5b0c96885fb'

* commit '36e862a699aa2a23df1543665f39b5b0c96885fb':
  Fixed vertical text position in search suggestion items.
2009-05-22 11:26:01 -07:00
Romain Guy
56852c7e40 am 380cd96e: Fix the build
Merge commit '380cd96e5d7018cbf43295c9f2f2a33897affd63'

* commit '380cd96e5d7018cbf43295c9f2f2a33897affd63':
  Fix the build
2009-05-22 11:25:56 -07:00
Romain Guy
2cdae55cd3 am c0292b04: Fix the build
Merge commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1'

* commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1':
  Fix the build
2009-05-22 11:25:52 -07:00
The Android Open Source Project
e7be66e5e5 merge f41c640d8424fbd90cb1751173ede1c9f5e848b4 w/minor conflict 2009-05-22 11:24:36 -07:00
Android (Google) Code Review
610de0974e Merge change 2336 into donut
* changes:
  dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
2009-05-22 10:40:48 -07:00
The Android Open Source Project
0931989f0b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-05-22 10:37:42 -07:00
Android (Google) Code Review
b6beb22a5f Merge change 2229
* changes:
  Add carrier/mcc factors to wifi-channel decision.
2009-05-22 09:33:09 -07:00
Android (Google) Code Review
454a625588 Merge change 2230 into donut
* changes:
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it can (eventually) move arbitrary threads into different cgroups
2009-05-22 08:47:54 -07:00
Android (Google) Code Review
e79c26d2c6 Merge change 2318 into donut
* changes:
  Fixed vertical text position in search suggestion items.
2009-05-22 08:45:11 -07:00
The Android Open Source Project
5d351f5756 merge 84ce47e64f9aa5600b6b3e205f8c6930a8095c7d w/minor conflicts 2009-05-22 07:48:37 -07:00
Android (Google) Code Review
840964f714 Merge change 2305 into donut
* changes:
  Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.
2009-05-22 02:02:57 -07:00
Android (Google) Code Review
fa33ce45da Merge change 2299 into donut
* changes:
  fix build breakage
2009-05-21 21:12:59 -07:00
Android (Google) Code Review
bdbf6b094d am 69a6c3eb: Merge change 2292 into donut
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'

* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
  split boot animation out of SurfaceFlinger
2009-05-21 19:36:53 -07:00
Android (Google) Code Review
1131392281 Merge change 2292 into donut
* changes:
  split boot animation out of SurfaceFlinger
2009-05-21 19:33:59 -07:00
Mathias Agopian
a1ecca920e split boot animation out of SurfaceFlinger
Conflicts:

	data/etc/platform.xml
2009-05-21 19:21:59 -07:00
Android (Google) Code Review
3cf34f1345 am cfcc0df2: Merge change 2285 into donut
Merge commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7'

* commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7':
  Move the Gestures API to the framework in android.gesture.
2009-05-21 18:18:21 -07:00
Android (Google) Code Review
156f418aa8 Merge change 2285 into donut
* changes:
  Move the Gestures API to the framework in android.gesture.
2009-05-21 18:16:51 -07:00
Dianne Hackborn
65f13d82fa am c4d5d026: Add new window manager type for a hacking second-level media surface.
Merge commit 'c4d5d02667af6989a3121072871f6a4b1e68b594'

* commit 'c4d5d02667af6989a3121072871f6a4b1e68b594':
  Add new window manager type for a hacking second-level media surface.
2009-05-21 17:54:44 -07:00
Android (Google) Code Review
9c954caf4f Merge change 2260
* changes:
  change 2115 wasn't merged properly into master. this fixes that.
2009-05-21 16:32:55 -07:00