25230 Commits

Author SHA1 Message Date
Mike Lockwood
622ccdc218 MTP device: Read manufacturer name and serial number from system properties.
Change-Id: I8d1ad79f38aaaa50fa8899e6b614096af95fdf39
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 17:59:46 -07:00
Brad Fitzpatrick
26b327c80b am 6b9b8806: am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '6b9b8806afb06e393203450bda8a53af08952590'

* commit '6b9b8806afb06e393203450bda8a53af08952590':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:36:12 -07:00
Brad Fitzpatrick
6b9b8806af am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp

* commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:34:22 -07:00
Steve Block
dbf72e21a4 Merge "Add the basic outline of the web runtime used to display installed web applications" 2010-06-14 09:32:38 -07:00
Brad Fitzpatrick
60e8c33d6f Merge "Dropbox: remove redundant Entry construction." into gingerbread 2010-06-14 09:32:26 -07:00
Mike Lockwood
44cf0a0682 MTP: Fix uninitialized pointer bug.
Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 09:13:11 -07:00
Eric Laurent
7f5ee3b58d am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'

* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:10:32 -07:00
Eric Laurent
184a3ff64b am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0' into gingerbread-plus-aosp

* commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:07:03 -07:00
Eric Laurent
e0219539c6 am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:04:33 -07:00
Eric Laurent
01f7ac6448 Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 2010-06-14 09:02:13 -07:00
Brad Fitzpatrick
14418945bd Dropbox: remove redundant Entry construction.
Change-Id: I55d8da82acea7f1cf0a69912fe5d4d46d704b570
2010-06-14 08:58:26 -07:00
Steve Block
4deb139b8e Add the basic outline of the web runtime used to display installed web applications
This is still a work in progress.

Bug: 2766920

Change-Id: I2d3dd4b3b88bf84d8d66386e43a21c4085627c4d
2010-06-14 16:58:10 +01:00
Chih-Chung Chang
a47078a5b0 am da755ad3: am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit 'da755ad331aa77fb3780b84c384a27d0217bf410'

* commit 'da755ad331aa77fb3780b84c384a27d0217bf410':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:17:59 -07:00
Chih-Chung Chang
da755ad331 am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit 'f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp

* commit 'f1cefa916712dafc8b47f6eb8132a688892d4995':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:14:09 -07:00
Chih-Chung Chang
f1cefa9167 am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit '724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread

* commit '724c52244423feced2677fbd1f905e0b8b0639f2':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:11:00 -07:00
Chih-Chung Chang
724c522444 Correct the setDisplayOrientation sample code.
Change-Id: I37af4090b383204a5fd228a4388732e11ef2fa8c
2010-06-14 19:07:17 +08:00
Jeff Brown
d983a25b25 am 4166aec5: am 28a6c8e9: am d890cbf7: Remove PollLoop from host build.
Merge commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b'

* commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b':
  Remove PollLoop from host build.
2010-06-13 20:28:29 -07:00
Jeff Brown
4166aec567 am 28a6c8e9: am d890cbf7: Remove PollLoop from host build.
Merge commit '28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8' into gingerbread-plus-aosp

* commit '28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8':
  Remove PollLoop from host build.
2010-06-13 20:26:54 -07:00
Jeff Brown
28a6c8e9b3 am d890cbf7: Remove PollLoop from host build.
Merge commit 'd890cbf700695c869e6b45cddf7f132484697588' into gingerbread

* commit 'd890cbf700695c869e6b45cddf7f132484697588':
  Remove PollLoop from host build.
2010-06-13 20:25:29 -07:00
Jeff Brown
d890cbf700 Remove PollLoop from host build.
We can't build (and we don't need) PollLoop in the SDK on all platforms.

Change-Id: I3b0f327bbb8bc58b9b8630b0161cf360403fea68
2010-06-13 20:21:19 -07:00
Jeff Brown
0d6be5800a am 34b418cd: am 5e95930b: am 43a9527c: Fix include paths.
Merge commit '34b418cddbd2f05d5c0a98c550c65e457015134e'

* commit '34b418cddbd2f05d5c0a98c550c65e457015134e':
  Fix include paths.
2010-06-13 20:03:20 -07:00
Jeff Brown
34b418cddb am 5e95930b: am 43a9527c: Fix include paths.
Merge commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp

* commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f':
  Fix include paths.
2010-06-13 20:01:47 -07:00
Jeff Brown
5e95930bd8 am 43a9527c: Fix include paths.
Merge commit '43a9527c54b71cb17515591af37eeeef6c22e3ff' into gingerbread

* commit '43a9527c54b71cb17515591af37eeeef6c22e3ff':
  Fix include paths.
2010-06-13 19:59:26 -07:00
Jeff Brown
43a9527c54 Fix include paths.
Change-Id: Ifda45688f9f02710a74d5d7a7d902bacf1441e2e
2010-06-13 19:35:19 -07:00
Jeff Brown
8e03b7566c resolved conflicts for merge of 9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
2010-06-13 19:16:55 -07:00
Jeff Brown
9e660c8201 am 7c8aa44f: am 46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7' into gingerbread-plus-aosp

