Commit Graph

28602 Commits

Author SHA1 Message Date
Jason Sams
5ec57f6012 am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 14:57:35 -08:00
Dirk Dougherty
2b41054871 am 50b7d70f: Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb
* commit '50b7d70fb425daf6b2ead747df6634040d1bbf1b':
  Cherrypick from gb: Doc change: Add diff report for api 10.
2011-02-08 14:57:25 -08:00
Xavier Ducrohet
99743c3db3 am dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb
* commit 'dc3fc3dc2717461113a2963c224cb190457599d8':
  LayoutLib: fix the background of title/action bars.
2011-02-08 14:57:19 -08:00
Jason Sams
a7febe0f05 Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb 2011-02-08 12:07:49 -08:00
Dirk Dougherty
daffe8e563 Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb 2011-02-08 11:04:41 -08:00
Xavier Ducrohet
e3c117f1b3 Merge "LayoutLib: fix the background of title/action bars." into honeycomb 2011-02-08 11:03:43 -08:00
Eric Fischer
3f15d63b99 am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:40:47 -08:00
Eric Fischer
abea3b664c Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-08 10:34:23 -08:00
Scott Main
f2687a5f80 am 7d9d8efe: cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
* commit '7d9d8efebab9bda05cdb7733374723e1e3787d7c':
  cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
2011-02-08 10:32:12 -08:00
Scott Main
392da690c3 am 96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
* commit '967648121d3857b808941848203dfa44229781d7':
  cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
2011-02-08 10:32:08 -08:00
Katie McCormick
f2f78fe8cc am 6b311196: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '6b31119612a1b357c3675fce0111a1c69a15c2d2':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-08 10:32:05 -08:00
Scott Main
b40c9f236a am 91e1ae55: cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
* commit '91e1ae5510c26bc6a7265e0d62ab7bbf83a6251d':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
2011-02-08 10:32:01 -08:00
Scott Main
e66f02ca3d am f7a8c0f7: cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a fix broken links, update the dev guide intro, and update sitemap file
* commit 'f7a8c0f78796ebbeb57381b145c0648d7bc6b84a':
  cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a fix broken links, update the dev guide intro, and update sitemap file
2011-02-08 10:31:57 -08:00
Scott Main
22ad6da8f1 am c2ab8e41: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
* commit 'c2ab8e41d081395b5b7577ae60ab73e94d7c37e4':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
2011-02-08 10:31:51 -08:00
Scott Main
bd669c1712 resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp
Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37
2011-02-08 10:26:11 -08:00
Scott Main
d1fd0920d0 am b68162a9: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit 'b68162a9d6212598a529d63079db15bea6da654c':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-08 09:42:13 -08:00
Scott Main
cc74081f60 am 4fe9288c: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '4fe9288c2575e1d9eb300a5da950d6bb6f296ffe':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-08 09:38:02 -08:00
Scott Main
f452cfb051 resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
2011-02-07 21:17:09 -08:00
Dianne Hackborn
6551036e84 am ae91b5ac: Update theme documentation a bit.
* commit 'ae91b5ac7d18e4e461fa42709f51da73d29c403a':
  Update theme documentation a bit.
2011-02-07 19:09:33 -08:00
Roman Nurik
767e66e1b1 am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
* commit '8635908da1a9f0b3e7ba9bd11ce7104b38f76756':
  Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
2011-02-07 17:24:33 -08:00
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
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