Robert Greenwalt
55b53d3510
am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread
...
* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
2011-03-10 11:59:17 -08:00
Eric Fischer
8d257f85ac
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Mike Lockwood
024b4f1494
Support for USB accessory URIs
...
If a USB accessory is attached and we have no application that supports it,
display a dialog offering the user the option to visit the accessory's website
if the accessory has a URI.
Bug: 4073248
Change-Id: I30e2a802493fb6e203532a7f79402379c40bc3b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-10 14:35:33 -05:00
Eric Fischer
c66ef5ab33
Import revised translations. DO NOT MERGE
...
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
2011-03-10 11:23:57 -08:00
Robert Greenwalt
dfcb8c5116
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
2011-03-10 10:41:36 -08:00
Rajneesh Chowdury
e7defc2975
Fix for 4080402 NPE in Transition.setDuration
...
Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
2011-03-10 10:35:42 -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
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
Chih-Wei Huang
c2d68c9096
Remove unnecessary SkImageDecoder_libjpeg.cpp
...
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's
out/target/external/skia/src/images/SkImageDecoder_libjpeg.o
It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.
Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.
Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
2011-03-10 17:52:31 +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
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
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
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
Dianne Hackborn
f49c3ae2da
am 7fd98159: Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
...
* commit '7fd981598ed0ec275d6da27c71e5e6c9db854e82':
Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class
2011-03-09 18:02:53 -08:00
Dianne Hackborn
7fd981598e
Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
2011-03-09 18:00:10 -08:00
Shimeng (Simon) Wang
3911b45005
Don't limit zoom scale change by the minimum increment.
...
issue: 4080125
Change-Id: I3fa258e12e7aa44c7286c9dccb1f249d5ae78a12
2011-03-09 17:55:35 -08:00
Ken Sumrall
0da47dae49
Teach the framework to use the new android_reboot() function.
...
The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems. This fixes bug 3350709.
Change-Id: I792fa3f726f8d685a696f52cf760e731567ed8d4
2011-03-09 17:37:52 -08:00
Mathias Agopian
abe5c07944
am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
...
* commit 'a15b5290f5785031ec4813fd7e141a9fc39c18fa':
revert the surface purgatory list and dependent changes.
2011-03-09 17:17:24 -08:00
Mathias Agopian
a15b5290f5
am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
...
* commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea':
revert the surface purgatory list and dependent changes.
2011-03-09 17:11:10 -08:00
Mathias Agopian
3302922161
Merge "revert the surface purgatory list and dependent changes." into gingerbread
2011-03-09 17:07:27 -08:00
Mathias Agopian
8a23836fc4
am b4341ba6: (-s ours) am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
...
* commit 'b4341ba69750cb71a949525bde4ba962c54908e5':
fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
2011-03-09 17:06:10 -08:00
Mathias Agopian
c4702567f6
am a7c836dd: (-s ours) am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
...
* commit 'a7c836ddc0d726120368bf692088f97286e0af3a':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
2011-03-09 17:06:06 -08:00
Joe Malin
a693b8c05e
am 87e8ab37: am b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
...
* commit '87e8ab372bd722c5c1a00ff5262acccee5dae5e5':
DOC CHANGE: Add IntelliJ to Dev Guide
2011-03-09 17:04:18 -08:00
Joe Malin
87e8ab372b
am b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
...
* commit 'b56cb53f89176d2000e6b6a7aad10b88102abeb8':
DOC CHANGE: Add IntelliJ to Dev Guide
2011-03-09 17:02:28 -08:00
Mathias Agopian
cf8b94562c
revert the surface purgatory list and dependent changes.
...
6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug: 4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
2011-03-09 17:00:41 -08:00
Joe Malin
b56cb53f89
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
2011-03-09 16:58:29 -08:00
Mathias Agopian
b4341ba697
am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
...
* commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8':
fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
2011-03-09 16:57:32 -08:00
Mathias Agopian
a7c836ddc0
am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
...
* commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
2011-03-09 16:57:28 -08:00
Mathias Agopian
b710a50ab6
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:21 -08:00
Mathias Agopian
c05d35db1c
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:14 -08:00
Adam Powell
94929217ae
am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183 " into honeycomb-mr1
...
* commit '0175e945bb14b2208e00a3a7c9c35261981499a8':
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
2011-03-09 16:48:20 -08:00
Adam Powell
0175e945bb
Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183 " into honeycomb-mr1
2011-03-09 16:45:57 -08:00
Adam Powell
7ee1ff1450
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
...
Prevent overflow in FastScroller indexing
Change-Id: I53f90feaefd49717a0bdaddcf9a4988318d40c7d
2011-03-09 16:35:13 -08:00