34706 Commits

Author SHA1 Message Date
Dianne Hackborn
1b36424419 am eb5aeae6: am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314'

* commit 'eb5aeae676fb23b2ad748185867c085e3cd65314':
  Adjust boundaries for screen sizes.
2010-10-21 20:27:30 -07:00
Dianne Hackborn
30e257763f am 101f14b2: (-s ours) am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit '101f14b275ab2451aef50dec427376d721d17aea'

* commit '101f14b275ab2451aef50dec427376d721d17aea':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:27:26 -07:00
Dianne Hackborn
bff26d156d am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'

* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
  Fix issue #3117918: No way to finish a native activity
2010-10-21 20:27:15 -07:00
Dianne Hackborn
eb5aeae676 am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp

* commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
  Adjust boundaries for screen sizes.
2010-10-21 20:18:11 -07:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
86f1b643d1 am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp

* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
  Fix issue #3117918: No way to finish a native activity
2010-10-21 20:17:50 -07:00
Dianne Hackborn
fdbb2168f7 Merge "Adjust boundaries for screen sizes." into gingerbread 2010-10-21 19:21:28 -07:00
Dianne Hackborn
ba501785c7 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 2010-10-21 19:20:49 -07:00
Dianne Hackborn
bf5efba238 Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 2010-10-21 19:09:44 -07:00
Dianne Hackborn
db28a94d49 Fix issue #3117918: No way to finish a native activity
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
2010-10-21 19:07:37 -07:00
Jeff Brown
4924aee9cb am 482284ad: am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Merge commit '482284ad0e3226b49c27bf41442c1cb150853226'

* commit '482284ad0e3226b49c27bf41442c1cb150853226':
  Fix a race condition in wallpaper move throttling.
2010-10-21 18:10:24 -07:00
Jeff Brown
482284ad0e am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp

* commit '6b3178a6323e015644590ebaee86523e4bb81773':
  Fix a race condition in wallpaper move throttling.
2010-10-21 18:05:53 -07:00
Jeff Brown
6b3178a632 Merge "Fix a race condition in wallpaper move throttling." into gingerbread 2010-10-21 18:02:54 -07:00
Dianne Hackborn
c981465aac am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'

* commit '2f1eee34706cf42855541def5737c37a071d7293':
  Fix issue #3117472: Format storage dialog still broken
2010-10-21 17:44:40 -07:00
Jeff Brown
840db1f678 Fix a race condition in wallpaper move throttling.
Bug: 3099316
Change-Id: Ia3221975b5be7fae8359d6ab531bbecd0e29aee9
2010-10-21 17:36:54 -07:00
Dianne Hackborn
2f1eee3470 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
2010-10-21 17:35:12 -07:00
Dianne Hackborn
e9dbf208e4 Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 2010-10-21 17:28:19 -07:00
Mathias Agopian
c765a5d9e2 am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7'

* commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7':
  fix [3119687] [Maps][4.6.0] Force close in street view
2010-10-21 17:23:24 -07:00
Mathias Agopian
27ca388728 am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '46beb43357e32507189203db4626d0df954abe62'

* commit '46beb43357e32507189203db4626d0df954abe62':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 17:22:05 -07:00
Kenny Root
470ce098f8 am d7cd560a: am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit 'd7cd560af506f75d07034c136bea09b409b4d408'

* commit 'd7cd560af506f75d07034c136bea09b409b4d408':
  Use correct size of GAMEPAD_KEYCODES
2010-10-21 17:21:56 -07:00
Mathias Agopian
49af98ed87 am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp

* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
  fix [3119687] [Maps][4.6.0] Force close in street view
2010-10-21 17:07:15 -07:00
Mathias Agopian
aa6df3669d Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 2010-10-21 16:43:00 -07:00
Dianne Hackborn
4f6ee254bc Fix issue #3117472: Format storage dialog still broken
Change-Id: I19b3a04e33785a56cb14457e4e3cd9232f585bb1
2010-10-21 16:39:53 -07:00
Mathias Agopian
46beb43357 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Kenny Root
d7cd560af5 am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp

* commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
  Use correct size of GAMEPAD_KEYCODES
2010-10-21 16:22:58 -07:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Chia-chi Yeh
39df5331c7 am 044fcd64: am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Merge commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44'

* commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44':
  RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
