OSDN Git Service

android-x86/frameworks-native.git
13 years agoam 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode
Scott Main [Tue, 8 Feb 2011 00:39:36 +0000 (16:39 -0800)]
am 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode

* commit '62e9701099062093af01d7b5d9bdf7f1fe683a31':
  enable javadoc filtering for api level 11 and disable preview doc mode

13 years agoam f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
Jason Sams [Mon, 7 Feb 2011 22:17:45 +0000 (14:17 -0800)]
am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb

* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
  cleanup headers for SDK. bug 3421901

13 years agoMerge "cleanup headers for SDK. bug 3421901" into honeycomb
Jason Sams [Mon, 7 Feb 2011 21:59:45 +0000 (13:59 -0800)]
Merge "cleanup headers for SDK. bug 3421901" into honeycomb

13 years agoam 4dd2299d: LayoutLib: Update to latest API fix.
Xavier Ducrohet [Mon, 7 Feb 2011 21:23:20 +0000 (13:23 -0800)]
am 4dd2299d: LayoutLib: Update to latest API fix.

* commit '4dd2299d5766bf14479578772a0946c5399a0158':
  LayoutLib: Update to latest API fix.

13 years agoam 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int...
Xavier Ducrohet [Mon, 7 Feb 2011 18:22:32 +0000 (10:22 -0800)]
am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb

* commit '62a99c0b3bca70262ab205a5688ff69cbbbaee78':
  LayoutLib: Handle color state list in methods returning an int.

13 years agoMerge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
Xavier Ducrohet [Mon, 7 Feb 2011 18:18:48 +0000 (10:18 -0800)]
Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb

13 years agoam a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonCon...
Brad Fitzpatrick [Mon, 7 Feb 2011 18:09:29 +0000 (10:09 -0800)]
am a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

* commit 'a62bf8bb6b7a547802fb384b497e955940befa9c':
  Fix a race condition in NativeDaemonConnector

13 years agoam b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
Brad Fitzpatrick [Mon, 7 Feb 2011 18:07:46 +0000 (10:07 -0800)]
am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector

13 years agoam 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
Brad Fitzpatrick [Mon, 7 Feb 2011 18:04:54 +0000 (10:04 -0800)]
am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector

13 years agoMerge "Fix a race condition in NativeDaemonConnector"
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"

13 years agoam b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
Scott Main [Mon, 7 Feb 2011 17:44:52 +0000 (09:44 -0800)]
am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb

* commit 'b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
  docs: SearchView is iconified by default

13 years agoMerge "docs: SearchView is iconified by default" into honeycomb
Scott Main [Mon, 7 Feb 2011 17:33:32 +0000 (09:33 -0800)]
Merge "docs: SearchView is iconified by default" into honeycomb

13 years agoam 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
Dianne Hackborn [Mon, 7 Feb 2011 16:02:00 +0000 (08:02 -0800)]
am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."

* commit '6b497a0446ebad24305d5e29d5fd5e65014b9778':
  Fixing possible race condition.

13 years agoam 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
Dianne Hackborn [Mon, 7 Feb 2011 15:51:34 +0000 (07:51 -0800)]
am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."

* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.

13 years agoam bb2e1ef8: Merge "Fixing possible race condition."
Dianne Hackborn [Mon, 7 Feb 2011 15:33:38 +0000 (07:33 -0800)]
am bb2e1ef8: Merge "Fixing possible race condition."

* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.

13 years agoam 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars."...
Xavier Ducrohet [Sun, 6 Feb 2011 23:15:51 +0000 (15:15 -0800)]
am 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb

* commit '83d72da7f69f71fd20bd11fc4f98166532136248':
  LayoutLib: improved rendering for system/title/action bars.

13 years agoMerge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
Xavier Ducrohet [Sun, 6 Feb 2011 23:13:09 +0000 (15:13 -0800)]
Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb

13 years agoam cfc048a3: set targetsdk=11 on renderscript misc samples project
Robert Ly [Sun, 6 Feb 2011 22:24:56 +0000 (14:24 -0800)]
am cfc048a3: set targetsdk=11 on renderscript misc samples project

