Commit Graph

16182 Commits

Author SHA1 Message Date
Xia Wang
7cfd5ebcc7 Merge "DO NOT MERGE" into gingerbread 2010-07-30 13:44:23 -07:00
Andreas Huber
f94c59413e am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread

* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-30 12:15:02 -07:00
Jean-Baptiste Queru
8fb1869d39 resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
2010-07-30 12:08:31 -07:00
Gilles Debunne
c080e5e523 am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread

* commit '3d8d9440d844816f065d2b10eb75bb693683cdad':
  Fixes regarding densities in "Providing Resources" documentation page.
2010-07-30 11:53:21 -07:00
Gilles Debunne
55c65ca3f1 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:53:16 -07:00
Steve Howard
174ff06028 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Andreas Huber
3d4ba7f573 Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 2010-07-30 08:05:56 -07:00
Mathias Agopian
bb0628d9de remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.

Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
2010-07-29 23:28:03 -07:00
Mathias Agopian
3a8e497f3b Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread 2010-07-29 20:52:26 -07:00
Mathias Agopian
a48bcf62b6 Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
2010-07-29 18:18:00 -07:00
The Android Open Source Project
7b8a2361ce Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD 2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
d80c3e2f3c fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Gilles Debunne
81213d6a60 Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 2010-07-29 17:39:32 -07:00
Gilles Debunne
e2ca0e83c9 Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 2010-07-29 17:39:18 -07:00
The Android Open Source Project
27065359e3 am 392edec1: Merge from open-source froyo
Merge commit '392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread

* commit '392edec1162e9d00bcb66b271f43908f75d42ace':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 15:46:48 -07:00
The Android Open Source Project
b5a0d4b2df Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
2010-07-29 15:38:49 -07:00
Dianne Hackborn
8766192cf1 Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread 2010-07-29 14:07:14 -07:00
Christopher Tate
a58452270b Merge "Attempt to fix the SDK build" into gingerbread 2010-07-29 13:53:37 -07:00
Christopher Tate
6c6a3fbd9d Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().

Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
2010-07-29 13:42:45 -07:00
Jeff Brown
82de2fcdd0 Fix touch input in landscape mode.
Change-Id: I7d47e9b02e6443ed604a6bf842028a5db934d90d
2010-07-29 13:05:52 -07:00
Jeff Brown
f67c53eee3 DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
2010-07-29 12:54:27 -07:00
Andreas Huber
302dd91b86 am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread

* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
  Squashed commit of the following:
2010-07-29 11:07:49 -07:00
Chris Tate
7fd86dea00 Merge "Change unistd.h to stddef.h to be correct" into gingerbread 2010-07-28 18:14:51 -07:00
Adam Powell
01467048a0 Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread 2010-07-28 16:56:13 -07:00
Kenny Root
0832a31d54 Change unistd.h to stddef.h to be correct
size_t should be defined through inclusion of stddef.h instead of unistd.h

Change-Id: Ieaadacfca1e1c44c2533ea95f73fc060c1519b52
2010-07-28 16:46:12 -07:00
Kenny Root
8e8ca37747 Merge "Add stdint.h to fix sim-eng" into gingerbread 2010-07-28 16:41:49 -07:00
Kenny Root
28282dc4e6 Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread 2010-07-28 16:37:20 -07:00
Kenny Root
937cd1b707 Add unistd.h for size_t typedef to fix sim-eng
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
2010-07-28 16:31:24 -07:00
Mathias Agopian
edae28809a Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread 2010-07-28 16:30:56 -07:00
Christopher Tate
46f28d328a Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread 2010-07-28 15:36:48 -07:00
Christopher Tate
a45a8008c6 Support streaming of compressed assets > 1 megabyte
Compressed assets larger than one megabyte are now decompressed on demand
rather than being decompressed in their entirety and held in memory.  Reading
the data in order is relatively efficient, as is seeking forward in the stream.
Seeking backwards is supported, but requires reprocessing the compressed data
from the beginning, so is very inefficient.

In addition, the size limit on compressed assets has been eliminated.

Change-Id: I6e68247957e6c53e7e8ba70d12764695f1723bad
2010-07-28 15:33:28 -07:00
James Dong
6b60f5860d Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread 2010-07-28 15:28:54 -07:00
Kenny Root
5f482e915f Merge "Fix getTempContainerId()" into gingerbread 2010-07-28 14:48:40 -07:00
Scott Main
7d3bc349d9 am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread

* commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
  fix markup error
2010-07-28 14:23:16 -07:00
Scott Main
9c990d4d8a Merge "fix markup error bug:2871538" into froyo 2010-07-28 14:20:18 -07:00
Jeff Brown
e57e895080 Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type.  This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.

Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).

Simplified EventHub interface somewhat since InputReader is taking over
more of the work.

Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.

Fixed swiping finger from screen edge into display area.

Added logging of device information to 'dumpsys window'.

Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
2010-07-28 14:16:15 -07:00
Dan Egnor
43d71c5805 am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread

* commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:40:16 -07:00
James Dong
41af3d253e Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 2010-07-28 11:58:12 -07:00
Joe Onorato
9996342da5 Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 2010-07-28 09:53:12 -07:00
Eric Laurent
de63b463a5 Merge "Audio effects: modified command() parameter types." into gingerbread 2010-07-28 07:48:49 -07:00
Mike Lockwood
1b55aad8ef Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Mathias Agopian
208cb07724 fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
this situation happened when the last buffer needed to be resized
(or allocated, the first time). the assumption was that the buffer
was in use by SF itself as the current buffer (obviously, this
assumption made no sense when the buffer had never been allocated, btw).

the system would wait until some other buffer became the "front" buffer.

we fix this problem by entirely removing the requirement that the
buffer being resized cannot be the front buffer. instead, we just
allocate a new buffer and replace the front buffer by the new one.

the downside is that this uses more memory (an extra buffer) for a
brief amount of time while the old buffer is being reallocated and
before it has actually been replaced.

Change-Id: I022e4621209474ceb1c671b23deb4188eaaa7285
2010-07-27 20:11:35 -07:00
Brad Fitzpatrick
6c595a17f5 Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Steve Howard
38fa7eccc1 Merge "One last change to current.xml for new download manager API" into gingerbread 2010-07-27 16:55:14 -07:00
Brad Fitzpatrick
928b1c94a5 am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread

* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
  COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:52:12 -07:00
Brad Fitzpatrick
be2ec77f92 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Steve Howard
1faba30b39 Merge "Un-@hide new download manager public API." into gingerbread 2010-07-27 16:29:37 -07:00
Brad Fitzpatrick
55fcdbc397 Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 2010-07-27 15:19:08 -07:00
Brad Fitzpatrick
834772c15b Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 2010-07-27 13:59:47 -07:00
Brad Fitzpatrick
70081a1511 Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
2010-07-27 12:28:57 -07:00