Jean-Baptiste Queru
27ed27860c
Merge "New test in FrameworkTest for the VelocityTracker class"
2010-05-13 11:39:51 -07:00
Jean-Baptiste Queru
4232019338
Merge "Preserve '+' in phone numbers imported from SIM."
2010-05-13 11:06:28 -07:00
Dianne Hackborn
0534ab8ce9
Merge "Corrected repeat count for key repeat in input device."
2010-05-11 12:07:32 -07:00
Jean-Baptiste Queru
4840145ddd
Merge "Support to display message when operation is blocked due to FDN being enabled"
2010-05-11 09:13:19 -07:00
Jean-Baptiste Queru
96fb6fb6a6
Merge "Notify user regarding invalid number during MO call."
2010-05-11 09:08:24 -07:00
Mathias Agopian
b0eed511a2
Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms"
2010-05-10 20:28:02 -07:00
Mathias Agopian
32a220aa6e
Merge "Fix glReadPixels() to verify that both x and y are non-negative."
2010-05-10 20:26:24 -07:00
Jean-Baptiste Queru
3658de5fdd
Merge "Include the API level 4 fields in the Parcel."
2010-05-10 11:14:01 -07:00
Jean-Baptiste Queru
02e9bff357
Merge "long modifier was on the wrong argument."
2010-05-10 08:55:17 -07:00
Jean-Baptiste Queru
66308738bc
Merge "Added WEB_URL_PATTERN for Montenegro ".me""
2010-05-07 12:57:02 -07:00
Mike Lockwood
06979ad3df
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
2010-05-06 07:50:13 -07:00
Jean-Baptiste Queru
afeaca2513
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
d40eb168d1
Merge "Type Zero Sms should not be displayed/stored/notified."
2010-05-05 16:18:30 -07:00
Jean-Baptiste Queru
031dd9e254
Merge "Add new keycodes for the convenience of Japanese IMEs"
2010-05-05 13:49:58 -07:00
mogimo
ef1c5c314b
Add new keycodes for the convenience of Japanese IMEs
...
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Jean-Baptiste Queru
873a3772a7
Merge "telephony: Fix CID when CID is unknown"
2010-05-05 13:15:24 -07:00
Jean-Baptiste Queru
26b8da8361
Merge "Call register_localized_collators() with the current locale."
2010-05-05 11:16:31 -07:00
Dianne Hackborn
3ac792b4c3
Merge "Set alpha value for newly created dim surface."
2010-05-04 23:58:26 -07:00
Jean-Baptiste Queru
b7719a307a
Merge "Fix for bug 2467152 files with spaces fail to open."
2010-05-04 15:16:32 -07:00
Romain Guy
a4b249c12f
Merge "Fix typo of <p> end tag in appwidgets.xml"
2010-05-03 16:25:34 -07:00
Jean-Baptiste Queru
17aab035dd
Merge "Fix an NPE in InputMethodService when mExtractAction is null."
2010-04-29 10:03:40 -07:00
Kenny Root
f6de34a2c4
Merge "Fix broken logic in SettingsProvider.parseProviderList."
2010-04-21 20:06:51 -07:00
Michael Richardson
a3a884d9e2
Allow META* macros outside of the framework
...
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
2010-04-20 14:14:30 -07:00
Dianne Hackborn
be0807b343
Merge "Fix reporting of window visibility in WindowManagerService."
2010-04-03 15:31:54 -07:00
Chih-Wei Huang
e5f56fb1b4
Add keycodes PageUp and PageDown
...
This is useful for applications like web browser.
Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
2010-04-02 14:39:20 -07:00
David Turner
ecf9b68112
Merge "gl_code : add end of line."
2010-03-30 14:50:44 -07:00
The Android Open Source Project
f282e93b43
merge from open-source master
...
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
2010-03-30 11:13:47 -07:00
Romain Guy
dced134a0b
Merge "Fix last character of password field being visible after rotation"
2010-03-30 10:54:40 -07:00
Dianne Hackborn
ecab4e6cca
Merge "Fix Memory Leak When Switching Input Methods"
2010-03-25 19:23:09 -07:00
Jae-Hyung Ahn
7efc2fc955
gl_code : add end of line.
...
Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
2010-03-24 10:15:41 -07:00
The Android Open Source Project
8af09ea3bb
merge from open-source master
...
Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8
2010-03-22 16:13:27 -07:00
Mathias Agopian
245b46fb0c
Merge "Updated to WMM2010"
2010-03-22 13:17:50 -07:00
Nick Pelly
1ebde0a725
Merge "Everytime Bluetooth was turned off two file descriptors were not closed"
2010-03-22 07:07:15 -07:00
The Android Open Source Project
489315ec3a
merge from open-source master
...
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
2010-03-19 16:36:32 -07:00
Wink Saville
6a031a3922
Merge "Retry pending memory status update to modem when radio is ON."
2010-03-18 12:01:07 -07:00
The Android Open Source Project
9bd138da2d
merge from open-source master
...
Change-Id: Ib18c1121d51bd176e0de1666cad19ef10261825a
2010-03-08 16:43:28 -08:00
The Android Open Source Project
05d7350329
merge from open-source master
2010-03-01 09:30:21 -08:00
The Android Open Source Project
eb45079bee
merge from open-source master
2010-02-25 14:54:51 -08:00
The Android Open Source Project
4971d0b540
merge from open-source master
2010-02-24 10:02:55 -08:00
The Android Open Source Project
b206c77531
merge from open-source master
2010-02-24 09:11:10 -08:00
Romain Guy
53342df095
Merge "These changes add access to some status values in widgets listed below:"
2010-02-23 22:23:21 -08:00
Eric Laurent
3cf9cd5b62
am f5fe3949: Fix issue 2459650.
...
Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp
* commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b':
Fix issue 2459650.
2010-02-22 11:13:08 -08:00
Magnus Landqvist
d08583b05c
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
...
This prevents crashes on snapdragon processors.
2010-02-19 12:06:59 +01:00
Joe Onorato
e615f091b5
am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
...
Merge commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp
* commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af':
Don't crash the system process when apps give us a bad foreground service notification.
2010-02-18 04:52:46 -08:00
Joe Onorato
4fdd7fd17a
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
2010-02-18 04:46:32 -08:00
Romain Guy
d9e6976e60
am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
...
Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp
* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
2010-02-17 21:22:52 -08:00
Romain Guy
2feec33de8
am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
...
Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp
* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
2010-02-17 21:17:48 -08:00
Romain Guy
71f13a1cc8
am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005 .
...
Merge commit '8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
2010-02-17 21:10:34 -08:00
android-build SharedAccount
2c6cb3db27
am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
...
Merge commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7' into eclair-plus-aosp
* commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7':
cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
2010-02-16 12:53:04 -08:00
Wink Saville
4ab4ebc9ae
am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
...
Merge commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp
* commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
Always assume evdoXxxx signal strength values are correct.
2010-02-13 09:42:07 -08:00