* commit 'cfc048a3f912695f7a251a2266aef59ac4d2d124':
  set targetsdk=11 on renderscript misc samples project

13 years agoMerge "Fixing possible race condition."
Dianne Hackborn [Sun, 6 Feb 2011 17:06:35 +0000 (09:06 -0800)]
Merge "Fixing possible race condition."

13 years agoam 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into...
Robert Ly [Sun, 6 Feb 2011 08:55:01 +0000 (00:55 -0800)]
am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb

* commit '5cf98da85c1698cacbeed8d4883373d0e0774fd8':
  Fixing renderscript samples to properly declare targetSDK

13 years agoMerge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
Robert Ly [Sun, 6 Feb 2011 08:51:40 +0000 (00:51 -0800)]
Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb

13 years agoam 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into...
Xavier Ducrohet [Sat, 5 Feb 2011 03:33:27 +0000 (19:33 -0800)]
am 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb

* commit '35064e5e3a04bda6211166630ccd49d522a8bd92':
  LayoutLib: add implementation of Bridge.renderDrawable()

13 years agoMerge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
Xavier Ducrohet [Sat, 5 Feb 2011 03:31:38 +0000 (19:31 -0800)]
Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb

13 years agoam be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
Paul Eastham [Sat, 5 Feb 2011 03:23:10 +0000 (19:23 -0800)]
am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"

* commit 'be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
  Revert "Fix for StaticLayout bug with ellipsized text"

13 years agoam f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into...
Dharmaray Kundargi [Sat, 5 Feb 2011 03:11:55 +0000 (19:11 -0800)]
am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
  Fix issue 3426489 Overlay background changed when exported

13 years agoMerge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
Dharmaray Kundargi [Sat, 5 Feb 2011 03:09:20 +0000 (19:09 -0800)]
Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

13 years agoam b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.
Xavier Ducrohet [Sat, 5 Feb 2011 02:27:30 +0000 (18:27 -0800)]
am b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.

* commit 'b0d34f9c99cbd43e8238c5952b19d032f02dd168':
  LayoutLib: split RenderSession's base method into RenderAction.

13 years agoam 1126422e: LayoutLib: update to the new API.
Xavier Ducrohet [Sat, 5 Feb 2011 02:05:55 +0000 (18:05 -0800)]
am 1126422e: LayoutLib: update to the new API.

* commit '1126422ee1f532d8582a4e3b56dbfe505c15e775':
  LayoutLib: update to the new API.

13 years agoam b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is delet...
Dharmaray Kundargi [Sat, 5 Feb 2011 01:03:47 +0000 (17:03 -0800)]
am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb

* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted

13 years agoam 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate...
Xavier Ducrohet [Sat, 5 Feb 2011 01:03:43 +0000 (17:03 -0800)]
am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb

* commit '3944b784e980b5e2cad69b2c8eb5dbc7c1fafc4a':
  LayoutLib: Replace custom BitmapFactory by a simpler delegate

13 years agoMerge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into...
Dharmaray Kundargi [Sat, 5 Feb 2011 01:01:51 +0000 (17:01 -0800)]
Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb

13 years agoMerge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
Xavier Ducrohet [Sat, 5 Feb 2011 01:01:11 +0000 (17:01 -0800)]
Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb

13 years agoam 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted...
Danny Fernandes [Sat, 5 Feb 2011 00:54:17 +0000 (16:54 -0800)]
am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb

* commit '6ef407c0e6e3c178b01e2837e59348f72c97cf8c':
  Fixed 3423072 Imported 1080x720 video clips present distorted view

13 years agoMerge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
Danny Fernandes [Sat, 5 Feb 2011 00:52:10 +0000 (16:52 -0800)]
Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb

13 years agoam d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
Eric Laurent [Sat, 5 Feb 2011 00:33:43 +0000 (16:33 -0800)]
am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb

* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection

13 years agoMerge "Issue 3395734: fix media server restart detection" into honeycomb
Eric Laurent [Sat, 5 Feb 2011 00:30:03 +0000 (16:30 -0800)]
Merge "Issue 3395734: fix media server restart detection" into honeycomb

