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
Andreas Huber
22bd242478
This code in CameraSource really should hold the lock.
...
Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
2010-08-11 12:34:32 -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
Gilles Debunne
8584909e7f
New assets for checkboxes and radio buttons.
...
Added a dark/light variation.
Other files that might also need an update:
btn_check_label_background_light.9.png
btn_radio_label_background_light.9.png
btn_check_label_background.9.png
btn_radio_label_background.9.png
Pressed state is nearly invisible in light theme. To be tested with new background color.
Change-Id: Ibd312044364e08f1e789830ddd4c3af5cef30be1
2010-08-11 11:25:39 -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
6e7ac5f0bc
Initial tool for OBB manipulation
...
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.
Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
2010-08-11 11:24:41 -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
Alex Sakhartchouk
7dd8abc9e9
Merge "Adding allocation reference counting to the a3d models."
2010-08-11 10:33:33 -07:00
Alex Sakhartchouk
2ce0e3ff30
Adding allocation reference counting to the a3d models.
...
Change-Id: I225b431d09bfebbebf49df75b7df5e4d5961a564
2010-08-11 10:30:44 -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
Jean-Baptiste Queru
f252b3501e
am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"
...
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'
* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
Fix build on some linux machines
2010-08-11 10:07:56 -07:00
Alex Sakhartchouk
df0e9b1b31
Merge "Renaming stucts back."
2010-08-11 10:05:38 -07:00
Jean-Baptiste Queru
f781b4ef4b
am e37ab632: Merge "Fix build on some linux machines"
...
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp
* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
Fix build on some linux machines
2010-08-11 10:04:31 -07:00
Alex Sakhartchouk
a919112f4a
Renaming stucts back.
...
Change-Id: Ic9315c7fb2e03d0e88a07ae2361836d35106ab4b
2010-08-11 10:04:21 -07:00
Naveen Kalla
cd397b73a8
am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent.
...
Merge commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40'
* commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40':
In CW Interrogation service class is not sent.
2010-08-11 09:56:05 -07:00
Jean-Baptiste Queru
e37ab63221
Merge "Fix build on some linux machines"
2010-08-11 09:55:36 -07:00
Naveen Kalla
371dbcba11
am c4c4c98c: In CW Interrogation service class is not sent.
...
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp
* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
In CW Interrogation service class is not sent.
2010-08-11 09:53:01 -07:00
Jean-Baptiste Queru
5a90f6f594
am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes"
...
Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2'
* commit '92798a481cbd928711339606bc1d9e81fa80f7b2':
SIM toolkit enhancements and bug fixes
2010-08-11 09:52:34 -07:00
Jean-Baptiste Queru
92798a481c
am 076d0654: Merge "SIM toolkit enhancements and bug fixes"
...
Merge commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp
* commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9':
SIM toolkit enhancements and bug fixes
2010-08-11 09:44:27 -07:00
Naveen Kalla
c4c4c98c5c
In CW Interrogation service class is not sent.
...
As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service class
parameter in call waiting interrogation to network. Some networks return error
if service class is sent. So setting service class to SERVICE_CLASS_NONE.
Change-Id: I396963d568573b88795ad2cf1844eb2e047b459e
2010-08-11 09:44:04 -07:00
Jean-Baptiste Queru
076d06547f
Merge "SIM toolkit enhancements and bug fixes"
2010-08-11 09:29:03 -07:00
hmepas
b7ffaf6ae2
Fix build on some linux machines
...
This adds -lpthread on linux for aapt and localize, which appear to be
needed on some linux distros.
Signed-off-by: Jean-Baptiste Queru <jbq@google.com>
2010-08-11 09:08:51 -07:00
Alex Sakhartchouk
0dde1f89a4
Merge "Adding quaternion functions to math library."
2010-08-11 09:02:51 -07:00
Daniel Sandler
90d8610a68
Merge "Apparently people want to know what time it is."
2010-08-11 08:47:44 -07:00
Daniel Sandler
6327b957e0
Apparently people want to know what time it is.
...
Bug: 2897410
Change-Id: I8a9a995cf50d197f1f8894455372d0e325eb3eae
2010-08-11 11:45:22 -04:00
Irfan Sheriff
994c57828f
Fix build
...
A local change had remained.
Change-Id: Iad01d6da7f6cc75b470296383e1121d21008883a
2010-08-11 08:20:41 -07:00
Irfan Sheriff
9f3c5da382
Merge "Split WifiStateMachine from WifiStateTracker"
2010-08-11 07:53:51 -07:00
Patrick Scott
4668e77265
am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize.
...
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'
* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
Fix npe in getCacheTotalSize.
2010-08-11 07:21:25 -07:00
Patrick Scott
dc1f08586e
am 9902196f: Fix npe in getCacheTotalSize.
...
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp
* commit '9902196f9885d369e37cf44084e3f04513511ab0':
Fix npe in getCacheTotalSize.
2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98
Fix npe in getCacheTotalSize.
...
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
2010-08-11 09:48:43 -04:00
Maksymilian Osowski
0186c93a6e
Merge "Added a basic version of python script and supporting code in DumpRenderTree."
2010-08-11 05:26:38 -07:00
Steve Block
f4a705f045
Update DeviceOrientationManager to be specific to a WebViewCore
...
This avoids the need to pass the WebViewCore to its methods.
Change-Id: Ieec414f0819f06c8f5568ae5d6dd81a48d05fd6e
2010-08-11 13:14:43 +01:00
Maksymilian Osowski
a0a586cd2f
Fixes crash when root dir does not exist.
...
Bug: 2904439
Change-Id: I629f88626e165348dd414f3ad49d9b415ab336cf
2010-08-11 12:55:01 +01:00
Maksymilian Osowski
5fb9ff420d
Added a basic version of python script and supporting code in DumpRenderTree.
...
Change-Id: Ic60ef9b89f74a3a36a4c31765f99c8de08dce911
2010-08-11 12:20:30 +01:00
Maksymilian Osowski
cbfe6ec1b4
Merge "Resets Summarizer after everything's finished."
2010-08-11 04:02:21 -07:00
Hung-ying Tyan
003ffe72e0
am 03381faf: (-s ours) am 1777a274: SIP: remove unused file.
...
Merge commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f'
* commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f':
SIP: remove unused file.
2010-08-11 03:09:42 -07:00
Hung-ying Tyan
03381faf34
am 1777a274: SIP: remove unused file.
...
Merge commit '1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp
* commit '1777a2748bfa25dfd9d081d71504572b9a7256b1':
SIP: remove unused file.
2010-08-11 01:56:56 -07:00
Hung-ying Tyan
1777a2748b
SIP: remove unused file.
...
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
2010-08-11 16:48:14 +08:00
Dianne Hackborn
7b6d0d99b6
am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread
...
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'
* commit '679ac09a5c22175354f3a04b28456b323839530e':
More native work.
2010-08-11 00:50:56 -07:00
Dianne Hackborn
679ac09a5c
am a5ae50cd: Merge "More native work." into gingerbread
...
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp
* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
More native work.
2010-08-11 00:47:51 -07:00
Dianne Hackborn
a5ae50cd83
Merge "More native work." into gingerbread
2010-08-11 00:45:44 -07:00
Dianne Hackborn
08d5b8fad8
More native work.
...
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
2010-08-11 00:29:59 -07:00