OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "Don't change keyboard state in setIconifiedByDefault."
Amith Yamasani [Tue, 15 Feb 2011 21:06:20 +0000 (13:06 -0800)]
Merge "Don't change keyboard state in setIconifiedByDefault."

13 years agoMerge branch 'master' of ssh://android-git:29418/platform/frameworks/base
John Wang [Tue, 15 Feb 2011 20:43:05 +0000 (12:43 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

13 years agoam d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is availab...
John Wang [Tue, 15 Feb 2011 20:43:00 +0000 (12:43 -0800)]
am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
  Only decode EXT1 tag when it is available.

13 years agoMerge "MTP host: disable some test code"
Mike Lockwood [Tue, 15 Feb 2011 20:42:58 +0000 (12:42 -0800)]
Merge "MTP host: disable some test code"

13 years agoam 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into...
John Wang [Tue, 15 Feb 2011 20:40:49 +0000 (12:40 -0800)]
am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
  Only decode EXT1 tag when it is available.

13 years agoam 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:38:38 +0000 (12:38 -0800)]
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.

13 years agoam 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:37:36 +0000 (12:37 -0800)]
am 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

* commit '80dcc6aebfbca724f49c83d30cdad51ef980f0db':
  SDK docs: Hierarchy Viewer V2

13 years agoMerge "fix [3452769] SensorEventListener can cause a java allocation at each received...
Mathias Agopian [Tue, 15 Feb 2011 20:34:48 +0000 (12:34 -0800)]
Merge "fix [3452769] SensorEventListener can cause a java allocation at each received event [external]"

13 years agoMerge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread

13 years agoam 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:34:35 +0000 (12:34 -0800)]
am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
  SDK docs: Hierarchy Viewer V2

13 years agoMerge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:32:48 +0000 (12:32 -0800)]
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

13 years agoam ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around...
Andreas Huber [Tue, 15 Feb 2011 19:53:47 +0000 (11:53 -0800)]
am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoMerge "Keep overview mode when screen is rotated."
Shimeng (Simon) Wang [Tue, 15 Feb 2011 19:52:16 +0000 (11:52 -0800)]
Merge "Keep overview mode when screen is rotated."

13 years agoam e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with...
Andreas Huber [Tue, 15 Feb 2011 19:51:33 +0000 (11:51 -0800)]
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 19:49:03 +0000 (11:49 -0800)]
am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match...
Scott Main [Tue, 15 Feb 2011 19:38:50 +0000 (11:38 -0800)]
am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb

* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
  docs: revise a couple sample app names to match side nav

13 years agoam 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into...
Scott Main [Tue, 15 Feb 2011 19:36:44 +0000 (11:36 -0800)]
am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb

* commit '97ef3b416ada559c446d1d21d70d2604433b92f5':
  docs: revise a couple sample app names to match side nav

13 years agoMerge "docs: revise a couple sample app names to match side nav" into honeycomb
Scott Main [Tue, 15 Feb 2011 19:33:43 +0000 (11:33 -0800)]
Merge "docs: revise a couple sample app names to match side nav" into honeycomb

13 years agoMerge "Fix some bugs with MenuPopupHelper and ListPopupWindow"
Adam Powell [Tue, 15 Feb 2011 19:16:01 +0000 (11:16 -0800)]
Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"

13 years agoam 9b833cf0: am 5a44efb4: docs: fix markup error
Scott Main [Tue, 15 Feb 2011 19:09:19 +0000 (11:09 -0800)]
am 9b833cf0: am 5a44efb4: docs: fix markup error

* commit '9b833cf0cb499f2fe66319f9773f88fb94a85709':
  docs: fix markup error

13 years agoam 5a44efb4: docs: fix markup error
Scott Main [Tue, 15 Feb 2011 19:07:06 +0000 (11:07 -0800)]
am 5a44efb4: docs: fix markup error

* commit '5a44efb42738e4fd1b448004f74dc96372801936':
  docs: fix markup error

