Commit Graph

255075 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
4cf03d381b Reconcile cupcake history into donut
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD
2009-05-22 14:35:33 -07:00
Fred Quintana
8943737692 add ipc support to batching 2009-05-22 14:17:48 -07:00
Romain Guy
b6888167d3 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:09:29 -07:00
Dianne Hackborn
6aff905048 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
Wei Huang
58eef7e4cf add Gservices setting for "send message using bareJid timeout". 2009-05-22 13:30:03 -07:00
Jaikumar Ganesh
b3d49f1569 Fix Disconnect path for CDMA.
The corresponding fix has already been made for GSM.
When data state is in CONNECTING state and and we try
to disable the data, we set a pending disconnect but never
disconnect once we are connected.
2009-05-22 13:05:30 -07:00
Marco Nelissen
fc5095f44b 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
7198030fce This should fix the simulator build. 2009-05-22 12:25:56 -07:00
Marco Nelissen
e754e128e6 Change the media key algorithm to also ignore double quotes. 2009-05-22 12:22:16 -07:00
Jean-Michel Trivi
2c0c2af2ea 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
c518080c11 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
9db377e3de 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
83ce0c4fdf 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
d942f243e5 am 380cd96e: Fix the build
Merge commit '380cd96e5d7018cbf43295c9f2f2a33897affd63'

* commit '380cd96e5d7018cbf43295c9f2f2a33897affd63':
  Fix the build
2009-05-22 11:25:56 -07:00
Romain Guy
4c723bc794 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
d14508b4d6 merge f41c640d84 w/minor conflict 2009-05-22 11:24:36 -07:00
Android (Google) Code Review
9d892a8e30 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
f17fef48dc Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-05-22 10:37:42 -07:00
Mike Lockwood
472be48007 dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-22 13:31:42 -04:00
Android (Google) Code Review
1ab55ea04f Merge change 2229
* changes:
  Add carrier/mcc factors to wifi-channel decision.
2009-05-22 09:33:09 -07:00
Robert Greenwalt
b5010cc3c3 Add carrier/mcc factors to wifi-channel decision.
Uses ro.carrier and MCC when available to try to set
(non-persistingly) the number of allowed wifi channels.
Part of the fix for 1625953.
2009-05-22 09:31:41 -07:00
Android (Google) Code Review
9681a5e06b 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
36e862a699 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
12dacd90c4 merge 84ce47e64f w/minor conflicts 2009-05-22 07:48:37 -07:00
Romain Guy
380cd96e5d Fix the build 2009-05-22 07:32:41 -07:00
Bjorn Bringert
eb128730b5 Fixed vertical text position in search suggestion items.
Background:

mlebeau said: "Cole had complained that the vertical alignment of the
text fields in search_dropdown_item_icons_2line.xml was a little
off. Specifically, when both lines are visible he wanted to see line1
pushed down 2-4 pixels (while keeping line2 in the same position as
now), and when only line1 is visible, he said it needed to be pushed
up 2-4 pixels from current."

Here's how the layout worked before (note that text2 and text1
are in this order in the layout file):

- If text2 is present, it is put at the bottom, with height set by
  layout_height (currently 29dip) .  - The line2 text is put at the top
  of text2 (gravity=top).

- I think the paddingBottom=4dip in text2 has no effect, since the
  text is top-aligned anyway.

- text1 is put at the top of the list item. If text2 is present, it
  will have height 29dip (58 dip - 29 dip height of text2). It's a bit
  weird, layout_height of text1 is completely ignored, but it has to be
  set to something. If text2 is missing, it will fill the entire list
  item height (58 dip).

- The line1 text is placed 4dip below the vertical center of text1
  (4dip because of paddingTop).

