Commit Graph

18104 Commits

Author SHA1 Message Date
Mathias Agopian
d10f9fbc39 am db386f2c: am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread
Merge commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916'

* commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916':
  first step at implementing the native sensor support
2010-07-14 16:39:55 -07:00
Mathias Agopian
58736b5a19 am 98704f14: am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread
Merge commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87'

* commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87':
  Remove the YV16 format for simplicity's sake.
2010-07-14 16:39:42 -07:00
Adam Powell
e4bb6d2692 Merge "Bug 2841148 - Add accessors for action bar context mode state." 2010-07-14 16:39:04 -07:00
Mathias Agopian
5078529ef0 am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread
Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp

* commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06':
  first step at implementing the native sensor support
2010-07-14 16:36:19 -07:00
Mathias Agopian
c649fb1cc1 am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread
Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp

* commit '38eea8bf990540360b45b963195a7766c30b55d2':
  Remove the YV16 format for simplicity's sake.
2010-07-14 16:35:55 -07:00
Romain Guy
6c382b63ba Merge "Do not apply transforms when using drawColor()." 2010-07-14 16:35:37 -07:00
Mathias Agopian
e1ea0811de Merge "first step at implementing the native sensor support" into gingerbread 2010-07-14 16:32:04 -07:00
Mathias Agopian
91c2a6644e Merge "Remove the YV16 format for simplicity's sake." into gingerbread 2010-07-14 16:30:41 -07:00
The Android Open Source Project
574b033f76 am 50576fa8: merge from open-source master
Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'

* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
  Start app with several activities with intent filter [Main, Launcher] was broken
2010-07-14 16:14:06 -07:00
The Android Open Source Project
1ffda8d7e9 merge from open-source master
Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
2010-07-14 16:11:13 -07:00
Konstantin Lopyrev
d774dd92d5 am 975ecddc: am 6e0f65fd: Adding focus change notification
Merge commit '975ecddc9e72b8217d36e653fb9deabb9fd5b859'

* commit '975ecddc9e72b8217d36e653fb9deabb9fd5b859':
  Adding focus change notification
2010-07-14 16:07:47 -07:00
Konstantin Lopyrev
9922af3359 am 6e0f65fd: Adding focus change notification
Merge commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1' into gingerbread-plus-aosp

* commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1':
  Adding focus change notification
2010-07-14 16:04:44 -07:00
Charles Chen
2b499a305e Merge "Adding the old legacy method for getTtsEngine for Froyo compatibility." 2010-07-14 15:37:50 -07:00
Mathias Agopian
48c3476371 Remove the YV16 format for simplicity's sake.
Change-Id: Iee03d100933ba0c67b13d51e0435be3b4cd953cf
2010-07-14 15:12:05 -07:00
Adam Powell
d828013e2e Merge "Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate" 2010-07-14 14:51:12 -07:00
Adam Powell
137341a225 Merge "Fix bug 2838426 - timing issue with starting/finishing action bar context modes" 2010-07-14 14:25:48 -07:00
Mike Lockwood
8606c83cee Merge "MtpDatabase: Implement getObjectProperty" 2010-07-14 12:44:41 -07:00
The Android Open Source Project
5d45483b8c am d7da5164: merge from open-source master
Merge commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c'

* commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c':
  Telephony: Process MT SMS with MTI set to 3
2010-07-14 12:23:12 -07:00
The Android Open Source Project
ae0d374d26 merge from open-source master
Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
2010-07-14 12:18:01 -07:00
Dianne Hackborn
88c316a1f5 Merge "Fix fragment index expunging." 2010-07-14 12:17:24 -07:00
Steve Howard
8582d78647 am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
2010-07-14 11:25:32 -07:00
Steve Howard
dbe336cabc am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Steve Howard
91397cb3f0 Merge "Download manager support for file URIs + last modified time" into gingerbread 2010-07-14 11:19:38 -07:00
Jean-Michel Trivi
5719162737 am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'

* commit '5473434f060d8c036a30a1992b036a2f70da265d':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:15:31 -07:00
Jean-Michel Trivi
12b581e90e am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:12:14 -07:00
Romain Guy
ebeb97c709 Merge "Prevent crash in ListView when changing cache hint." 2010-07-14 11:08:38 -07:00
Robert Greenwalt
836b2b755e Merge "Pass network properties to ConnectivityService." 2010-07-14 09:09:31 -07:00
Jean-Baptiste Queru
022164b58e Merge "Start app with several activities with intent filter [Main, Launcher] was broken" 2010-07-14 09:03:30 -07:00
Andy McFadden
b7e4167133 Merge "Implement native dump for "am dumpheap -n"." 2010-07-14 07:45:09 -07:00
Mathias Agopian
589ce85ee4 first step at implementing the native sensor support
in this commit:
- implemented the C stub
- implemented the binder interfaces involved
- implemented most of the C++ client side

