OSDN Git Service
Scott Main [Thu, 10 Mar 2011 23:57:38 +0000 (15:57 -0800)]
am
dc8b70ca: am
c411b4ec: Merge "docs: fix misc doc bugs bug:
3295540 bug:
3319686 bug:
3337541 bug:
3355640 bug:
3483758" into honeycomb
* commit '
dc8b70cabc23316e349aaf2fe03bcc830dd66e6c':
docs: fix misc doc bugs bug:
3295540 bug:
3319686 bug:
3337541 bug:
3355640 bug:
3483758
Scott Main [Thu, 10 Mar 2011 23:57:34 +0000 (15:57 -0800)]
am
dd7617b3: 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 '
dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:
3475300
Xia Wang [Thu, 10 Mar 2011 23:57:27 +0000 (15:57 -0800)]
am
cf994cc5: Merge "resolved conflicts for merge of
16cbe575 to honeycomb-mr1" into honeycomb-mr1
* commit '
cf994cc57df33121cea7a0082c8ea55ca125279c':
Add WifiStressTest to Wi-Fi only test suite.
Scott Main [Thu, 10 Mar 2011 23:40:32 +0000 (15:40 -0800)]
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
Scott Main [Thu, 10 Mar 2011 23:40:23 +0000 (15:40 -0800)]
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
Xia Wang [Thu, 10 Mar 2011 23:29:12 +0000 (15:29 -0800)]
Merge "resolved conflicts for merge of
16cbe575 to honeycomb-mr1" into honeycomb-mr1
Scott Main [Thu, 10 Mar 2011 23:17:42 +0000 (15:17 -0800)]
Merge "docs: fix misc doc bugs bug:
3295540 bug:
3319686 bug:
3337541 bug:
3355640 bug:
3483758" into honeycomb
Scott Main [Thu, 10 Mar 2011 23:13:49 +0000 (15:13 -0800)]
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
Rajneesh Chowdury [Thu, 10 Mar 2011 23:12:34 +0000 (15:12 -0800)]
am
a7118e33: Merge "Fix for
4080402 NPE in Transition.setDuration" into honeycomb-mr1
* commit '
a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for
4080402 NPE in Transition.setDuration
Rajneesh Chowdury [Thu, 10 Mar 2011 23:10:39 +0000 (15:10 -0800)]
Merge "Fix for
4080402 NPE in Transition.setDuration" into honeycomb-mr1
Xia Wang [Thu, 10 Mar 2011 23:09:46 +0000 (15:09 -0800)]
resolved conflicts for merge of
16cbe575 to honeycomb-mr1
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
Eric Fischer [Thu, 10 Mar 2011 22:47:57 +0000 (14:47 -0800)]
am
ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
ff25b975052ddf0e74627cccca742cddd1c8e2f2':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 22:46:18 +0000 (14:46 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Xia Wang [Thu, 10 Mar 2011 22:21:50 +0000 (14:21 -0800)]
Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb
Justin Ho [Thu, 10 Mar 2011 21:55:21 +0000 (13:55 -0800)]
am
fa1d72c8: Merge "New textfield search assets Bug:
3321263" into honeycomb-mr1
* commit '
fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
New textfield search assets Bug:
3321263
Justin Ho [Thu, 10 Mar 2011 21:53:48 +0000 (13:53 -0800)]
Merge "New textfield search assets Bug:
3321263" into honeycomb-mr1
Eric Fischer [Thu, 10 Mar 2011 21:46:28 +0000 (13:46 -0800)]
am
8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
8d257f85acc3316b9ba451337f7cbea9000eb8cf':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 19:42:24 +0000 (11:42 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Shimeng (Simon) Wang [Thu, 10 Mar 2011 17:07:22 +0000 (09:07 -0800)]
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.
Kristian Monsen [Thu, 10 Mar 2011 17:05:18 +0000 (09:05 -0800)]
am
79b87df5: Merge "Fix for bug
4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
* commit '
79b87df58861faeedd85804f6ea4f24eb67aef12':
Fix for bug
4064291 WebView uses PackageManager#getInstalledApps
Shimeng (Simon) Wang [Thu, 10 Mar 2011 17:04:12 +0000 (09:04 -0800)]
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
Kristian Monsen [Thu, 10 Mar 2011 17:01:58 +0000 (09:01 -0800)]
Merge "Fix for bug
4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
Mike Lockwood [Thu, 10 Mar 2011 15:52:30 +0000 (07:52 -0800)]
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
Mike Lockwood [Thu, 10 Mar 2011 15:50:30 +0000 (07:50 -0800)]
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
TK MUN [Thu, 10 Mar 2011 06:58:12 +0000 (22:58 -0800)]
am
c01fd043: (-s ours) am
4bdab175: DO NOT MERGE WiMAX support
* commit '
c01fd043a92462f12210d45a92d751b49e0e1f62':
DO NOT MERGE WiMAX support
TK MUN [Thu, 10 Mar 2011 06:54:44 +0000 (22:54 -0800)]
am
4bdab175: DO NOT MERGE WiMAX support
* commit '
4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
Jeff Brown [Thu, 10 Mar 2011 03:35:28 +0000 (19:35 -0800)]
Jeff Brown [Thu, 10 Mar 2011 02:36:52 +0000 (18:36 -0800)]
am
efd3266b: Input improvements and bug fixes.
* commit '
efd3266b719eed5f1b217021c0a9e76e4b274b06':
Input improvements and bug fixes.
Jeff Brown [Thu, 10 Mar 2011 02:36:46 +0000 (18:36 -0800)]
am
9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
* commit '
9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
Recognize 3D joysticks. (DO NOT MERGE)
Jeff Brown [Tue, 8 Mar 2011 23:13:06 +0000 (15:13 -0800)]
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
Jeff Brown [Thu, 10 Mar 2011 02:29:31 +0000 (18:29 -0800)]
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)
Jeff Brown [Thu, 10 Mar 2011 02:29:26 +0000 (18:29 -0800)]
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)
Jeff Brown [Thu, 10 Mar 2011 02:29:22 +0000 (18:29 -0800)]
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)
Jeff Brown [Thu, 10 Mar 2011 02:27:25 +0000 (18:27 -0800)]
Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
Jeff Brown [Thu, 10 Mar 2011 02:27:22 +0000 (18:27 -0800)]
Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
Jeff Brown [Thu, 10 Mar 2011 02:27:16 +0000 (18:27 -0800)]
Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
Dianne Hackborn [Thu, 10 Mar 2011 02:02:53 +0000 (18:02 -0800)]
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
Dianne Hackborn [Thu, 10 Mar 2011 02:00:10 +0000 (18:00 -0800)]
Merge "Fix issue #
4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
Mathias Agopian [Thu, 10 Mar 2011 01:17:24 +0000 (17:17 -0800)]
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.
Mathias Agopian [Thu, 10 Mar 2011 01:11:10 +0000 (17:11 -0800)]
am
33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '
33029221619f14577bd0d0e7c2f815abc8f1b8ea':
revert the surface purgatory list and dependent changes.
Mathias Agopian [Thu, 10 Mar 2011 01:07:27 +0000 (17:07 -0800)]
Merge "revert the surface purgatory list and dependent changes." into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 01:06:10 +0000 (17:06 -0800)]
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]
Mathias Agopian [Thu, 10 Mar 2011 01:06:06 +0000 (17:06 -0800)]
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]
Joe Malin [Thu, 10 Mar 2011 01:04:18 +0000 (17:04 -0800)]
am
87e8ab37: am
b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit '
87e8ab372bd722c5c1a00ff5262acccee5dae5e5':
DOC CHANGE: Add IntelliJ to Dev Guide
Joe Malin [Thu, 10 Mar 2011 01:02:28 +0000 (17:02 -0800)]
am
b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit '
b56cb53f89176d2000e6b6a7aad10b88102abeb8':
DOC CHANGE: Add IntelliJ to Dev Guide
Mathias Agopian [Thu, 10 Mar 2011 00:13:31 +0000 (16:13 -0800)]
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
Joe Malin [Thu, 10 Mar 2011 00:58:29 +0000 (16:58 -0800)]
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
Mathias Agopian [Thu, 10 Mar 2011 00:57:32 +0000 (16:57 -0800)]
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]
Mathias Agopian [Thu, 10 Mar 2011 00:57:28 +0000 (16:57 -0800)]
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]
Mathias Agopian [Thu, 10 Mar 2011 00:54:21 +0000 (16:54 -0800)]
Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:54:14 +0000 (16:54 -0800)]
Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
Adam Powell [Thu, 10 Mar 2011 00:48:20 +0000 (16:48 -0800)]
am
0175e945: Merge "Fix external bug 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
Adam Powell [Thu, 10 Mar 2011 00:45:57 +0000 (16:45 -0800)]
Merge "Fix external bug code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1
Wei-Ta Chen [Thu, 10 Mar 2011 00:25:24 +0000 (16:25 -0800)]
am
2498b4b8: Merge "Fix
3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
* commit '
2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
Fix
3510563: memory leak in BitmapRegionDecoder.
Wei-Ta Chen [Thu, 10 Mar 2011 00:21:53 +0000 (16:21 -0800)]
Merge "Fix
3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
Gloria Wang [Thu, 10 Mar 2011 00:07:53 +0000 (16:07 -0800)]
am
54fe5856: 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
* commit '
54fe58562bb8df5155d4cdf3eb22d950be9dd273':
- 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
Gloria Wang [Thu, 10 Mar 2011 00:05:59 +0000 (16:05 -0800)]
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
Dianne Hackborn [Wed, 9 Mar 2011 23:50:34 +0000 (15:50 -0800)]
am
7b5cb3c0: Merge "Fix issue #
4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
* commit '
7b5cb3c033f758368580664a8bdad43b47f3682d':
Fix issue #
4068088: NPE at com.android.internal.os.BatteryStatsImpl...
Mike Lockwood [Wed, 9 Mar 2011 23:50:31 +0000 (15:50 -0800)]
am
564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '
564f12ebe409bead467eee04dfd719e97367e520':
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()
Dianne Hackborn [Wed, 9 Mar 2011 23:47:24 +0000 (15:47 -0800)]
Merge "Fix issue #
4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
Mike Lockwood [Wed, 9 Mar 2011 23:47:10 +0000 (15:47 -0800)]
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()
Huahui Wu [Wed, 9 Mar 2011 23:39:56 +0000 (15:39 -0800)]
am
37c2e3e5: Merge "b/
4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
* commit '
37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf':
b/
4075349 Make the pinch to zoom more responsive after limits.
Huahui Wu [Wed, 9 Mar 2011 23:37:56 +0000 (15:37 -0800)]
Merge "b/
4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
Lorenzo Colitti [Wed, 9 Mar 2011 23:17:20 +0000 (15:17 -0800)]
am
8df2477c: am
bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit '
8df2477c4e7e5bf72d6d1216ae5184c53304470e':
Support IPv6->IPv4 fallback in HTTP streaming.
Lorenzo Colitti [Wed, 9 Mar 2011 23:17:12 +0000 (15:17 -0800)]
am
e4a02b61: am
b9da16a1: Support IPv6 in HTTP streaming.
* commit '
e4a02b61290fa61955c979cfd1afc17a92bba481':
Support IPv6 in HTTP streaming.
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:20 +0000 (15:09 -0800)]
am
bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit '
bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:04 +0000 (15:09 -0800)]
am
b9da16a1: Support IPv6 in HTTP streaming.
* commit '
b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
Jamie Gennis [Wed, 9 Mar 2011 22:59:30 +0000 (14:59 -0800)]
am
6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
* commit '
6167a390e34981ea92fc6d5458add2da04ee15bc':
ANativeWindow: add queues-to-window-composer check.
Jim Miller [Wed, 9 Mar 2011 22:59:26 +0000 (14:59 -0800)]
am
5c9248f6: Merge "Fix
4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
* commit '
5c9248f668201a751500f67cc60bd45ff905751a':
Fix
4027057: Improve resolution of RecentApps thumbnail images.
Robert Ly [Wed, 9 Mar 2011 22:59:17 +0000 (14:59 -0800)]
am
788dd5e0: am
2a36cf42: doc change: removing references to eclipse 3.4
* commit '
788dd5e076821d8604be7a8e44a1c5ae5f4e198e':
doc change: removing references to eclipse 3.4
Jamie Gennis [Wed, 9 Mar 2011 22:47:56 +0000 (14:47 -0800)]
Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
Jim Miller [Wed, 9 Mar 2011 22:42:56 +0000 (14:42 -0800)]
Merge "Fix
4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
Robert Ly [Wed, 9 Mar 2011 22:39:55 +0000 (14:39 -0800)]
am
2a36cf42: doc change: removing references to eclipse 3.4
* commit '
2a36cf42fa6f941b2a55f7f391d79b93b8f780f4':
doc change: removing references to eclipse 3.4
Mathias Agopian [Wed, 9 Mar 2011 22:32:47 +0000 (14:32 -0800)]
am
838aa45b: Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
* commit '
838aa45b99f504596971063003fa8a75e89e4c41':
fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number
Stephen Hines [Wed, 9 Mar 2011 22:32:44 +0000 (14:32 -0800)]
am
c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
* commit '
c8a4b11e1f752b901610472039f981f97a65aae6':
Fix a race condition during Context init/teardown.
Mathias Agopian [Wed, 9 Mar 2011 22:30:16 +0000 (14:30 -0800)]
Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
Stephen Hines [Wed, 9 Mar 2011 22:29:57 +0000 (14:29 -0800)]
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
Leon Scroggins [Wed, 9 Mar 2011 22:22:50 +0000 (14:22 -0800)]
am
23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
* commit '
23c5861cde7efef568fa3c61e0f1fa4fe97c7cfa':
Scroll textfield onscreen when the IME shows.
Leon Scroggins [Wed, 9 Mar 2011 22:21:17 +0000 (14:21 -0800)]
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
Huahui Wu [Wed, 9 Mar 2011 22:04:52 +0000 (14:04 -0800)]
am
166b190e: Merge "b/
3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
* commit '
166b190efc35b7ddad6b011ba537c177e88a2336':
b/
3307761 Clean up the flag mIsHandlingMultiTouch.
Huahui Wu [Wed, 9 Mar 2011 21:55:35 +0000 (13:55 -0800)]
Merge "b/
3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
Ed Heyl [Wed, 9 Mar 2011 20:56:17 +0000 (12:56 -0800)]
am
b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
* commit '
b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
UsbManager: Fix broken Javadoc links
Ed Heyl [Wed, 9 Mar 2011 20:53:38 +0000 (12:53 -0800)]
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
Eric Laurent [Wed, 9 Mar 2011 18:57:49 +0000 (10:57 -0800)]
am
cc34967f: Merge "Fix issue
3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit '
cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
Fix issue
3439872: video chat and bluetooth SCO
Eric Laurent [Wed, 9 Mar 2011 18:56:01 +0000 (10:56 -0800)]
Merge "Fix issue
3439872: video chat and bluetooth SCO" into honeycomb-mr1
Shimeng (Simon) Wang [Wed, 9 Mar 2011 18:51:26 +0000 (10:51 -0800)]
am
12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '
12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
Consider mInitialScale when setting min zoom scale.
Shimeng (Simon) Wang [Wed, 9 Mar 2011 18:48:57 +0000 (10:48 -0800)]
Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
Mike Lockwood [Wed, 9 Mar 2011 18:48:13 +0000 (10:48 -0800)]
am
2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '
2c3ed82600af117e791a087330a198fe90d298b7':
Change UsbManager.requestPermission to only grant permission temporarily
Mike Lockwood [Wed, 9 Mar 2011 18:44:19 +0000 (10:44 -0800)]
Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
Jean-Michel Trivi [Wed, 9 Mar 2011 18:20:24 +0000 (10:20 -0800)]
am
5fa7aac8: Merge "Fix bug
4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '
5fa7aac81b471557cd944f762340281e5fa012f9':
Fix bug
4064086 Use a death handler on audio focus changes from mode
Jean-Michel Trivi [Wed, 9 Mar 2011 18:18:31 +0000 (10:18 -0800)]
Merge "Fix bug
4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
Irfan Sheriff [Wed, 9 Mar 2011 17:32:55 +0000 (09:32 -0800)]
am
7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '
7ad85eb62f9f332cc8002ec996cd359333ba590e':
Persist wifi override in airplane mode
Irfan Sheriff [Wed, 9 Mar 2011 17:30:28 +0000 (09:30 -0800)]
Merge "Persist wifi override in airplane mode" into honeycomb-mr1
Patrick Scott [Wed, 9 Mar 2011 13:08:15 +0000 (05:08 -0800)]
am
ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '
ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
Pass the auto login header information to the app.
Patrick Scott [Wed, 9 Mar 2011 13:05:21 +0000 (05:05 -0800)]
Merge "Pass the auto login header information to the app." into honeycomb-mr1
Kristian Monsen [Wed, 9 Mar 2011 12:32:28 +0000 (04:32 -0800)]
am
9e697ee9: Merge "Fix for bug
3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit '
9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
Fix for bug
3469242 Turn of extra debugging before shipping
Kristian Monsen [Wed, 9 Mar 2011 12:29:45 +0000 (04:29 -0800)]
Merge "Fix for bug
3469242 Turn of extra debugging before shipping" into honeycomb-mr1
Mike Lockwood [Wed, 9 Mar 2011 11:54:28 +0000 (03:54 -0800)]
am
9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '
9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
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
Mike Lockwood [Wed, 9 Mar 2011 11:52:47 +0000 (03:52 -0800)]
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
Jeff Brown [Wed, 9 Mar 2011 10:48:18 +0000 (02:48 -0800)]
am
36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '
36b077d558727ead246434b08de0ce7b955508e1':
Eliminate some accidental log spam. (DO NOT MERGE)
OSDN Git Service
