Scott Main
0b01fccb6d
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
416132888b
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
2011-03-10 15:29:12 -08:00
Scott Main
ffb7903b47
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
85df20657a
Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
2011-03-10 15:10:39 -08:00
Xia Wang
e37f468ed4
resolved conflicts for merge of 16cbe575 to honeycomb-mr1
...
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
8e59190afd
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 14:46:18 -08:00
Xia Wang
696229eecf
Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb
2011-03-10 14:21:50 -08:00
Justin Ho
5600135d77
Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-10 13:53:48 -08:00
Eric Fischer
6f186ab677
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Shimeng (Simon) Wang
f5022eebf3
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
2011-03-10 09:04:12 -08:00
Kristian Monsen
63d02e0b7f
Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
2011-03-10 09:01:58 -08:00
Mike Lockwood
14c2c61a31
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
2011-03-10 07:50:30 -08:00
Jeff Brown
46689da7ee
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
95913fe87e
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
275f0072af
Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 18:27:22 -08:00
Jeff Brown
02604e0e24
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
a7cdea8471
Merge "Fix issue #4066157 : ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
2011-03-09 18:00:10 -08:00
Joe Malin
87c3bfac18
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
3d9f7dcebd
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
2011-03-09 16:58:29 -08:00
Adam Powell
aca0345e25
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
Wei-Ta Chen
a9d8122bb6
Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
2011-03-09 16:21:53 -08:00
Gloria Wang
27be7ae7c8
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
Dianne Hackborn
978abf43d3
Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
2011-03-09 15:47:24 -08:00
Mike Lockwood
ba6f57aab6
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
92f292aea4
Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
2011-03-09 15:37:56 -08:00
Jamie Gennis
ec8a5ef78d
Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
2011-03-09 14:47:56 -08:00
Jim Miller
5377ae9ad4
Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
2011-03-09 14:42:56 -08:00
Robert Ly
83c400fb05
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
Mathias Agopian
9bc46ccbdc
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
83a10cb3aa
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
2011-03-09 14:29:57 -08:00
Leon Scroggins
6d78bf0e1c
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
2011-03-09 14:21:17 -08:00
Huahui Wu
89381d2df3
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Ed Heyl
97fe840e61
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
2011-03-09 12:53:38 -08:00
Eric Laurent
0708bdbda4
Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
e720a884e9
Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
2011-03-09 10:48:57 -08:00
Mike Lockwood
8890a546d8
Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
2011-03-09 10:44:19 -08:00
Jean-Michel Trivi
33ab4fc951
Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
2011-03-09 10:18:31 -08:00
Irfan Sheriff
1d24d7f7ce
Merge "Persist wifi override in airplane mode" into honeycomb-mr1
2011-03-09 09:30:28 -08:00
Patrick Scott
95d38acf8b
Merge "Pass the auto login header information to the app." into honeycomb-mr1
2011-03-09 05:05:21 -08:00
Kristian Monsen
8e947862d5
Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
2011-03-09 04:29:45 -08:00
Mike Lockwood
298ecf5fdf
Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
...
* changes:
Close USB dialogs if their corresponding accessory or device has disconnected
USB: Add API and dialog for apps to request permissions for USB devices and accessories
UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:52:47 -08:00
Jeff Brown
9caa9da162
Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 02:45:59 -08:00
Adam Powell
eb4569e01f
Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
2011-03-09 00:22:53 -08:00
Romain Guy
7dce7e09da
Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
2011-03-08 23:51:02 -08:00
Adam Powell
9b1a1eaa12
Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
2011-03-08 20:00:25 -08:00
Nicolas Roard
e0c413fbe7
Merge "Partial invalidation of the browser textures" into honeycomb-mr1
2011-03-08 19:02:33 -08:00
Scott Main
db4edcd384
am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit 'b0355410bb161c5e61408e57dc2adc085d337be9':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 18:37:37 -08:00
Jamie Gennis
134f042286
ANativeWindow: add queues-to-window-composer check.
...
This change adds a new 'method' to the ANativeWindow interface to check
whether buffers queued to the window will be sent directly to the system
window compositor.
Change-Id: I4d4b199e328c110b68b250029aea650f03c8724d
Bug: 3495535
2011-03-08 16:49:51 -08:00
Amith Yamasani
e0c5644b51
Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
2011-03-08 16:34:11 -08:00
Jim Miller
eb0f6cbfc7
Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1
2011-03-08 15:43:16 -08:00