Now, instead, text1 has height=wrap_content, and is placed right above
text2, if that's present. If text2 is absent, text1 is centered
vertically in the list item. This should have the desired effect.
If we want to tweak the positioning further in the case where text2
is visible, we can adjust the padding of text1.
2009-05-22 13:42:29 +01:00
Romain Guy
c0292b0440 Fix the build 2009-05-22 02:39:24 -07:00
Mathias Agopian
947f4f4d38 merge master to master_gl 2009-05-22 02:16:08 -07:00
Android (Google) Code Review
f41c640d84 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
Romain Guy
d6a463a9f2 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 01:59:59 -07:00
Tammo Spalink
550885d158 added SmsMessage ConcatRef parsing validation
addresses bugs:
http://b/issue?id=1870607
http://b/issue?id=1688238

and prior perforce commit:
http://s9/?change_num=136189
2009-05-22 13:38:35 +08:00
Android (Google) Code Review
84ce47e64f Merge change 2299 into donut
* changes:
  fix build breakage
2009-05-21 21:12:59 -07:00
Daisuke Miyakawa
77f57f67c7 fix build breakage 2009-05-22 13:12:18 +09:00
Daisuke Miyakawa
0690519fcd fix build breakage 2009-05-22 13:05:23 +09:00
Mathias Agopian
ac31a3b8b0 this should fix the build 2009-05-21 19:59:24 -07:00
Android (Google) Code Review
e755d64977 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
69a6c3ebd4 Merge change 2292 into donut
* changes:
  split boot animation out of SurfaceFlinger
2009-05-21 19:33:59 -07:00
Mathias Agopian
627e7b50be split boot animation out of SurfaceFlinger
Conflicts:

	data/etc/platform.xml
2009-05-21 19:21:59 -07:00
Dianne Hackborn
03536ea70c Fix public.xml to clean up Eclair's public resources. 2009-05-21 18:42:51 -07:00
Android (Google) Code Review
e6c9378bae 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
cfcc0df265 Merge change 2285 into donut
* changes:
  Move the Gestures API to the framework in android.gesture.
2009-05-21 18:16:51 -07:00
Romain Guy
db567c390b Move the Gestures API to the framework in android.gesture. 2009-05-21 18:12:56 -07:00
Dianne Hackborn
efb0212d9c am 540d7de2: Implement support for new second-level media window type.
Merge commit '540d7de241b39b28480bf4b1bf6870307935fd8b'

* commit '540d7de241b39b28480bf4b1bf6870307935fd8b':
  Implement support for new second-level media window type.
2009-05-21 17:56:32 -07:00
Dianne Hackborn
47588ef1a2 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
Dianne Hackborn
c4d5d02667 Add new window manager type for a hacking second-level media surface.
This adds a new window type that is a surface that sits between the
current media type and the application window, in theory allowing you
to have two surface views in your hierarchy and control their
Z-ordering.  There is also another hidden API on SurfaceView to set
the type of your window.

All a big hack, but for the good of the commonwealth!
2009-05-21 17:50:33 -07:00
Dianne Hackborn
5cb8d79f8a Implement support for new second-level media window type. 2009-05-21 17:34:15 -07:00
Leon Scroggins
213a31c7d5 Fix some Java mistakes found by FindBugs.
Use Integer.valueOf() instead of new Integer()
Eliminate unused fields in InvokeListBox
Make FocusNode, HitTestRequest, and ExtendedZoomControls
static inner classes.
2009-05-21 16:49:32 -07:00
Android (Google) Code Review
bca8ecf805 Merge change 2260
* changes:
  change 2115 wasn't merged properly into master. this fixes that.
2009-05-21 16:32:55 -07:00
Mathias Agopian
dfece80c79 change 2115 wasn't merged properly into master. this fixes that.
Merge change 2115 into donut

* changes:
  bring the native_handle stuff back from master_gl

Conflicts:

	libs/binder/Parcel.cpp
2009-05-21 16:29:38 -07:00
Android (Google) Code Review
547a397f9b am 384bfa27: Merge change 2227 into donut
Merge commit '384bfa270cdcb5dc3bc9ec396b783e25eb2d9b4d'

* commit '384bfa270cdcb5dc3bc9ec396b783e25eb2d9b4d':
  Add header declaring the interface for TTS engines to implement.
2009-05-21 16:18:48 -07:00