2010-10-21 16:08:47 -07:00
Mathias Agopian
c4e84b8fbd fix [3119687] [Maps][4.6.0] Force close in street view
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.

Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
2010-10-21 15:58:25 -07:00
Kenny Root
1d79a9d9f8 Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.

Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
2010-10-21 15:46:03 -07:00
Dianne Hackborn
b51dc0fe2a Adjust boundaries for screen sizes.
Part of issue #3116702: New manifest tags for supported screen sizes

Kind-of.

If you turn your head side-ways.

Change-Id: I446f1e2eadba1ce284c93ff9fb0197bb0e6b0fca
2010-10-21 15:34:47 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
2010-10-21 15:32:06 -07:00
Nick Kralevich
c791244444 am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'

* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
  allow dumpstate to work for non-root users.
2010-10-21 15:31:07 -07:00
John Huang
a35827a8e9 am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'

* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
  Fix connect duration for un-established SIP calls.
2010-10-21 15:29:48 -07:00
Marc Blank
5c167f9191 Merge "Don't stop FlingRunnable when deltaY is rounded to zero" 2010-10-21 15:01:13 -07:00
Chris Tate
1381cac20a Merge "Report drag success/fail in the DRAG_ENDED message" 2010-10-21 14:46:18 -07:00
Shimeng (Simon) Wang
c5152cad1d Merge "Let restored scale be in effect." 2010-10-21 14:40:56 -07:00
Chris Tate
d4533f1469 Report drag success/fail in the DRAG_ENDED message
DragEvent.getResult() returns 'true' if the drop was ultimately accepted;
false otherwise.  The validity of this datum is only guaranteed when the
DragEvent's action verb is ACTION_DRAG_ENDED.

Also fixes the drag-start timeout handling (though the offending app is
not yet officially declared ANR).

Implements bug 3097807

Change-Id: I6908ac628c72ff7d6193d87060d769a559a78d0e
2010-10-21 14:25:06 -07:00
Shimeng (Simon) Wang
8db525a9ad Let restored scale be in effect.
This change reverts some previous change to solve macworld.com scale issue.

issue: 3117312
Change-Id: Id822c7f9c196522a24c0b7657225560dcd0e51e4
2010-10-21 14:20:50 -07:00
Sylvain Fonteneau
82a8a2aa0a am 4fc9ecf2: am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
Merge commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae'

* commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae':
  Enable presence check at application level using
2010-10-21 13:50:20 -07:00
Nick Pelly
886fd91833 am c0e93a84: am 7ea5c45e: NFC settings cleanup.
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'

* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
  NFC settings cleanup.
2010-10-21 13:50:09 -07:00
Brad Fitzpatrick
9509527eb6 am 0c551368: am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '0c55136893849d72ac267f887a841efe845218a1'

* commit '0c55136893849d72ac267f887a841efe845218a1':
  Make the base direction of the Arabic error pages RTL
2010-10-21 13:49:41 -07:00
Brad Fitzpatrick
eeacc37b38 am ba1b1c9c: am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179'

* commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179':
  Set the base direction of the Hebrew error pages to RTL
2010-10-21 13:49:35 -07:00
James Dong
9165145342 am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
  File writer size estimation improvement
2010-10-21 13:49:00 -07:00
Mathias Agopian
55d7bca71c am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Merge commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea'

* commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea':
  Add a test application to dump all the EGLConfig available
2010-10-21 13:48:50 -07:00
Mathias Agopian
27767c4856 am 4ceee5a6: (-s ours) am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Merge commit '4ceee5a6b0089ffbec75690b7284f80d481ab212'

* commit '4ceee5a6b0089ffbec75690b7284f80d481ab212':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
2010-10-21 13:48:42 -07:00
Mathias Agopian
ac6f0cc317 am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'

* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
  Use the context_priority extension when present.
2010-10-21 13:48:36 -07:00
Mathias Agopian
6a6fbfb348 am 6d90e89a: am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread
Merge commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82'

* commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82':
  software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
2010-10-21 13:47:59 -07:00
Jean-Baptiste Queru
276bb3a327 am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'

* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
  Make disabled TextViews uneditable
2010-10-21 13:47:42 -07:00
Dianne Hackborn
46cb1d9602 am 674b856c: am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d'

* commit '674b856c15206a23d9d8a22fbd936a4f3055894d':
  Fix java doc on FLAG_EXTERNAL.
2010-10-21 13:47:08 -07:00
Jean-Baptiste Queru
7df7cfebdf am c20f205d: am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f'

* commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f':
  BatteryService: Set bool to true if sysfs entry is not 0
2010-10-21 13:46:41 -07:00