missing:
- SensorManager cannot connect to the SensorServer yet
(because there is no SensorServer yet)

Change-Id: I75010cbeef31c98d6fa62fd5d388dcef87c2636b
2010-07-13 22:21:56 -07:00
Mathias Agopian
e1501fef06 am e69204a0: am 36ff93aa: Merge "NDK sensor API" into gingerbread
Merge commit 'e69204a02a9d2babd5352180fb541e7295db911a'

* commit 'e69204a02a9d2babd5352180fb541e7295db911a':
  NDK sensor API
2010-07-13 21:23:52 -07:00
Mathias Agopian
7985f1a081 am 36ff93aa: Merge "NDK sensor API" into gingerbread
Merge commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a' into gingerbread-plus-aosp

* commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a':
  NDK sensor API
2010-07-13 21:19:58 -07:00
Mathias Agopian
7bd6b95749 Merge "NDK sensor API" into gingerbread 2010-07-13 21:18:30 -07:00
Dianne Hackborn
cc2d24b513 am b2473fd6: am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a'

* commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a':
  Fix docs build.
2010-07-13 21:18:05 -07:00
Dianne Hackborn
bea17e6943 am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp

* commit '021e906a46f044025ce0a4632309abecd069240d':
  Fix docs build.
2010-07-13 21:14:47 -07:00
Dianne Hackborn
ad48769812 Merge "Fix docs build." into gingerbread 2010-07-13 21:12:22 -07:00
Jack Palevich
a6024ee818 am 43429036: am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread
Merge commit '43429036f5885063e522603e51c5f59f8b9e697a'

* commit '43429036f5885063e522603e51c5f59f8b9e697a':
  Fix deadlock when switching between two GLSurfaceViews
2010-07-13 21:11:48 -07:00
Dianne Hackborn
66d3d8e488 am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'f8d9379bd834573feca085284970cf686993c330'

* commit 'f8d9379bd834573feca085284970cf686993c330':
  IME events are now dispatched to native applications.
2010-07-13 19:50:36 -07:00
Romain Guy
31967eb8a3 Merge "Add a default xlarge wallpaper." 2010-07-13 19:40:27 -07:00
Jack Palevich
a8a90c2009 am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp

* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
  Fix deadlock when switching between two GLSurfaceViews
2010-07-13 19:12:32 -07:00
Jack Palevich
e263e20ff8 Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread 2010-07-13 19:10:22 -07:00
Dianne Hackborn
54311fdcdf am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp

* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
  IME events are now dispatched to native applications.
2010-07-13 18:55:52 -07:00
Dianne Hackborn
80f386b12c Merge "Fix bug where LoaderManager instances were not being removed." 2010-07-13 18:40:42 -07:00
Dianne Hackborn
ce838a265d IME events are now dispatched to native applications.
And also:

- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
  around the IME or status bar).

There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.

Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
2010-07-13 18:36:46 -07:00
Jeff Brown
94eed383c9 am 89ee578b: am fd035829: Add initial gamepad support.
Merge commit '89ee578b7053d27a50922f82feb94bf6054b330c'

* commit '89ee578b7053d27a50922f82feb94bf6054b330c':
  Add initial gamepad support.
2010-07-13 17:48:56 -07:00
Jeff Brown
29f5e89e2c am fd035829: Add initial gamepad support.
Merge commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7' into gingerbread-plus-aosp

* commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7':
  Add initial gamepad support.
2010-07-13 17:46:19 -07:00
Romain Guy
bda1165c6d Merge "Enable 32-bits only assets." 2010-07-13 17:42:00 -07:00
Mike Lockwood
a49f834a0a Merge "MTP: Add support for sending events to the host when objects are added and removed" 2010-07-13 17:14:45 -07:00
Jeff Brown
8575a87b0d Add initial gamepad support.
Change-Id: I0439648f6eb5405f200e4223c915eb3a418b32b9
2010-07-13 17:04:57 -07:00
Jean-Baptiste Queru
cd39a755a5 Merge "Telephony: Process MT SMS with MTI set to 3" 2010-07-13 16:20:30 -07:00