Commit Graph

28833 Commits

Author SHA1 Message Date
Roman Nurik
7a3262b945 Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb 2011-02-07 17:22:43 -08:00
Dirk Dougherty
88902d0549 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Scott Main
d866ec27ec 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
2011-02-07 16:39:36 -08:00
Jason Sams
767844dc4b am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
  cleanup headers for SDK. bug 3421901
2011-02-07 14:17:45 -08:00
Jason Sams
23453f1ea5 Merge "cleanup headers for SDK. bug 3421901" into honeycomb 2011-02-07 13:59:45 -08:00
Xavier Ducrohet
abf4f58678 am 4dd2299d: LayoutLib: Update to latest API fix.
* commit '4dd2299d5766bf14479578772a0946c5399a0158':
  LayoutLib: Update to latest API fix.
2011-02-07 13:23:20 -08:00
Xavier Ducrohet
35081eaf6e 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.
2011-02-07 10:22:32 -08:00
Xavier Ducrohet
24719f459b Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb 2011-02-07 10:18:48 -08:00
Brad Fitzpatrick
711aec4534 am a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit 'a62bf8bb6b7a547802fb384b497e955940befa9c':
  Fix a race condition in NativeDaemonConnector
2011-02-07 10:09:29 -08:00
Brad Fitzpatrick
a9bc4da260 am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector
2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
16cd26a9cd am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector
2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
d9d203315c Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
Scott Main
c0ff8dfa39 am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
* commit 'b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
  docs: SearchView is iconified by default
2011-02-07 09:44:52 -08:00
Scott Main
168d944028 Merge "docs: SearchView is iconified by default" into honeycomb 2011-02-07 09:33:32 -08:00
Dianne Hackborn
6ebbed9706 am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
* commit '6b497a0446ebad24305d5e29d5fd5e65014b9778':
  Fixing possible race condition.
2011-02-07 08:02:00 -08:00
Dianne Hackborn
b68bef3b70 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.
2011-02-07 07:51:34 -08:00
Dianne Hackborn
6de8529af6 am bb2e1ef8: Merge "Fixing possible race condition."
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.
2011-02-07 07:33:38 -08:00
Xavier Ducrohet
9459a83815 am 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
* commit '83d72da7f69f71fd20bd11fc4f98166532136248':
  LayoutLib: improved rendering for system/title/action bars.
2011-02-06 15:15:51 -08:00
Xavier Ducrohet
d9fc6fc48f Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb 2011-02-06 15:13:09 -08:00
Robert Ly
5281e26627 am cfc048a3: set targetsdk=11 on renderscript misc samples project
* commit 'cfc048a3f912695f7a251a2266aef59ac4d2d124':
  set targetsdk=11 on renderscript misc samples project
2011-02-06 14:24:56 -08:00
Dianne Hackborn
8fb929bcb1 Merge "Fixing possible race condition." 2011-02-06 09:06:35 -08:00
Robert Ly
10c9fdf742 am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
* commit '5cf98da85c1698cacbeed8d4883373d0e0774fd8':
  Fixing renderscript samples to properly declare targetSDK
2011-02-06 00:55:01 -08:00
Robert Ly
b3eafa10b9 Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb 2011-02-06 00:51:40 -08:00
Xavier Ducrohet
c9897b9993 am 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
* commit '35064e5e3a04bda6211166630ccd49d522a8bd92':
  LayoutLib: add implementation of Bridge.renderDrawable()
2011-02-04 19:33:27 -08:00
Xavier Ducrohet
b9b5a4682e Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb 2011-02-04 19:31:38 -08:00
Paul Eastham
4a48cb1341 am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
* commit 'be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
  Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-04 19:23:10 -08:00
Dharmaray Kundargi
7c3b73ffe1 am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
  Fix issue 3426489 Overlay background changed when exported
2011-02-04 19:11:55 -08:00
Dharmaray Kundargi
f4020e176b Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb 2011-02-04 19:09:20 -08:00
Xavier Ducrohet
49ef29bf12 am b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.
* commit 'b0d34f9c99cbd43e8238c5952b19d032f02dd168':
  LayoutLib: split RenderSession's base method into RenderAction.
2011-02-04 18:27:30 -08:00
Xavier Ducrohet
6d98f6e1eb am 1126422e: LayoutLib: update to the new API.
* commit '1126422ee1f532d8582a4e3b56dbfe505c15e775':
  LayoutLib: update to the new API.
2011-02-04 18:05:55 -08:00
Dharmaray Kundargi
b2f0646702 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
2011-02-04 17:03:47 -08:00
Xavier Ducrohet
381b06b04a am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
* commit '3944b784e980b5e2cad69b2c8eb5dbc7c1fafc4a':
  LayoutLib: Replace custom BitmapFactory by a simpler delegate
2011-02-04 17:03:43 -08:00
Dharmaray Kundargi
2f1ea7b872 Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 2011-02-04 17:01:51 -08:00
Xavier Ducrohet
2281bf16fd Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb 2011-02-04 17:01:11 -08:00
Danny Fernandes
6257fe9ca0 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
2011-02-04 16:54:17 -08:00
Danny Fernandes
d97471d592 Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 2011-02-04 16:52:10 -08:00
Eric Laurent
2202c79757 am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection
2011-02-04 16:33:43 -08:00
Eric Laurent
7d56f501e9 Merge "Issue 3395734: fix media server restart detection" into honeycomb 2011-02-04 16:30:03 -08:00
Kenny Root
170dc57817 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.
2011-02-04 16:16:19 -08:00
Jean-Michel Trivi
65d8417d07 am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
* commit 'c6a5dfd81384e3937fb7773a206876d5ee8d48ff':
  Fix bug 3425610 Reduce lock / unlock sound level
2011-02-04 16:12:19 -08:00
Kenny Root
4cb99b4ab6 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:12:14 -08:00
Scott Main
7411336003 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
2011-02-04 16:10:01 -08:00
Jean-Michel Trivi
533b70c6db Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb 2011-02-04 16:06:45 -08:00
Kenny Root
78bee4871f am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:01:13 -08:00
Gilles Debunne
7c1ca4958b 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.
2011-02-04 15:54:19 -08:00
Gilles Debunne
5e10f21c60 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.
2011-02-04 15:53:44 -08:00
Gilles Debunne
99fa5c8459 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.
2011-02-04 15:53:37 -08:00
Gilles Debunne
3716ff2ddd 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.
2011-02-04 15:50:15 -08:00
Gilles Debunne
973a0c5d67 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.
2011-02-04 15:50:12 -08:00
Gilles Debunne
86411d75b2 am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00