13 years agoMerge "Text insertion cursor is now defined by a Drawable."
Gilles Debunne [Tue, 15 Feb 2011 18:41:30 +0000 (10:41 -0800)]
Merge "Text insertion cursor is now defined by a Drawable."

13 years agoMerge "Keep mobile site's text wrap scale unchanged."
Shimeng (Simon) Wang [Tue, 15 Feb 2011 18:12:29 +0000 (10:12 -0800)]
Merge "Keep mobile site's text wrap scale unchanged."

13 years agoMerge "Fix when >2 keyframes supplied"
Chet Haase [Tue, 15 Feb 2011 14:46:48 +0000 (06:46 -0800)]
Merge "Fix when >2 keyframes supplied"

13 years agoMerge "Add the Id of InputMethodInfo at the tail of Application label at sorting...
satok [Tue, 15 Feb 2011 08:58:29 +0000 (00:58 -0800)]
Merge "Add the Id of InputMethodInfo at the tail of Application label at sorting InputMethods"

13 years agoMerge "VideoEditor:Inconsistance defines:Issue ID:3419090"
Basavapatna Dattaguru [Tue, 15 Feb 2011 04:14:38 +0000 (20:14 -0800)]
Merge "VideoEditor:Inconsistance defines:Issue ID:3419090"

13 years agoMerge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"
Basavapatna Dattaguru [Tue, 15 Feb 2011 03:31:52 +0000 (19:31 -0800)]
Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"

13 years agoMerge "Disable cross-app drag/drop"
Christopher Tate [Tue, 15 Feb 2011 02:14:49 +0000 (18:14 -0800)]
Merge "Disable cross-app drag/drop"

13 years agoMerge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets...
Mathias Agopian [Tue, 15 Feb 2011 02:14:16 +0000 (18:14 -0800)]
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external]"

13 years agoMerge "WebView's scrollBarStyle need to be set at init"
Teng-Hui Zhu [Tue, 15 Feb 2011 01:23:58 +0000 (17:23 -0800)]
Merge "WebView's scrollBarStyle need to be set at init"

13 years agoMerge "Gracefully handle drawing caches allocation failure. Bug #3431451"
Romain Guy [Tue, 15 Feb 2011 00:34:15 +0000 (16:34 -0800)]
Merge "Gracefully handle drawing caches allocation failure. Bug #3431451"

13 years agoMerge "Fix 3409550: Fix crash caused when max pattern attempts met."
Jim Miller [Tue, 15 Feb 2011 00:27:18 +0000 (16:27 -0800)]
Merge "Fix 3409550: Fix crash caused when max pattern attempts met."

13 years agoMerge "Fix 3423212: Constrain large app icons to 64x64 in recents."
Jim Miller [Tue, 15 Feb 2011 00:16:30 +0000 (16:16 -0800)]
Merge "Fix 3423212: Constrain large app icons to 64x64 in recents."

13 years agoMerge "VideoEditor: Issue ID:3396697 Missing Files added"
Basavapatna Dattaguru [Tue, 15 Feb 2011 00:12:13 +0000 (16:12 -0800)]
Merge "VideoEditor: Issue ID:3396697 Missing Files added"

13 years agoam d2bd6f4d: am 64b12eac: docs: add links to sample apps
Scott Main [Tue, 15 Feb 2011 00:10:10 +0000 (16:10 -0800)]
am d2bd6f4d: am 64b12eac: docs: add links to sample apps

* commit 'd2bd6f4d49489db429650a3308554c1d45cb31b6':
  docs: add links to sample apps

13 years agoam 64b12eac: docs: add links to sample apps
Scott Main [Tue, 15 Feb 2011 00:07:47 +0000 (16:07 -0800)]
am 64b12eac: docs: add links to sample apps

* commit '64b12eac53ba9acd456be2e23f34b5add18461ce':
  docs: add links to sample apps

13 years agoMerge changes I7a5c806d,Iaa0a773e,I818b0c70,I4dfe14ce,I32a8d274
Jaikumar Ganesh [Mon, 14 Feb 2011 23:41:59 +0000 (15:41 -0800)]
Merge changes I7a5c806d,Iaa0a773e,I818b0c70,I4dfe14ce,I32a8d274

