Eric Fischer
1e09ca2a1f
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
c7bece1349
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-08 10:34:23 -08:00
Scott Main
fd5c86cd1d
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
2d258298e2
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
e056d2ad42
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
61e5396616
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
21111c2cdd
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
f602872d7a
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
c65c5fdec1
resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp
...
Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37
2011-02-08 10:26:11 -08:00
Scott Main
be3770f3f9
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
7d9d8efeba
cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
...
rename SIP doc title
Change-Id: If6f8e65bee742ab8de3925562484d4cb976f8bca
2011-02-08 09:39:30 -08:00
Scott Main
68411a8d23
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
967648121d
cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
...
docs: move the SIP guide into guide/network/
Change-Id: I3aaf9e9ae6c63bfd5d65518dd45c86bda31965ca
2011-02-08 09:35:02 -08:00
Katie McCormick
6b31119612
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
...
Doc change: Adding new docs for SIP API
Change-Id: If1b8af96927809847834d449d1e22c51d8cc5fc5
2011-02-08 09:26:13 -08:00
Scott Main
91e1ae5510
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91
...
update dashboard
Change-Id: Ic31576014c39c52fded2eba9d26d2a95b870a657
2011-02-08 09:24:49 -08:00
Scott Main
f7a8c0f787
cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a
...
fix broken links, update the dev guide intro, and update sitemap file
Change-Id: I203f272654596ecf9eaf8ba7d8be85347f5f4dbe
2011-02-08 09:24:03 -08:00
Scott Main
c2ab8e41d0
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
...
Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
update OEM driver list with new fujitsu and kyocera
Change-Id: I8ea9d1056a3dd7ed307cfee7a698e547536a2821
2011-02-08 09:22:16 -08:00
Bill Gruber
b7bad4f22a
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
...
Initial posting of in-app billing docs
Change-Id: I80813b8f38840a572179e5d65309bccb7279bd15
2011-02-08 09:18:42 -08:00
Scott Main
b68162a9d6
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
...
add notice about large screen devices and the "mobile" string in user agent
Change-Id: Ieff429675dc7edbdacc6662f645b71712b12b3ad
2011-02-08 09:17:23 -08:00
Scott Main
4fe9288c25
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
...
fix market link on homepage
Change-Id: I84b73dfe8364ee1164c9fc43f9b263b5878d8927
2011-02-08 09:15:48 -08:00
Scott Main
b1ddc7ec5c
resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp
...
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
2011-02-07 21:17:09 -08:00
Scott Main
9bf45a0075
Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide
...
Also move the app fundamentals document back to fundamentals.jd
TODO: resolve links in the javadocs
Change-Id: Ia3c81a83bf7fe75f7942fd41bfb1d626ee72d5d9
2011-02-07 21:03:04 -08:00
Dianne Hackborn
5592b0d8fe
am ae91b5ac: Update theme documentation a bit.
...
* commit 'ae91b5ac7d18e4e461fa42709f51da73d29c403a':
Update theme documentation a bit.
2011-02-07 19:09:33 -08:00
Dianne Hackborn
ae91b5ac7d
Update theme documentation a bit.
...
Change-Id: I3dbb2785973fe2618033a3956b99f1100a46b054
2011-02-07 18:45:20 -08:00
Roman Nurik
b8d74fd962
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
8635908da1
Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
2011-02-07 17:22:43 -08:00
Eric Fischer
7dd2196e8b
Import revised translations. DO NOT MERGE
...
Change-Id: Icb56518620be62481ed0d152f7eb9ab44d6f759d
2011-02-07 17:19:23 -08:00
Scott Main
236e9db9f3
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
Scott Main
62e9701099
enable javadoc filtering for api level 11 and disable preview doc mode
...
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
2011-02-07 16:35:46 -08:00
Jason Sams
5510d1722b
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
f8cbf7297b
Merge "cleanup headers for SDK. bug 3421901" into honeycomb
2011-02-07 13:59:45 -08:00
Xavier Ducrohet
5ac5388359
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
4dd2299d57
LayoutLib: Update to latest API fix.
...
Change-Id: I5147010e4f16a5c2ea0b98709c42f7ecd9412ff6
2011-02-07 13:05:40 -08:00
Roman Nurik
a35f65692d
Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
...
Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
2011-02-07 12:14:31 -08:00
Xavier Ducrohet
80656fb71e
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
62a99c0b3b
Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
2011-02-07 10:18:48 -08:00
Brad Fitzpatrick
bb756a9090
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
a62bf8bb6b
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
b901c9abff
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
9204644d9e
Merge "Fix a race condition in NativeDaemonConnector"
2011-02-07 09:55:34 -08:00
anga
030bc88b4c
Fix a race condition in NativeDaemonConnector
...
Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.
MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.
Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9
2011-02-07 09:53:59 -08:00
Scott Main
602a891aea
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
b0f1cfffd9
Merge "docs: SearchView is iconified by default" into honeycomb
2011-02-07 09:33:32 -08:00
Dianne Hackborn
432ab6ac04
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
6b497a0446
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
4b7c1cacca
am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
2011-02-07 07:33:38 -08:00
Xavier Ducrohet
d96a7403cd
LayoutLib: Handle color state list in methods returning an int.
...
Change-Id: Ia35ea09b992a239873026c7ef1629a01dd2e6cec
2011-02-06 21:05:21 -08:00
Scott Main
cccdbe9acb
docs: SearchView is iconified by default
...
Change-Id: Iabe0fdc0b28847f0c401e3692932a73b7d595c88
2011-02-06 16:28:05 -08:00
Xavier Ducrohet
181e321262
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
83d72da7f6
Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
2011-02-06 15:13:09 -08:00