13 years agoam c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji character...
Kenny Root [Sat, 5 Feb 2011 00:16:19 +0000 (16:16 -0800)]
am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."

* commit 'c4dfa998b7660b9afc4d41b0c940d798f2122fc3':
  JPtextinput: Dont break emoji characters when cutting strings.

13 years agoam c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
Jean-Michel Trivi [Sat, 5 Feb 2011 00:12:19 +0000 (16:12 -0800)]
am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

* commit 'c6a5dfd81384e3937fb7773a206876d5ee8d48ff':
  Fix bug 3425610 Reduce lock / unlock sound level

13 years agoam d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cuttin...
Kenny Root [Sat, 5 Feb 2011 00:12:14 +0000 (16:12 -0800)]
am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."

* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.

13 years agoam c1b638ae: docs: add more info about activating components and change link for...
Scott Main [Sat, 5 Feb 2011 00:10:01 +0000 (16:10 -0800)]
am c1b638ae: docs: add more info about activating components and change link for broadcasts

* commit 'c1b638ae41495b79d96b76bb8c71c1efb33dacbe':
  docs: add more info about activating components and change link for broadcasts

13 years agoMerge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
Jean-Michel Trivi [Sat, 5 Feb 2011 00:06:45 +0000 (16:06 -0800)]
Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

13 years agoam c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
Kenny Root [Sat, 5 Feb 2011 00:01:13 +0000 (16:01 -0800)]
am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."

* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.

13 years agoam 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text...
Gilles Debunne [Fri, 4 Feb 2011 23:54:19 +0000 (15:54 -0800)]
am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread

* commit '1ba2a47b82b950934ddf04570fb24124aec7f249':
  Blinking runnable is created only if text is editable. DO NOT MERGE.

13 years agoam 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO...
Gilles Debunne [Fri, 4 Feb 2011 23:53:44 +0000 (15:53 -0800)]
am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread

* commit '826fbdf7b621861f24b71a16fbad53c2ccff1de7':
  All runnable are stopped on detach. DO NOT MERGE.

13 years agoam 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text...
Gilles Debunne [Fri, 4 Feb 2011 23:53:37 +0000 (15:53 -0800)]
am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread

* commit '2f7e9d403a8ef6660d3acf8c41f57ce339c9f7cc':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.

13 years agoam 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT...
Gilles Debunne [Fri, 4 Feb 2011 23:50:15 +0000 (15:50 -0800)]
am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread

* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.

13 years agoam 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:50:12 +0000 (15:50 -0800)]
am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread

* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.

13 years agoam 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into...
Gilles Debunne [Fri, 4 Feb 2011 23:49:56 +0000 (15:49 -0800)]
am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread

* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.

13 years agoMerge "Blinking runnable is created only if text is editable. DO NOT MERGE." into...
Gilles Debunne [Fri, 4 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread

13 years agoMerge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:11 +0000 (15:46 -0800)]
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread

13 years agoMerge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:06 +0000 (15:46 -0800)]
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread

13 years agoMerge "JPtextinput: Dont break emoji characters when cutting strings."
Kenny Root [Fri, 4 Feb 2011 23:42:14 +0000 (15:42 -0800)]
Merge "JPtextinput: Dont break emoji characters when cutting strings."

13 years agoam 8d7cc6fa: Merge "Minor updates to Android Market Licensing Service docs." into...
Trevor Johns [Fri, 4 Feb 2011 23:34:19 +0000 (15:34 -0800)]
am 8d7cc6fa: Merge "Minor updates to Android Market Licensing Service docs." into honeycomb

* commit '8d7cc6fa8894bc0603534c9933592b96d60a751e':
  Minor updates to Android Market Licensing Service docs.

13 years agoam 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug...
Mike Cleron [Fri, 4 Feb 2011 23:32:08 +0000 (15:32 -0800)]
am 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580" into honeycomb

* commit '851beae717dc8e9b66c214d9d6aab2e76d52b086':
  Properly handle dirty rectangles generated from 9-patches Bug #3409580

13 years agoam 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
Mike Cleron [Fri, 4 Feb 2011 23:32:04 +0000 (15:32 -0800)]
am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb

* commit '2d47fd3c3566e5fbe16bcee2ec4be87c6cdc2440':
  Fix crash when Paths are GCd in hw accelerated apps

13 years agoMerge "Minor updates to Android Market Licensing Service docs." into honeycomb
Trevor Johns [Fri, 4 Feb 2011 23:30:26 +0000 (15:30 -0800)]
Merge "Minor updates to Android Market Licensing Service docs." into honeycomb

13 years agoMerge "Properly handle dirty rectangles generated from 9-patches Bug #3409580" into...
Mike Cleron [Fri, 4 Feb 2011 23:29:42 +0000 (15:29 -0800)]
Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580" into honeycomb

13 years agoMerge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
Mike Cleron [Fri, 4 Feb 2011 23:29:28 +0000 (15:29 -0800)]
Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb

13 years agoam a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb
Stephen Hines [Fri, 4 Feb 2011 23:17:09 +0000 (15:17 -0800)]
am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb

* commit 'a5b8768f01462374aed42e5c602afe65b7e050ef':
  Add support for memcpy/memset to RS.

13 years agoMerge "Add support for memcpy/memset to RS." into honeycomb
Stephen Hines [Fri, 4 Feb 2011 23:15:34 +0000 (15:15 -0800)]
Merge "Add support for memcpy/memset to RS." into honeycomb

13 years agoam c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb
Jamie Gennis [Fri, 4 Feb 2011 23:05:28 +0000 (15:05 -0800)]
am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb

* commit 'c2efcd2ceadab33b42d938e3771c994816e9a4b0':
  Initialize the SurfaceTexture transform fields.

13 years agoam 24c8ac3b: Merge "Fix issue #3414328: A couple panics observed during an attempted...
Dianne Hackborn [Fri, 4 Feb 2011 23:05:24 +0000 (15:05 -0800)]
am 24c8ac3b: Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb

* commit '24c8ac3b0912762ce6f3cdadc46c253f407af396':
  Fix issue #3414328: A couple panics observed during an attempted...

13 years agoMerge "Initialize the SurfaceTexture transform fields." into honeycomb
Jamie Gennis [Fri, 4 Feb 2011 23:03:30 +0000 (15:03 -0800)]
Merge "Initialize the SurfaceTexture transform fields." into honeycomb

13 years agoMerge "Fix issue #3414328: A couple panics observed during an attempted..." into...
Dianne Hackborn [Fri, 4 Feb 2011 23:03:27 +0000 (15:03 -0800)]
Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb

13 years agoam 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
Eric Laurent [Fri, 4 Feb 2011 22:08:25 +0000 (14:08 -0800)]
am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb

* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.

13 years agoMerge "Fix issues 3425035 and 3423785." into honeycomb
Eric Laurent [Fri, 4 Feb 2011 22:06:40 +0000 (14:06 -0800)]
Merge "Fix issues 3425035 and 3423785." into honeycomb

13 years agoam a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb
Gilles Debunne [Fri, 4 Feb 2011 22:02:05 +0000 (14:02 -0800)]
am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb

* commit 'a324a5810c84596d3a4f67f81a725a0c98dfc30f':
  Fix for StaticLayout bug with ellipsized text

13 years agoMerge "Fix for StaticLayout bug with ellipsized text" into honeycomb
Gilles Debunne [Fri, 4 Feb 2011 21:59:29 +0000 (13:59 -0800)]
Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb

13 years agoInitialize the SurfaceTexture transform fields.
Jamie Gennis [Fri, 4 Feb 2011 21:46:38 +0000 (13:46 -0800)]
Initialize the SurfaceTexture transform fields.

Change-Id: I2c25f15949253a1dbe493fef440e5ef118c40e71
related-bug: 3426067

13 years agoam 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec...
Danny Fernandes [Fri, 4 Feb 2011 21:39:50 +0000 (13:39 -0800)]
am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

* commit '5e1f3e4112f77bdb99bfef8c3ba185f0cb89e5ef':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level

13 years agoMerge "Fixed 3419090 Throwing exception for unsupported video codec profiles and...
Danny Fernandes [Fri, 4 Feb 2011 21:37:17 +0000 (13:37 -0800)]
Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