* changes:
  Make profile handler classes package and final.
  Fix ANR in Settings and Phone app.
  Refactor Input profile operations from Bluetooth Service.
  Remove Bluetooth Pan operations from Bluetooth Service.
  Distinguish between NAP and PAN role disconnections

13 years agoMerge "Deprecate ARGB_4444."
Romain Guy [Mon, 14 Feb 2011 23:35:54 +0000 (15:35 -0800)]
Merge "Deprecate ARGB_4444."

13 years agoMerge "Enable cancelling the rtsp connection process early."
Andreas Huber [Mon, 14 Feb 2011 23:35:45 +0000 (15:35 -0800)]
Merge "Enable cancelling the rtsp connection process early."

13 years agoMerge "Remove more use of netmask"
Robert Greenwalt [Mon, 14 Feb 2011 22:48:05 +0000 (14:48 -0800)]
Merge "Remove more use of netmask"

13 years agoam 753c22cf: am 865cd1ca: Merge "docs: update sidenav; move loaders under activities...
Scott Main [Mon, 14 Feb 2011 22:47:11 +0000 (14:47 -0800)]
am 753c22cf: am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

* commit '753c22cfecb04cfdccea3b92197f73e7328d0b15':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/

13 years agoam 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more...
Scott Main [Mon, 14 Feb 2011 22:44:30 +0000 (14:44 -0800)]
am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

* commit '865cd1ca5c31243764545dc888ee117a9215e837':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/

13 years agoam 2d022d01: am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:43:53 +0000 (14:43 -0800)]
am 2d022d01: am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb

* commit '2d022d01d0689b61de87bbf9ffd47703ceae1596':
  docs: fix link to sample app

13 years agoMerge "docs: update sidenav; move loaders under activities, add "more" tags, remove...
Scott Main [Mon, 14 Feb 2011 22:42:18 +0000 (14:42 -0800)]
Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

13 years agoam 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:41:14 +0000 (14:41 -0800)]
am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb

* commit '9ab0f2b220a6b38cad020bb3f4940737a024a5f6':
  docs: fix link to sample app

13 years agoMerge "docs: fix link to sample app" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:39:13 +0000 (14:39 -0800)]
Merge "docs: fix link to sample app" into honeycomb

13 years agoam 9a4548f5: am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:36:24 +0000 (14:36 -0800)]
am 9a4548f5: am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb

* commit '9a4548f5ba53d9f91d5b1f9a349d795d16f6f82a':
  docs: add faketouch to uses-feature doc

13 years agoam 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:32:40 +0000 (14:32 -0800)]
am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb

* commit '81bb4952713da8c6d900508e72650d9388b2bfdc':
  docs: add faketouch to uses-feature doc

13 years agoMerge "docs: add faketouch to uses-feature doc" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:29:09 +0000 (14:29 -0800)]
Merge "docs: add faketouch to uses-feature doc" into honeycomb

13 years agoMerge "Fix issue #3414684: task_intra_wallpaper transitions have some inconsistency"
Dianne Hackborn [Mon, 14 Feb 2011 22:28:23 +0000 (14:28 -0800)]
Merge "Fix issue #3414684: task_intra_wallpaper transitions have some inconsistency"

13 years agoMerge "Full text search: removing unused deprecated hidden API."
Dmitri Plotnikov [Mon, 14 Feb 2011 22:21:09 +0000 (14:21 -0800)]
Merge "Full text search: removing unused deprecated hidden API."

13 years agoMerge "Add comment about not changing calendar authority"
Erik [Mon, 14 Feb 2011 21:36:16 +0000 (13:36 -0800)]
Merge "Add comment about not changing calendar authority"

13 years agoMerge "Making AdapaterViewAnimator setDisplayedChild remotable"
Adam Cohen [Mon, 14 Feb 2011 20:57:16 +0000 (12:57 -0800)]
Merge "Making AdapaterViewAnimator setDisplayedChild remotable"

