3307 Commits

Author SHA1 Message Date
Irfan Sheriff
c983960a92 Merge "Asynchronous API" 2010-08-12 07:58:46 -07:00
Irfan Sheriff
e04653cbd0 Asynchronous API
Add asynchronous API for simplified connect, save
and remove.

Add a SUPPLICANT_CONFIG_CHANGED_ACTION broadcast to
notifiy a supplicant configuration change.

Change-Id: I69ae116246094de4a469cb2af5baf37e5ad4d6dd
2010-08-12 07:57:36 -07:00
Dianne Hackborn
5caaf378d8 am 9185e26a: am fb86ce93: Add watermark support.
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'

* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
  Add watermark support.
2010-08-11 22:10:07 -07:00
Dianne Hackborn
9185e26a8f am fb86ce93: Add watermark support.
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp

* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
  Add watermark support.
2010-08-11 22:04:27 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support.
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
2010-08-11 18:15:29 -07:00
Mathias Agopian
aa17f00405 am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully
2010-08-11 18:07:42 -07:00
Mathias Agopian
70a7c92e16 am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp

* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
  should fix sim build, hopefully
2010-08-11 17:35:58 -07:00
Mathias Agopian
65f2490e1b Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6 should fix sim build, hopefully
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
2010-08-11 17:31:33 -07:00
Mathias Agopian
a0e28da5ab am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread
Merge commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5'

* commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5':
  call into hwcomposer HAL when present
2010-08-11 16:30:13 -07:00
Mathias Agopian
5c9cb3843f am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread
Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4'

* commit '308e69896c2812953d74ea63fe964bebaa68eef4':
  don't handle the transparent region of a layer in draw()
2010-08-11 16:30:09 -07:00
Mathias Agopian
ebb7ae51c2 am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread
Merge commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f'

* commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f':
  get rid of our LayerVector implementation
2010-08-11 16:30:05 -07:00
Mathias Agopian
5744cd6ac8 am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread
Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp

* commit '90dc48b17f673b7e334e3254ea633450f994226c':
  call into hwcomposer HAL when present
2010-08-11 16:28:21 -07:00
Mathias Agopian
47a740b50f am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread
Merge commit '801d0b33e845648866472263263a7001b528c3f4'

* commit '801d0b33e845648866472263263a7001b528c3f4':
  keep a list of visible sorted surfaces
2010-08-11 16:27:39 -07:00
Mathias Agopian
308e69896c am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp

* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
  don't handle the transparent region of a layer in draw()
2010-08-11 16:26:05 -07:00
Mathias Agopian
f7db3e21ef am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread
Merge commit '8e7515d9c938f5addd08d97bccfccfa976e76c11' into gingerbread-plus-aosp

* commit '8e7515d9c938f5addd08d97bccfccfa976e76c11':
  get rid of our LayerVector implementation
2010-08-11 16:25:59 -07:00
Mathias Agopian
90dc48b17f Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
801d0b33e8 am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread
Merge commit '025822a03a09337ec382e708c5a798fe805109ed' into gingerbread-plus-aosp

* commit '025822a03a09337ec382e708c5a798fe805109ed':
  keep a list of visible sorted surfaces
2010-08-11 16:23:06 -07:00
Jeff Brown
b219a83ff6 am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58'

* commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58':
  Add support for the PointerLocation overlay.
2010-08-11 16:22:47 -07:00
Mathias Agopian
24d7050ca6 Merge "don't handle the transparent region of a layer in draw()" into gingerbread 2010-08-11 16:21:01 -07:00
Mathias Agopian
8e7515d9c9 Merge "get rid of our LayerVector implementation" into gingerbread 2010-08-11 16:20:38 -07:00
Mathias Agopian
025822a03a Merge "keep a list of visible sorted surfaces" into gingerbread 2010-08-11 16:19:16 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
2010-08-11 16:18:36 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Mathias Agopian
e0d5f5bcf5 call into hwcomposer HAL when present
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
2010-08-11 16:08:45 -07:00
Mathias Agopian
8514b92bc4 don't handle the transparent region of a layer in draw()
this is already taken into consideration in computeVisibleRegion
and therefore not needed at draw time.

Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
2010-08-11 16:05:06 -07:00
Mathias Agopian
1efba9a617 get rid of our LayerVector implementation
we now use SortedVector<> with a special compare implementation.

Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
2010-08-11 16:05:05 -07:00
Mathias Agopian
ff1d410288 keep a list of visible sorted surfaces
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
2010-08-11 16:04:51 -07:00
Dianne Hackborn
ed6075943f am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984'

* commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:25:42 -07:00
Dianne Hackborn
2d8b9fe0f9 am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp

* commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:20:34 -07:00
Dianne Hackborn
bd1c082cf9 Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 2010-08-11 15:16:01 -07:00
Jeff Brown
a41ca77fab Add support for the PointerLocation overlay.
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications.  The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
2010-08-11 14:46:32 -07:00
Kenny Root
bf0cb26a1c am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:15:10 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:10:18 -07:00
Dianne Hackborn
f4c454bac9 New system property "sys.boot_completed" set to 1 when boot completed.
Change-Id: Ie3fc0b1efdfb637b0c780064a71e8c1575e15ca3
2010-08-11 12:47:41 -07:00
Vairavan Srinivasan
5320b326a4 am 79cb9a5d: am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit '79cb9a5d2d455af22c56b8cee045962c61668422'

* commit '79cb9a5d2d455af22c56b8cee045962c61668422':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:39:24 -07:00
Jean-Baptiste Queru
dc15e5b903 am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9'

* commit '44e43d1f6593ae912b3818692058196233cd4ac9':
  InputMethodManagerService: Fix acore crash on boot up
2010-08-11 12:35:30 -07:00
Vairavan Srinivasan
79cb9a5d2d am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514' into gingerbread-plus-aosp

* commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:07:56 -07:00
Jean-Baptiste Queru
1ca94798cc Fix build: HistoryRecord is now ActivityRecord
Change-Id: I5f402e76fbff58ec59ea26b6765e7455801a6cd0
2010-08-11 11:56:21 -07:00
Jean-Baptiste Queru
44e43d1f65 resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
2010-08-11 11:51:31 -07:00
Vairavan Srinivasan
f2e67a5779 InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Fix to avoid posting MSG_SHOW_IM_PICKER in
showInputMethodPickerFromClient when ignoring the request from the
client.

Change-Id: Iff8a0809aea892b4493d5cffbb91adba2d74414e
2010-08-11 11:24:45 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
2010-08-11 11:20:53 -07:00
Srilakshmi Punuru
efcac2ffba InputMethodManagerService: Fix acore crash on boot up
At bootup, while starting the service, if the default Input Method is not set,
it is trying to disable the icon even before the statusbar variable and the input
method icon are initialized. Hence, initializing them before building the input method list.

Change-Id: Ibde2ca3bd379d6620d84b75662ffad1a95a24fc6
2010-08-11 11:17:31 -07:00
Jean-Baptiste Queru
4c2d70d4e7 am a6c28cb0: am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"
Merge commit 'a6c28cb014c32b9522c41385075c9db77296f6e7'

* commit 'a6c28cb014c32b9522c41385075c9db77296f6e7':
  Fix isUsbMassStorageConnected() will always return true
2010-08-11 10:44:06 -07:00
Jean-Baptiste Queru
a6c28cb014 am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"
Merge commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390' into gingerbread-plus-aosp

* commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390':
  Fix isUsbMassStorageConnected() will always return true
2010-08-11 10:40:39 -07:00
Jean-Baptiste Queru
2ffe74ded5 Merge "Fix isUsbMassStorageConnected() will always return true" 2010-08-11 10:27:17 -07:00
Jean-Baptiste Queru
b9d437fbae am a59aaed8: am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
Merge commit 'a59aaed81b47f59ee9ee724760c4c39fcf429a18'

* commit 'a59aaed81b47f59ee9ee724760c4c39fcf429a18':
  frameworks/base: Swap width and height of temporary buffer only with
2010-08-11 10:20:15 -07:00
Jean-Baptiste Queru
a59aaed81b am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp

* commit 'bc881e66d15181494fdd5d0ece83e20ef325453b':
  frameworks/base: Swap width and height of temporary buffer only with
2010-08-11 10:16:32 -07:00
Jean-Baptiste Queru
bc881e66d1 Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change" 2010-08-11 10:11:14 -07:00
Irfan Sheriff
9f3c5da382 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00