13 years agoam aa9c0273: Merge "Bug 3424058 increase IME key clicks by 7dB for spacebar and stand...
Jean-Michel Trivi [Fri, 4 Feb 2011 21:36:33 +0000 (13:36 -0800)]
am aa9c0273: Merge "Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys" into honeycomb

* commit 'aa9c02732f902c5b194f24737004d69906779746':
  Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys

13 years agoMerge "Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys...
Jean-Michel Trivi [Fri, 4 Feb 2011 21:34:14 +0000 (13:34 -0800)]
Merge "Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys" into honeycomb

13 years agoam b8578741: Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into...
Mike Cleron [Fri, 4 Feb 2011 19:56:23 +0000 (11:56 -0800)]
am b8578741: Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb

* commit 'b85787411085bbea0ac725135cae02a4167b7aa7':
  Fix issue #3424823: 4-corner trick causes runtime restart

13 years agoMerge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb
Mike Cleron [Fri, 4 Feb 2011 19:53:58 +0000 (11:53 -0800)]
Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb

13 years agoam 331e93e5: Merge "LayoutLib: render system/title/action bars." into honeycomb
Xavier Ducrohet [Fri, 4 Feb 2011 19:45:36 +0000 (11:45 -0800)]
am 331e93e5: Merge "LayoutLib: render system/title/action bars." into honeycomb

* commit '331e93e5a20227665d2db8a46778b9544b91879a':
  LayoutLib: render system/title/action bars.

13 years agoMerge "LayoutLib: render system/title/action bars." into honeycomb
Xavier Ducrohet [Fri, 4 Feb 2011 19:42:51 +0000 (11:42 -0800)]
Merge "LayoutLib: render system/title/action bars." into honeycomb

13 years agoam 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
Patrick Scott [Fri, 4 Feb 2011 19:22:41 +0000 (11:22 -0800)]
am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb

* commit '160c18a4d209f56766fdd90e4711c8e29fd407e6':
  Need a public way to wait for cookie operations.

13 years agoMerge "Need a public way to wait for cookie operations." into honeycomb
Patrick Scott [Fri, 4 Feb 2011 19:20:37 +0000 (11:20 -0800)]
Merge "Need a public way to wait for cookie operations." into honeycomb

13 years agoam cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:32:50 +0000 (10:32 -0800)]
am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."

* commit 'cc8f87e9410dd4de9a2fda4738429e6c6087c789':
  Initialize resampling buffer per track.

13 years agoam f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:30:40 +0000 (10:30 -0800)]
am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."

* commit 'f664d6f916516860d3e4cf82339d47c6f4fd24a2':
  Initialize resampling buffer per track.

13 years agoam b083d3b8: Merge "Initialize resampling buffer per track."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:27:54 +0000 (10:27 -0800)]
am b083d3b8: Merge "Initialize resampling buffer per track."

* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
  Initialize resampling buffer per track.

13 years agoMerge "Initialize resampling buffer per track."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:19:06 +0000 (10:19 -0800)]
Merge "Initialize resampling buffer per track."

13 years agoam 2742c9c2: am 163c28b5: Merge "Managed dialogs should run on the same thread as...
Joe Onorato [Fri, 4 Feb 2011 18:15:37 +0000 (10:15 -0800)]
am 2742c9c2: am 163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread

* commit '2742c9c2c640b6593321a0c5d56c8ba09ed58cc5':
  Managed dialogs should run on the same thread as their activity.

13 years agoam 23c907ca: Bug 3424058 Refix broken asset for "audible selection" sound effect
Jean-Michel Trivi [Fri, 4 Feb 2011 18:09:08 +0000 (10:09 -0800)]
am 23c907ca: Bug 3424058 Refix broken asset for "audible selection" sound effect

* commit '23c907cab8aa1a40ee79b322899b850080b14832':
  Bug 3424058 Refix broken asset for "audible selection" sound effect

13 years agoam 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
Dheeraj Sharma [Fri, 4 Feb 2011 10:40:17 +0000 (02:40 -0800)]
am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame

* commit '67ec9aa87812a4d55a3c0ed5d0ab66cdb36342f0':
  Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame

13 years agoam ba27cf75: Merge "Empty the clip rect when intersection is empty. Bug #3410035...
Romain Guy [Fri, 4 Feb 2011 09:06:46 +0000 (01:06 -0800)]
am ba27cf75: Merge "Empty the clip rect when intersection is empty. Bug #3410035" into honeycomb

* commit 'ba27cf756db9ac80608ed61a39a66e94951ecc61':
  Empty the clip rect when intersection is empty. Bug #3410035

13 years agoMerge "Empty the clip rect when intersection is empty. Bug #3410035" into honeycomb
Romain Guy [Fri, 4 Feb 2011 09:04:55 +0000 (01:04 -0800)]
Merge "Empty the clip rect when intersection is empty. Bug #3410035" into honeycomb

13 years agoam 1c0ab385: Merge "Open the location settings when clicking the GPS notification...
Romain Guy [Fri, 4 Feb 2011 08:00:37 +0000 (00:00 -0800)]
am 1c0ab385: Merge "Open the location settings when clicking the GPS notification." into honeycomb

* commit '1c0ab385b810b4f58f746940d28d1340b9e50e13':
  Open the location settings when clicking the GPS notification.

13 years agoMerge "Open the location settings when clicking the GPS notification." into honeycomb
Romain Guy [Fri, 4 Feb 2011 07:58:31 +0000 (23:58 -0800)]
Merge "Open the location settings when clicking the GPS notification." into honeycomb

13 years agoam e05c33fe: Merge "Modification for using Software decoder for thumbnail generation...
Dheeraj Sharma [Fri, 4 Feb 2011 07:42:04 +0000 (23:42 -0800)]
am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb

* commit 'e05c33fed3175972e0158a7c377763eb31160e27':
  Modification for using Software decoder for thumbnail generation in JNI

13 years agoMerge "Modification for using Software decoder for thumbnail generation in JNI" into...
Dheeraj Sharma [Fri, 4 Feb 2011 07:39:21 +0000 (23:39 -0800)]
Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb

13 years agoam 43703325: Merge "New default wallpaper" into honeycomb
Romain Guy [Fri, 4 Feb 2011 07:08:26 +0000 (23:08 -0800)]
am 43703325: Merge "New default wallpaper" into honeycomb

* commit '43703325d8a8b755b9891708006abe8700884538':
  New default wallpaper

13 years agoMerge "New default wallpaper" into honeycomb
Romain Guy [Fri, 4 Feb 2011 07:04:50 +0000 (23:04 -0800)]
Merge "New default wallpaper" into honeycomb

13 years agoam f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb
Mike Cleron [Fri, 4 Feb 2011 05:19:33 +0000 (21:19 -0800)]
am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb

* commit 'f6141980c84f64618f083297bc37cfae7e0fca84':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568

13 years agoMerge changes I46acd27a,I70b322e1 into honeycomb
Mike Cleron [Fri, 4 Feb 2011 05:17:09 +0000 (21:17 -0800)]
Merge changes I46acd27a,I70b322e1 into honeycomb

* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568

13 years agoam 4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb
Daniel Sandler [Fri, 4 Feb 2011 04:51:00 +0000 (20:51 -0800)]
am 4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb

* commit '4ad2547fe08bab430d7d9f9cc4b789410856c9c3':
  Ongoing notification for GPS use.

13 years agoMerge "Ongoing notification for GPS use." into honeycomb
Daniel Sandler [Fri, 4 Feb 2011 04:49:10 +0000 (20:49 -0800)]
Merge "Ongoing notification for GPS use." into honeycomb

13 years agoam b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs...
Scott Main [Fri, 4 Feb 2011 03:40:40 +0000 (19:40 -0800)]
am b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:

* commit 'b65b2df6e421d0fc8516e933f52763ff172760f3':
  cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:

13 years agoam e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
Eric Laurent [Fri, 4 Feb 2011 03:38:27 +0000 (19:38 -0800)]
am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb

* commit 'e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
  Issue 3371080: fix VolumePanel in mute state