13 years agoam 0e9e74e8: am ecd8fa06: Merge "docs: add clarification to split touch events" into...
Scott Main [Mon, 14 Feb 2011 20:38:30 +0000 (12:38 -0800)]
am 0e9e74e8: am ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb

* commit '0e9e74e86e6a126adafb79b0fa768008aba39e3d':
  docs: add clarification to split touch events

13 years agoam ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb
Scott Main [Mon, 14 Feb 2011 20:35:36 +0000 (12:35 -0800)]
am ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb

* commit 'ecd8fa06e73b9d2ef6082af3f50e1daa194e9e08':
  docs: add clarification to split touch events

13 years agoMerge "docs: add clarification to split touch events" into honeycomb
Scott Main [Mon, 14 Feb 2011 20:33:10 +0000 (12:33 -0800)]
Merge "docs: add clarification to split touch events" into honeycomb

13 years agoam 1d0fad21: am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:06:02 +0000 (12:06 -0800)]
am 1d0fad21: am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb

* commit '1d0fad219d78652f8d93344054466b664c2a6699':
  Doc change: New docs for Loaders.

13 years agoam 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:03:16 +0000 (12:03 -0800)]
am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb

* commit '28c3f5ca436f466638012934b8f3f1f923158118':
  Doc change: New docs for Loaders.

13 years agoMerge "Doc change: New docs for Loaders." into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:01:04 +0000 (12:01 -0800)]
Merge "Doc change: New docs for Loaders." into honeycomb

13 years agoam 06174dde: am b254165a: Merge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:49:25 +0000 (11:49 -0800)]
am 06174dde: am b254165a: Merge "docs: fix links" into honeycomb

* commit '06174dde79748683401771951800d54415ad48c5':
  docs: fix links

13 years agoam 1d7fb0a6: am 2e805682: Merge "add compatible-screens manifest element and update...
Scott Main [Mon, 14 Feb 2011 19:49:17 +0000 (11:49 -0800)]
am 1d7fb0a6: am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb

* commit '1d7fb0a6aa0283484676a26e123aee6871828025':
  add compatible-screens manifest element and update supports-screens element with resizeable attribute

13 years agoam b254165a: Merge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:46:38 +0000 (11:46 -0800)]
am b254165a: Merge "docs: fix links" into honeycomb

* commit 'b254165af83849c21276bf832759a38d889cd90e':
  docs: fix links

13 years agoam 2e805682: Merge "add compatible-screens manifest element and update supports-scree...
Scott Main [Mon, 14 Feb 2011 19:46:35 +0000 (11:46 -0800)]
am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb

* commit '2e80568263924b13c59a24d4d28fecb903bbc2a9':
  add compatible-screens manifest element and update supports-screens element with resizeable attribute

13 years agoMerge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:44:49 +0000 (11:44 -0800)]
Merge "docs: fix links" into honeycomb

13 years agoMerge "add compatible-screens manifest element and update supports-screens element...
Scott Main [Mon, 14 Feb 2011 19:44:10 +0000 (11:44 -0800)]
Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb

13 years agoam 7aceb8d8: am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example...
Joe Malin [Mon, 14 Feb 2011 19:31:31 +0000 (11:31 -0800)]
am 7aceb8d8: am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb

* commit '7aceb8d814f0d803919c8f8a09e752eeaa979b92':
  DOC CHANGE: Fix bug 3448489 - Monkeyrunner example

13 years agoam 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:28:52 +0000 (11:28 -0800)]
am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb

* commit '55ee1d66981f1edef966562f11c60886138544ea':
  DOC CHANGE: Fix bug 3448489 - Monkeyrunner example

13 years agoMerge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:26:00 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb

13 years agoam 002c028c: am ea72329b: docs: update 3.0 version notes
Scott Main [Mon, 14 Feb 2011 18:37:44 +0000 (10:37 -0800)]
am 002c028c: am ea72329b: docs: update 3.0 version notes

