Scott Main
dc8b70cabc
am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:40:32 -08:00
Scott Main
dd7617b327
am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:40:23 -08:00
Xia Wang
cf994cc57d
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
2011-03-10 15:29:12 -08:00
Scott Main
c411b4ec34
Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
2011-03-10 15:17:42 -08:00
Scott Main
0722cec0f1
Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
a7118e33b4
Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
2011-03-10 15:10:39 -08:00
Xia Wang
4bc5c4a1f5
resolved conflicts for merge of 16cbe575 to honeycomb-mr1
...
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
ff25b97505
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 14:46:18 -08:00
Eric Fischer
4942d9936a
Import revised translations. DO NOT MERGE
...
Change-Id: I754a2637bbe533e80f5d863a52e2fbda7731638a
2011-03-10 14:25:11 -08:00
Xia Wang
16cbe575e2
Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb
2011-03-10 14:21:50 -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
8d257f85ac
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Eric Fischer
c66ef5ab33
Import revised translations. DO NOT MERGE
...
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
2011-03-10 11:23:57 -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
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
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
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
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
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
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
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
Joe Malin
b56cb53f89
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
2011-03-09 16:58:29 -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
Joe Malin
e23ae889a4
DOC CHANGE: Add IntelliJ to Dev Guide
...
Change-Id: Ib9124c643b727ef1959da9ac33d9b5af4aa434c1
2011-03-09 16:23:03 -08:00
Wei-Ta Chen
2498b4b8c6
Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
2011-03-09 16:21:53 -08:00
Gloria Wang
54fe58562b
Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1
2011-03-09 16:05:59 -08:00
Gloria Wang
2ef2d49aa3
- Change level of some LOGs from LOGE to LOGV because those logs
...
are not error logs from non-DRMed content's point of view.
- Add more mutex lock to avoid crash by multi-thread calls.
- Fix for bug 4050039
Change-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b
2011-03-09 15:51:46 -08:00
Dianne Hackborn
7b5cb3c033
Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
2011-03-09 15:47:24 -08:00
Mike Lockwood
564f12ebe4
Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
...
* changes:
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:47:10 -08:00
Huahui Wu
37c2e3e556
Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
2011-03-09 15:37:56 -08:00
Huahui Wu
ff6f4c2eff
b/4075349 Make the pinch to zoom more responsive after limits.
...
Change-Id: I66ea0aa95ff6a471b7c2ae2cb1ce2fdd0f18ce01
2011-03-09 15:13:01 -08:00
Jamie Gennis
6167a390e3
Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
2011-03-09 14:47:56 -08:00
Jim Miller
5c9248f668
Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
2011-03-09 14:42:56 -08:00
Robert Ly
788dd5e076
am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit '2a36cf42fa6f941b2a55f7f391d79b93b8f780f4':
doc change: removing references to eclipse 3.4
2011-03-09 14:39:55 -08:00
Justin Ho
9aea53fecd
New textfield search assets
...
Bug: 3321263
Change-Id: Ifa2dab0df167977317414a18f94b9cb56d6b349a
2011-03-09 14:35:09 -08:00
Mathias Agopian
838aa45b99
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
2011-03-09 14:30:16 -08:00
Stephen Hines
c8a4b11e1f
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
2011-03-09 14:29:57 -08:00
Mike Lockwood
b966b9d9e8
MTP: Convert date created and modified values from seconds to milliseconds
...
BUG: 4026365
Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 17:28:33 -05:00
Leon Scroggins
23c5861cde
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
2011-03-09 14:21:17 -08:00
Dianne Hackborn
32de2f67ea
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
...
...addHistoryRecordLocked(BatteryStatsImpl.java:1210)
It was doing a bunch of stuff without holding a lock!
Change-Id: Ie5b56514370e0bfc87ba7737d75e01df0859817e
2011-03-09 14:03:35 -08:00
Huahui Wu
166b190efc
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Mike Lockwood
580b641117
Update USB accessory compatibility library to support new requestPermission API
...
BUG: 4069037
Change-Id: Ieadb86fed577eeb7697d524e8a684ea6ea632f39
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 16:46:35 -05:00