61013 Commits

Author SHA1 Message Date
Jeff Sharkey
ccdeb428ef Merge "Avoid inconsistent state when remove fails." into ics-mr1 2011-11-08 17:27:03 -08:00
Jeff Brown
bc0b010ecc Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 2011-11-08 17:22:06 -08:00
Mathias Agopian
393e2c1f7a Merge "SensorService now always clamps the requested rate" into ics-mr1 2011-11-08 17:20:59 -08:00
Dianne Hackborn
3af8b88d03 Merge "Add drop box reports of low memory." into ics-mr1 2011-11-08 17:01:05 -08:00
Michael Kolb
a4293ba1a0 Merge "Remove flicker from WebTextView" into ics-mr1 2011-11-08 16:34:53 -08:00
Jamie Gennis
d211b4882a Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 2011-11-08 16:15:26 -08:00
Jamie Gennis
911263dc5d Merge changes I18e5e789,I5cbaae2d into ics-mr1
* changes:
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
2011-11-08 16:14:44 -08:00
Mathias Agopian
95482b61c3 Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 2011-11-08 15:55:55 -08:00
Jamie Gennis
d90bf3911d EGL: implement loading and saving the cache
This change adds support for saving and loading the contents of the EGL
cache.  It also adds some simple tests for the EGL cache.

Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
2011-11-08 15:54:36 -08:00
Irfan Sheriff
59c73b92a9 Merge "Convert soft ap config store to state machine" into ics-mr1 2011-11-08 15:51:43 -08:00
Irfan Sheriff
9575a1bea1 Convert soft ap config store to state machine
- Create thread when needed
- asynchronous interaction with wifi state machine

Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
2011-11-08 15:45:42 -08:00
Dianne Hackborn
e4d4fbc8c0 Add drop box reports of low memory.
We are tagging these as "watchdog" to make them visible in the
reporting tools.

Also new am command to kill all background processes, mostly to make
it easier to test this stuff.

Change-Id: Ib9dc4747cd8bd44156fdf11d6a087cd4272203eb
2011-11-08 15:44:34 -08:00
Dave Santoro
b78ae7524e Merge "Unhide social stream APIs for Contacts." into ics-mr1 2011-11-08 14:48:21 -08:00
Jeff Brown
1a69318266 Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug: 5569662

Change-Id: Ib8cb9fb68a1a2d3520f34f7fbf6f002dfb91809d
2011-11-08 14:45:59 -08:00
Adam Powell
650a3e8894 Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 2011-11-08 14:32:29 -08:00
Michael Kolb
39036ace76 Remove flicker from WebTextView
Bug: 5522186

   Update LayoutParams when position changed only

Change-Id: I54beb489c261090d7ba258354449501b771fd98e
2011-11-08 14:21:06 -08:00
Adam Powell
141bdb17dd Fix the action bar menu layout to use the correct divider drawable.
Change-Id: I9f9fe8318cbad3cfe4e34a37204a6c82a2e9a0c6
2011-11-08 13:33:58 -08:00
Wei Huang
ea50748b54 Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 2011-11-08 13:16:02 -08:00
Jeff Sharkey
38ddeaa67e Avoid inconsistent state when remove fails.
Bug: 5433432
Change-Id: Ia388fda006cbda09b5947fc61cec6353f75a3805
2011-11-08 13:04:22 -08:00
Matthew Xie
48542eb39e Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-08 12:19:37 -08:00
Matthew Xie
ad2321027e Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Give APP a way to find out if a service is supported by a remote device
bug 5487202

Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
2011-11-08 11:58:12 -08:00
Dianne Hackborn
665e105f14 Merge "Cleanup remote execution of perf tests." into ics-mr1 2011-11-08 11:52:58 -08:00
The Android Open Source Project
6dee1a9d04 Reconcile with ics-mr0-release
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
2011-11-08 11:08:20 -08:00
Dianne Hackborn
dd13793a25 Cleanup remote execution of perf tests.
Change-Id: I0d00537194f3a70969220db16f57bda6f25e454b
2011-11-08 10:59:28 -08:00
Adam Cohen
75b2038004 Merge "Making default widget padding public API" into ics-mr1 2011-11-08 10:53:39 -08:00
Robert Greenwalt
604019c8d4 Merge "Fix build." into ics-mr1 2011-11-08 10:31:37 -08:00
Robert Greenwalt
8588e47358 Fix build.
Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
Adam Powell
8689afbd63 Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1 2011-11-08 10:06:00 -08:00
Danielle Millett
b9b0825737 Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
ea54b76085 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
Adam Powell
42b7e99b11 Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
Pre-Holo spinners had a far more "buttony" look that expressed the
disabled state clearly, but Holo spinners are more subtle. As a result
we want to mark the contained view representing the current item as
disabled when the spinner itself is disabled.

Express this as a private framework style attribute that cannot be
changed at runtime.

Change-Id: Icff2ef2b8a3b1a96cbf00e4c75eda41a4dada7b3
2011-11-08 09:49:21 -08:00
Tom Taylor
1366c756d2 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
f3a892ab93 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -08:00
The Android Automerger
b4f88de3c7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-08 06:41:10 -08:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
2011-11-08 05:58:37 -08:00
Wu-cheng Li
b75783571b Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
ACTION_CAMERA_BUTTON is for camera hardware button. Change the
intent to INTENT_ACTION_STILL_IMAGE_CAMERA.

bug:5572158

Change-Id: I49ffbf50ecd4458065ee1c2d1fdab8d9e696a1a8
2011-11-08 21:19:34 +08:00
Narayan Kamath
98f5500c71 Merge "Fix a bug in the network TTS api." into ics-mr1 2011-11-08 02:09:18 -08:00
Gilles Debunne
39896f52a8 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08:00
Chih-Chung Chang
713c9a331e Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08:00
Matthew Xie
67f1ceb616 Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Mathias Agopian
a06c06b9c0 Fix an issue where we could wait for a non-existing transaction
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"

Note: the system would recover after a 5 second timeout.

Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
2011-11-07 21:58:03 -08:00
Mathias Agopian
7f1c94e198 Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08:00
Mathias Agopian
eed2373321 SensorService now always clamps the requested rate
Requested rate will be clamped to the minimum rate and then
to 1ms. Previously we would return an error if a lower
rate was asked. The SensorManager documentation wording
allows this change.

We do this to get more consistancy between all the sensor
drivers / HALs

Change-Id: I199f76486fb76ccbb11e7280460a03726c767e84
2011-11-07 21:21:47 -08:00
Daniel Sandler
c06669a303 Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 2011-11-07 19:47:51 -08:00
Dianne Hackborn
84b02130a9 Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 2011-11-07 18:46:54 -08:00
Adam Cohen
4c96a59b43 Making default widget padding public API
Change-Id: Ibf4f5dc1a36d84be1acc3ccdc4330276f82aa303
2011-11-07 17:59:23 -08:00
Adam Powell
13194b16d0 Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 2011-11-07 17:55:17 -08:00