* commit '002c028c569361b64d8475c59aa8ced29045b5ae':
  docs: update 3.0 version notes

13 years agoam ea72329b: docs: update 3.0 version notes
Scott Main [Mon, 14 Feb 2011 18:34:51 +0000 (10:34 -0800)]
am ea72329b: docs: update 3.0 version notes

* commit 'ea72329bcc360437d67492bc4f2c82e65e8ba841':
  docs: update 3.0 version notes

13 years agoMerge "Add title bar gravity"
Michael Kolb [Mon, 14 Feb 2011 18:26:55 +0000 (10:26 -0800)]
Merge "Add title bar gravity"

13 years agoMerge "Accessibility events generated by WebView contain non well formed markup."
Svetoslav Ganov [Mon, 14 Feb 2011 18:17:51 +0000 (10:17 -0800)]
Merge "Accessibility events generated by WebView contain non well formed markup."

13 years agoam b2206668: am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into...
Joe Malin [Mon, 14 Feb 2011 18:08:26 +0000 (10:08 -0800)]
am b2206668: am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

* commit 'b2206668d1559df2f0885723e89e7f59d372c7e0':
  Doc Change: Topics for copy/paste/drag/drop

13 years agoam 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Joe Malin [Mon, 14 Feb 2011 18:05:46 +0000 (10:05 -0800)]
am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

* commit '83c8b8a3284063c201beccc79f14db6bd715dd82':
  Doc Change: Topics for copy/paste/drag/drop

13 years agoMerge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Joe Malin [Mon, 14 Feb 2011 18:03:33 +0000 (10:03 -0800)]
Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

13 years agoam 1858c95e: am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from...
Xavier Ducrohet [Mon, 14 Feb 2011 17:59:58 +0000 (09:59 -0800)]
am 1858c95e: am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.

* commit '1858c95e99f81ac46eea93288cb8866260b3d5d8':
  LayoutLib: When possible ensure parsers are popped from the stack.

13 years agoam 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
Xavier Ducrohet [Mon, 14 Feb 2011 17:57:17 +0000 (09:57 -0800)]
am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.

* commit '02d2b5a4031c80bfe1012ce2f4f7b3695762abd9':
  LayoutLib: When possible ensure parsers are popped from the stack.

13 years agoam a7276805: am b269346c: am d4952380: fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:46:08 +0000 (09:46 -0800)]
am a7276805: am b269346c: am d4952380: fix md5sum for windows installer

* commit 'a7276805bfad4b3170f7887f8358b5f8e5bef943':
  fix md5sum for windows installer

13 years agoMerge "Add wait time for Wi-Fi tethering test, bug http://b/issue?id=3436586"
Xia Wang [Mon, 14 Feb 2011 17:32:10 +0000 (09:32 -0800)]
Merge "Add wait time for Wi-Fi tethering test, bug b/issue?id=3436586"

13 years agoam b269346c: am d4952380: fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:25:30 +0000 (09:25 -0800)]
am b269346c: am d4952380: fix md5sum for windows installer

* commit 'b269346ca333a975d37ac50fec0c7b6a4c39a3de':
  fix md5sum for windows installer

13 years agoam d4952380: fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:14:12 +0000 (09:14 -0800)]
am d4952380: fix md5sum for windows installer

* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
  fix md5sum for windows installer

13 years agoMerge "Put the pocket back in my pocket for later."
Daniel Sandler [Mon, 14 Feb 2011 16:21:03 +0000 (08:21 -0800)]
Merge "Put the pocket back in my pocket for later."

13 years agoMerge "Fixing a bug in RemoteViewsAdapter where cached items weren't being marked...
Adam Cohen [Sat, 12 Feb 2011 02:25:43 +0000 (18:25 -0800)]
Merge "Fixing a bug in RemoteViewsAdapter where cached items weren't being marked as requested"

13 years agoMerge "VideoEditor: Fixes Issue ID:3448077"
Basavapatna Dattaguru [Sat, 12 Feb 2011 02:11:21 +0000 (18:11 -0800)]
Merge "VideoEditor: Fixes Issue ID:3448077"