* commit '7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7':
  Native input dispatch rewrite work in progress.
2010-06-13 17:59:04 -07:00
Jeff Brown
7c8aa44f32 am 46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread

* commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2':
  Native input dispatch rewrite work in progress.
2010-06-13 17:55:28 -07:00
Jeff Brown
46b9ac0ae2 Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now.  To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.

Includes part of the new input event NDK API.  Some details TBD.

To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument.  The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points.  The ViewRoot then
provides the InputChannel to the InputQueue.  Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue.  This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.

There can be zero or more targets for any given input event.  Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets).  Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.

End-to-end event dispatch mostly works!

To do: event injection, rate limiting, ANRs, testing, optimization, etc.

Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
2010-06-13 17:42:16 -07:00
Dianne Hackborn
5ddd127d5a Implement ListFragment and Fragment context menus.
Also fix the docs build.

Change-Id: I96f24cc03e6debd897171e503957284b140a9f27
2010-06-12 22:34:04 -07:00
Wink Saville
4dc643eb67 Fix some javadoc link/see's to fix the build for the sdk-win_sdk target.
Change-Id: I243c19d3d7f1ed2decbd6bfc7ecbe6ce2b582fc2
2010-06-12 22:16:41 -07:00
Mike Lockwood
70bd2f2099 CameraBrowser: Requery the device list when MTP devices are added and removed.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-12 21:35:30 -04:00
Mike Lockwood
74f094fe22 MTP: Add interface to MtpClient for receiving device added/removed events.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-12 21:35:27 -04:00
Brad Fitzpatrick
0c330e26e8 am 11bd9d1e: am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '11bd9d1ec20ce3bbd3791b537faad429a1ca87e7'

* commit '11bd9d1ec20ce3bbd3791b537faad429a1ca87e7':
  More StrictMode work, handling violations in ActivityManagerService.
2010-06-11 18:30:09 -07:00
Brad Fitzpatrick
11bd9d1ec2 am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp

* commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
  More StrictMode work, handling violations in ActivityManagerService.
2010-06-11 18:28:57 -07:00
Brad Fitzpatrick
94f14aeca9 Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread 2010-06-11 18:27:20 -07:00
David 'Digit' Turner
01f2f960e7 Improved native TTS interface header.
The purpose of this patch is to add a C-based ABI that can be exposed by the NDK
for developers wanting to write a TTS Engine. This replaces the C++ ABI that is
currently under frameworks/base/include/tts/TtsEngine.h but is *binary* compatible
with it.

As a consequence, the svox pico plugin under external/svox/pico/tts/, which
links against tts/TtsEngine.h can be loaded by the TTS service properly.

Another patch would modify the pico tts to use <android/tts.h>, then we will
be able to get rid of <tts/TtsEngine.h> in the source tree.

Change-Id: I16844cef9b5b006cc32655a29e4f9f193c8c1a91
2010-06-11 18:02:51 -07:00
Dirk Dougherty
28d0112375 am c59793e1: am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit 'c59793e13146d81daec912d1fb91cff9c958e04b'

* commit 'c59793e13146d81daec912d1fb91cff9c958e04b':
  Doc change: remove pdf summary of guidelines from templates archive.
2010-06-11 17:00:47 -07:00
Dirk Dougherty
c59793e131 am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp

* commit '3a010fa6192f09121fc920810c5a8366b5b09f46':
  Doc change: remove pdf summary of guidelines from templates archive.
2010-06-11 16:58:34 -07:00
Dirk Dougherty
3a010fa619 am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread

* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
  Doc change: remove pdf summary of guidelines from templates archive.
2010-06-11 16:56:04 -07:00
Dirk Dougherty
1067e6895e Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Brad Fitzpatrick
46d4238746 More StrictMode work, handling violations in ActivityManagerService.
Also starts to do duplicate-suppression.

Change-Id: I0502f6ab6c45fa319298de4874ecfe44b7829d21
2010-06-11 16:11:26 -07:00
Andreas Huber
30d5ca398d am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...
2010-06-11 16:01:34 -07:00
Dirk Dougherty
e6727df7a7 Doc change: remove pdf summary of guidelines from templates archive.
Change-Id: I5394d1f95013ddf7790beda1f33e212bfbaee641
2010-06-11 15:59:47 -07:00
Andreas Huber
df60830a42 am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp

* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
  Must hold lock here...
2010-06-11 15:59:30 -07:00
Andreas Huber
126ca6f9ec Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Irfan Sheriff
835f6999b8 am a4fb8b3d: am c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc'

* commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc':
  Dont persist config on failure
2010-06-11 15:32:24 -07:00
Irfan Sheriff
a4fb8b3de3 am c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp

* commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc':
  Dont persist config on failure
2010-06-11 15:30:36 -07:00
Irfan Sheriff
c2bc66d405 Merge "Dont persist config on failure" into gingerbread 2010-06-11 15:28:24 -07:00
Mike Lockwood
5bd667a3a7 Merge "CameraBrowser: Support for deleting pictures." 2010-06-11 15:14:16 -07:00
Mike Lockwood
0cd0e797da Merge "MTP: Add host support for deleting objects." 2010-06-11 15:13:38 -07:00