Gloria Wang
ae7752798a
Fix for bug 3477330
...
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer.
Fix by using sp<DecryptHandle> instead.
Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
2011-03-10 16:20:48 -08:00
Jim Miller
7a9794e402
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView"
2011-03-10 14:04:05 -08:00
Justin Ho
e2055a6a3f
am 9caea5ef: am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit '9caea5efd9190fdadc6ab8261c107134eb61df47':
New textfield search assets Bug: 3321263
2011-03-10 13:57:51 -08:00
Justin Ho
9caea5efd9
am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
New textfield search assets Bug: 3321263
2011-03-10 13:55:21 -08:00
Eric Fischer
9135bb6c22
am b23196d6: (-s ours) am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'b23196d6475a29d8d973d50e9f9ef867ba486e5d':
Import revised translations. DO NOT MERGE
2011-03-10 13:53:58 -08:00
Justin Ho
fa1d72c894
Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-10 13:53:48 -08:00
Eric Fischer
b23196d647
am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
Import revised translations. DO NOT MERGE
2011-03-10 13:46:28 -08:00
Gilles Debunne
b8dab190a0
Merge "Removed updateCursorControllerPositions hidden method."
2011-03-10 13:36:32 -08:00
Eric Fischer
8d257f85ac
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Vasu Nori
5da447610b
bug:3204324 set limit for max num of concurrent downloads allowed
...
Change-Id: If48925d5ec71c72710cab9bf8aa840fe45e9be53
2011-03-10 11:39:14 -08:00
Eric Fischer
c66ef5ab33
Import revised translations. DO NOT MERGE
...
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
2011-03-10 11:23:57 -08:00
Gilles Debunne
52c7ba174b
Removed updateCursorControllerPositions hidden method.
...
This method is no longer needed since handles' positions are
updated in onPreDraw.
See CL 100549
Change-Id: I7f95d9850c866935c22ecc49c6f4ce89a87861ae
2011-03-10 10:50:09 -08:00
Gilles Debunne
36198d7bab
Merge "Empty spans are not considered in text layout/rendering process."
2011-03-10 10:21:34 -08:00
Gilles Debunne
9646145dec
Merge "Fixed TextView#onTextChanged documentation."
2011-03-10 10:21:20 -08:00
Wink Saville
423e5b66e5
Merge "Telephony: Rename lte_on_cdma property."
2011-03-10 09:53:54 -08:00
Shimeng (Simon) Wang
83c590a2fa
am 40f24016: am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
...
* commit '40f240166a5d4c92690aeb991f1711bf3a733ef5':
Don't limit zoom scale change by the minimum increment.
2011-03-10 09:49:49 -08:00
Kristian Monsen
9610d3e98f
am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
...
* commit '4543b8d4b0fe6bebbf619fa7793a55e41eb1eeff':
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:49:42 -08:00
Ramesh Sudini
4ae87a8b04
Telephony: Rename lte_on_cdma property.
...
Fix Issue: 3479211. Dont use Mot property in Android Framework.
Change-Id: I51bab8cf1346ef8d23e425cbb32ae7b4a3d7ce09
2011-03-10 09:09:08 -08:00
Shimeng (Simon) Wang
40f240166a
am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
...
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
Don't limit zoom scale change by the minimum increment.
2011-03-10 09:07:22 -08:00
Kristian Monsen
4543b8d4b0
am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
...
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
0837fde9fd
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
2011-03-10 09:04:12 -08:00
Kristian Monsen
79b87df588
Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
2011-03-10 09:01:58 -08:00
Mike Lockwood
26d7eef69e
am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
...
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:56:59 -08:00
Mike Lockwood
84edf14b62
am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
...
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:52:30 -08:00
Mike Lockwood
cc08c439bc
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
2011-03-10 07:50:30 -08:00
Kristian Monsen
63a1b0cefe
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
...
Checking each app if they exist instead of iterating through
all packages.
Change-Id: Ic4934fa1e8dbbab2f90134e3701d39b1d4739d83
2011-03-10 11:30:43 +00:00
TK MUN
a3ae42ef0a
am ce475995: (-s ours) am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support
...
* commit 'ce475995740942d75eda7af820072c765256ec73':
DO NOT MERGE WiMAX support
2011-03-09 23:03:16 -08:00
TK MUN
ce47599574
am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support
...
* commit 'c01fd043a92462f12210d45a92d751b49e0e1f62':
DO NOT MERGE WiMAX support
2011-03-09 22:58:12 -08:00
TK MUN
c01fd043a9
am 4bdab175: DO NOT MERGE WiMAX support
...
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f
DO NOT MERGE WiMAX support
...
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX
Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-09 22:37:08 -08:00
Jim Miller
3fa8a454f6
Fix 3201849: Enable hardware acceleration in LockScreen WaveView
...
Change-Id: Id64e82fe2e09ac231736d7867cd47b504d79b81b
2011-03-09 19:47:56 -08:00
Jeff Brown
9b12dbdd1e
am 4ffdca06: am 3de30a4c: Update API.
...
* commit '4ffdca06ec5575ddaa215941c1cc21de96e76bcb':
Update API.
2011-03-09 19:37:49 -08:00
Jeff Brown
4ffdca06ec
am 3de30a4c: Update API.
...
* commit '3de30a4c1e48d92af14154abddd4fb6fe0c6aa13':
Update API.
2011-03-09 19:35:28 -08:00
Jeff Brown
3de30a4c1e
Update API.
...
Not sure the changes were correctly rebased last time.
Change-Id: If6ab4014f312bef240df60f0b1cd6d923f472836
2011-03-09 19:13:11 -08:00
Mike Lockwood
ac36d7c715
UsbAccessory: Add URI string, replace type string with description
...
This is a first step toward adding USB accessory URI support
BUG: 4073248
Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)
Also added test for USB accessory protocol version to accessorytest
BUG: 4080288
Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 22:12:49 -05:00
Jeff Brown
5a3d6cc188
am e6f0ae12: am efd3266b: Input improvements and bug fixes.
...
* commit 'e6f0ae12b18819424dd8395b433a8fc9caefa77b':
Input improvements and bug fixes.
2011-03-09 18:39:46 -08:00
Jeff Brown
614ef8df70
am 0cbc4a6c: (-s ours) am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
...
* commit '0cbc4a6c3ce795497ac136736dacf5eeb0ffa6ac':
Recognize 3D joysticks. (DO NOT MERGE)
2011-03-09 18:39:43 -08:00
Jeff Brown
e6f0ae12b1
am efd3266b: Input improvements and bug fixes.
...
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
Input improvements and bug fixes.
2011-03-09 18:36:52 -08:00
Jeff Brown
0cbc4a6c3c
am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
...
* commit '9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
Recognize 3D joysticks. (DO NOT MERGE)
2011-03-09 18:36:46 -08:00
Jeff Brown
cbd0431438
am 76d84845: (-s ours) am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '76d848454f5d6f8b6d087eccc81c6bb51dd46c55':
Fix off by one errors in touch motion ranges. (DO NOT MERGE)
2011-03-09 18:31:56 -08:00
Jeff Brown
7115e796b5
am bbb5f5ac: (-s ours) am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'bbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a':
Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)
2011-03-09 18:31:52 -08:00
Jeff Brown
58ce180f40
am e2296212: (-s ours) am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'e2296212194a74438d80f77bc3d68d88b1f2be09':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
2011-03-09 18:31:47 -08:00
Jeff Brown
efd3266b71
Input improvements and bug fixes.
...
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis. This fixes new API that was introduced in MR1.
(Bug: 4066146)
Fixed a bug that might cause a segfault when using a trackball.
Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.
Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.
Improved the batching code to support batching events from different
sources of the same device in parallel. (Bug: 3391564)
Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Jeff Brown
9e8e40cb5f
Recognize 3D joysticks. (DO NOT MERGE)
...
Change-Id: Idf7799ea90fa07677850d40ee1aec39220ded372
2011-03-09 18:30:28 -08:00
Jeff Brown
76d848454f
am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '18955491ee52aad9bfe6f06e46da77aed6ee092a':
Fix off by one errors in touch motion ranges. (DO NOT MERGE)
2011-03-09 18:29:31 -08:00
Jeff Brown
bbb5f5ac36
am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '55605c9e24887693d507f31bee4cde0690bbccff':
Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)
2011-03-09 18:29:26 -08:00
Jeff Brown
e229621219
am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
2011-03-09 18:29:22 -08:00
Jeff Brown
18955491ee
Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 18:27:25 -08:00
Jeff Brown
55605c9e24
Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 18:27:22 -08:00
Jeff Brown
06a0c9f5ee
Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 18:27:16 -08:00