13 years agoMerge "VideoEditor: Populate profile&level: Issue:3419090"
Basavapatna Dattaguru [Sat, 12 Feb 2011 01:48:45 +0000 (17:48 -0800)]
Merge "VideoEditor: Populate profile&level: Issue:3419090"

13 years agoMerge "add more debug info to help (bug:3446432)"
Vasu Nori [Sat, 12 Feb 2011 00:57:40 +0000 (16:57 -0800)]
Merge "add more debug info to help (bug:3446432)"

13 years agoMerge "Fix issue 3400751."
Eric Laurent [Sat, 12 Feb 2011 00:54:48 +0000 (16:54 -0800)]
Merge "Fix issue 3400751."

13 years agoam e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
Stephen Hines [Sat, 12 Feb 2011 00:49:48 +0000 (16:49 -0800)]
am e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb

* commit 'e49f75eb4634f8ee70ad0b5fbd8c6ea19773024f':
  Fix struct initializer for balls.

13 years agoam 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include...
Roman Nurik [Sat, 12 Feb 2011 00:47:34 +0000 (16:47 -0800)]
am 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb

* commit '471f89cc8666f484c5a609503f16d806b8c716f0':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.

13 years agoam bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
Stephen Hines [Sat, 12 Feb 2011 00:47:04 +0000 (16:47 -0800)]
am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb

* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
  Fix struct initializer for balls.

13 years agoam b9659336: Merge "Update Supported Media Formats document to include information...
Roman Nurik [Sat, 12 Feb 2011 00:44:52 +0000 (16:44 -0800)]
am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb

* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.

13 years agoMerge "Fix struct initializer for balls." into honeycomb
Stephen Hines [Sat, 12 Feb 2011 00:44:49 +0000 (16:44 -0800)]
Merge "Fix struct initializer for balls." into honeycomb

13 years agoMerge "Update Supported Media Formats document to include information about network...
Roman Nurik [Sat, 12 Feb 2011 00:43:32 +0000 (16:43 -0800)]
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb

13 years agoam 154e849b: am ccea5d27: Doc change: tools, adt, ndk release notes
Robert Ly [Sat, 12 Feb 2011 00:31:59 +0000 (16:31 -0800)]
am 154e849b: am ccea5d27: Doc change: tools, adt, ndk release notes

* commit '154e849b72f6c71ee4c996b6dc67a46e7f8703df':
  Doc change: tools, adt, ndk release notes

13 years agoam ccea5d27: Doc change: tools, adt, ndk release notes
Robert Ly [Sat, 12 Feb 2011 00:30:15 +0000 (16:30 -0800)]
am ccea5d27: Doc change: tools, adt, ndk release notes

* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
  Doc change: tools, adt, ndk release notes

13 years agoMerge "Add the open source test media contents."
Yu Shan Emily Lau [Sat, 12 Feb 2011 00:16:06 +0000 (16:16 -0800)]
Merge "Add the open source test media contents."

13 years agoMerge "Add a new method, LruCache.remove"
Jesse Wilson [Fri, 11 Feb 2011 23:56:15 +0000 (15:56 -0800)]
Merge "Add a new method, LruCache.remove"

13 years agoam d822438f: am 94be4a5e: Deprecate samples/index.html in favor of resource browser...
Roman Nurik [Fri, 11 Feb 2011 23:44:46 +0000 (15:44 -0800)]
am d822438f: am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

* commit 'd822438fa7fcc23df3a240a65ad4ba1fe6fe7cc7':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

13 years agoam 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update...
Roman Nurik [Fri, 11 Feb 2011 23:42:57 +0000 (15:42 -0800)]
am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

13 years agoMerge "Make available h263 DSI information from MPEG4Extractor"
James Dong [Fri, 11 Feb 2011 23:38:20 +0000 (15:38 -0800)]
Merge "Make available h263 DSI information from MPEG4Extractor"