OSDN Git Service
Scott Main [Thu, 10 Feb 2011 21:50:44 +0000 (13:50 -0800)]
am
129c7372: am
3c01a139: rename SIP doc title
* commit '
129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
Scott Main [Thu, 10 Feb 2011 21:47:32 +0000 (13:47 -0800)]
resolved conflicts for merge of
42f18194 to honeycomb-plus-aosp
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
Katie McCormick [Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)]
resolved conflicts for merge of
690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
Alex Sakhartchouk [Wed, 9 Feb 2011 23:23:54 +0000 (15:23 -0800)]
am
699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '
699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
DO NOT MERGE Removing an activity that shouldn't go into samples
Dirk Dougherty [Wed, 9 Feb 2011 23:21:49 +0000 (15:21 -0800)]
am
0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
* commit '
0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
Doc change: add diff report for API 11
Alex Sakhartchouk [Wed, 9 Feb 2011 23:20:21 +0000 (15:20 -0800)]
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 23:19:08 +0000 (15:19 -0800)]
Merge "Doc change: add diff report for API 11" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 22:20:06 +0000 (14:20 -0800)]
am
fefa95a9: Doc change: Add version notes for Android 2.3.3.
* commit '
fefa95a9c828d2b67227894b7ee3979504c0f52a':
Doc change: Add version notes for Android 2.3.3.
Dirk Dougherty [Tue, 8 Feb 2011 01:32:11 +0000 (17:32 -0800)]
Doc change: Add version notes for Android 2.3.3.
Mathias Agopian [Wed, 9 Feb 2011 21:22:46 +0000 (13:22 -0800)]
am
cc24170d: Merge "fix [
3374821] Cannot take screenshot of HC preview" into honeycomb
* commit '
cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [
3374821] Cannot take screenshot of HC preview
Mathias Agopian [Wed, 9 Feb 2011 21:18:53 +0000 (13:18 -0800)]
Merge "fix [
3374821] Cannot take screenshot of HC preview" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 20:19:54 +0000 (12:19 -0800)]
am
be04bfd0: am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
be04bfd09914bbabf715959170c32030072b65f4':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 20:19:46 +0000 (12:19 -0800)]
am
63bd55c7: am
cdfe8999: Fix for multiple merge problem.
* commit '
63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
Eric Fischer [Wed, 9 Feb 2011 18:47:47 +0000 (10:47 -0800)]
am
ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:11:18 +0000 (10:11 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Alex Sakhartchouk [Wed, 9 Feb 2011 16:53:32 +0000 (08:53 -0800)]
DO NOT MERGE
Removing an activity that shouldn't go into samples
Change-Id: I00025770d926af2dbf399d28f8e855568e260b8b
Mathias Agopian [Wed, 9 Feb 2011 04:43:00 +0000 (20:43 -0800)]
fix [
3374821] Cannot take screenshot of HC preview
the screencap tool will now fallback to /dev/graphics/fb0 is the
screenshot API fails.
Change-Id: I3f593847c72f4ca5429d4f64ca22bd5436dd2051
Gilles Debunne [Wed, 9 Feb 2011 04:38:59 +0000 (20:38 -0800)]
Merge "resolved conflicts for merge of
e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Gilles Debunne [Wed, 9 Feb 2011 04:23:27 +0000 (20:23 -0800)]
resolved conflicts for merge of
e04c1496 to honeycomb-plus-aosp
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
Scott Main [Wed, 9 Feb 2011 02:48:53 +0000 (18:48 -0800)]
am
3f41d8f5: docs: fix a couple titles
* commit '
3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
docs: fix a couple titles
Scott Main [Wed, 9 Feb 2011 02:46:23 +0000 (18:46 -0800)]
docs: fix a couple titles
Change-Id: I1c2d6c420f814e1ddff5f661214cbbd11f3ca6dd
Scott Main [Wed, 9 Feb 2011 02:39:24 +0000 (18:39 -0800)]
am
f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit '
f002b6752562a442c934bdf7c04cb0fedc24d442':
docs: shorten and revise some titles in the Developing docs and resolve respective links
Scott Main [Wed, 9 Feb 2011 02:36:04 +0000 (18:36 -0800)]
Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
Eric Fischer [Wed, 9 Feb 2011 02:00:38 +0000 (18:00 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
Scott Main [Wed, 9 Feb 2011 01:32:14 +0000 (17:32 -0800)]
am
3c01a139: rename SIP doc title
* commit '
3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
Scott Main [Wed, 9 Feb 2011 01:32:06 +0000 (17:32 -0800)]
am
c442bc60: docs: move the SIP guide into guide/network/
* commit '
c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
Katie McCormick [Wed, 9 Feb 2011 01:31:59 +0000 (17:31 -0800)]
am
7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '
7134520b2635474c5e7f4902c26e12d0ffcc9c64':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
Dirk Dougherty [Wed, 9 Feb 2011 01:31:54 +0000 (17:31 -0800)]
am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)]
am
cdfe8999: Fix for multiple merge problem.
* commit '
cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
Joe Malin [Wed, 9 Feb 2011 00:58:22 +0000 (16:58 -0800)]
am
7777fb04: Merge "DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc" into honeycomb
* commit '
7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc
Joe Malin [Wed, 9 Feb 2011 00:55:53 +0000 (16:55 -0800)]
Merge "DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc" into honeycomb
Gilles Debunne [Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)]
resolved conflicts for merge of
c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
Scott Main [Tue, 8 Feb 2011 23:04:42 +0000 (15:04 -0800)]
docs: shorten and revise some titles in the Developing docs
and resolve respective links
Change-Id: Ic78e859eaad99fc391857676a6aff63a655e72ca
Scott Main [Tue, 8 Feb 2011 22:57:50 +0000 (14:57 -0800)]
am
b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete
* commit '
b70afd342b658d23518e0fa69aff9e45ec01e222':
docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
Scott Main [Tue, 8 Feb 2011 22:57:45 +0000 (14:57 -0800)]
am
b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
* commit '
b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
Jason Sams [Tue, 8 Feb 2011 22:57:35 +0000 (14:57 -0800)]
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.
Dirk Dougherty [Tue, 8 Feb 2011 22:57:25 +0000 (14:57 -0800)]
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.
Xavier Ducrohet [Tue, 8 Feb 2011 22:57:19 +0000 (14:57 -0800)]
am
dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb
* commit '
dc3fc3dc2717461113a2963c224cb190457599d8':
LayoutLib: fix the background of title/action bars.
Scott Main [Tue, 8 Feb 2011 22:05:54 +0000 (14:05 -0800)]
docs: remove and correct parent links for fundamental docs
and hide the "beginner's path" because it's not complete
Change-Id: I2f2a201a6571da6f660eb78f6ece94e47a5cddd1
Scott Main [Tue, 8 Feb 2011 21:34:51 +0000 (13:34 -0800)]
Merge "docs: fix links to revised fundamentals documents" into honeycomb
Jason Sams [Tue, 8 Feb 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Fix bug
3421901 remove 2 functions from public headers in the SDK." into honeycomb
Dirk Dougherty [Tue, 8 Feb 2011 19:42:32 +0000 (11:42 -0800)]
Doc change: add diff report for API 11
Change-Id: I4cd673d1316e6f7b81ec56510029b738cd12a295
Scott Main [Tue, 8 Feb 2011 19:25:01 +0000 (11:25 -0800)]
docs: fix links to revised fundamentals documents
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
Dirk Dougherty [Tue, 8 Feb 2011 19:04:41 +0000 (11:04 -0800)]
Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb
Xavier Ducrohet [Tue, 8 Feb 2011 19:03:43 +0000 (11:03 -0800)]
Merge "LayoutLib: fix the background of title/action bars." into honeycomb
Dirk Dougherty [Thu, 3 Feb 2011 01:32:00 +0000 (17:32 -0800)]
Cherrypick from gb: Doc change: Add diff report for api 10.
Eric Fischer [Tue, 8 Feb 2011 18:40:47 +0000 (10:40 -0800)]
am
c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
c7bece13495949db1736263a7cf5cf67c6165c51':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:34:23 +0000 (10:34 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Scott Main [Tue, 8 Feb 2011 18:32:12 +0000 (10:32 -0800)]
am
7d9d8efe: cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
* commit '
7d9d8efebab9bda05cdb7733374723e1e3787d7c':
cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
Scott Main [Tue, 8 Feb 2011 18:32:08 +0000 (10:32 -0800)]
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/
Katie McCormick [Tue, 8 Feb 2011 18:32:05 +0000 (10:32 -0800)]
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
Scott Main [Tue, 8 Feb 2011 18:32:01 +0000 (10:32 -0800)]
am
91e1ae55: cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
* commit '
91e1ae5510c26bc6a7265e0d62ab7bbf83a6251d':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
Scott Main [Tue, 8 Feb 2011 18:31:57 +0000 (10:31 -0800)]
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
Scott Main [Tue, 8 Feb 2011 18:31:51 +0000 (10:31 -0800)]
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
Scott Main [Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)]
resolved conflicts for merge of
b7bad4f2 to honeycomb-plus-aosp
Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37
Scott Main [Tue, 8 Feb 2011 17:42:13 +0000 (09:42 -0800)]
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
Scott Main [Tue, 8 Feb 2011 17:37:47 +0000 (09:37 -0800)]
cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
rename SIP doc title
Change-Id: If6f8e65bee742ab8de3925562484d4cb976f8bca
Scott Main [Tue, 8 Feb 2011 17:38:02 +0000 (09:38 -0800)]
am
4fe9288c: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '
4fe9288c2575e1d9eb300a5da950d6bb6f296ffe':
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
Scott Main [Tue, 8 Feb 2011 17:37:47 +0000 (09:37 -0800)]
rename SIP doc title
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
Scott Main [Tue, 8 Feb 2011 02:35:49 +0000 (18:35 -0800)]
cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
docs: move the SIP guide into guide/network/
Change-Id: I3aaf9e9ae6c63bfd5d65518dd45c86bda31965ca
Katie McCormick [Sat, 5 Feb 2011 01:41:07 +0000 (17:41 -0800)]
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API
Change-Id: If1b8af96927809847834d449d1e22c51d8cc5fc5
Scott Main [Thu, 3 Feb 2011 02:20:19 +0000 (18:20 -0800)]
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91
update dashboard
Change-Id: Ic31576014c39c52fded2eba9d26d2a95b870a657
Scott Main [Thu, 3 Feb 2011 01:43:24 +0000 (17:43 -0800)]
cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a
fix broken links, update the dev guide intro, and update sitemap file
Change-Id: I203f272654596ecf9eaf8ba7d8be85347f5f4dbe
Scott Main [Fri, 28 Jan 2011 17:34:27 +0000 (09:34 -0800)]
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
Bill Gruber [Wed, 2 Feb 2011 07:01:16 +0000 (23:01 -0800)]
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs
Change-Id: I80813b8f38840a572179e5d65309bccb7279bd15
Scott Main [Wed, 2 Feb 2011 19:24:56 +0000 (11:24 -0800)]
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
add notice about large screen devices and the "mobile" string in user agent
Change-Id: Ieff429675dc7edbdacc6662f645b71712b12b3ad
Scott Main [Wed, 2 Feb 2011 23:08:22 +0000 (15:08 -0800)]
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
fix market link on homepage
Change-Id: I84b73dfe8364ee1164c9fc43f9b263b5878d8927
Scott Main [Tue, 8 Feb 2011 05:17:09 +0000 (21:17 -0800)]
resolved conflicts for merge of
9bf45a00 to honeycomb-plus-aosp
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
Scott Main [Fri, 4 Feb 2011 02:46:45 +0000 (18:46 -0800)]
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
Xavier Ducrohet [Tue, 8 Feb 2011 04:33:44 +0000 (20:33 -0800)]
LayoutLib: fix the background of title/action bars.
The bars are supposed to sit on top of the window so
that if they are transparent (which is the default case
for the action bar), the window background shows through.
Fix this using a layout to represent the window content
(all but the system bar) in which the title/action bars
and the layout content sits. This layout receives the
windowBackground drawable.
Change-Id: I8072c5ff52f585fa32acb589d8526e1c13cbcd94
Dianne Hackborn [Tue, 8 Feb 2011 03:09:33 +0000 (19:09 -0800)]
am
ae91b5ac: Update theme documentation a bit.
* commit '
ae91b5ac7d18e4e461fa42709f51da73d29c403a':
Update theme documentation a bit.
Dianne Hackborn [Sun, 16 Jan 2011 22:25:57 +0000 (14:25 -0800)]
Update theme documentation a bit.
Change-Id: I3dbb2785973fe2618033a3956b99f1100a46b054
Scott Main [Tue, 8 Feb 2011 02:35:49 +0000 (18:35 -0800)]
docs: move the SIP guide into guide/network/
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
Katie McCormick [Sat, 5 Feb 2011 01:41:07 +0000 (17:41 -0800)]
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API
Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
Roman Nurik [Tue, 8 Feb 2011 01:24:33 +0000 (17:24 -0800)]
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
Roman Nurik [Tue, 8 Feb 2011 01:22:43 +0000 (17:22 -0800)]
Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Eric Fischer [Tue, 8 Feb 2011 01:19:23 +0000 (17:19 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Icb56518620be62481ed0d152f7eb9ab44d6f759d
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
Scott Main [Tue, 8 Feb 2011 00:35:46 +0000 (16:35 -0800)]
enable javadoc filtering for api level 11 and disable preview doc mode
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
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
Jason Sams [Mon, 7 Feb 2011 21:59:45 +0000 (13:59 -0800)]
Merge "cleanup headers for SDK. bug
3421901" into honeycomb
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.
Xavier Ducrohet [Mon, 7 Feb 2011 21:05:40 +0000 (13:05 -0800)]
LayoutLib: Update to latest API fix.
Change-Id: I5147010e4f16a5c2ea0b98709c42f7ecd9412ff6
Roman Nurik [Fri, 4 Feb 2011 22:28:22 +0000 (14:28 -0800)]
Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
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.
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
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
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
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
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"
anga [Tue, 1 Feb 2011 13:10:25 +0000 (14:10 +0100)]
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
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
Scott Main [Mon, 7 Feb 2011 17:33:32 +0000 (09:33 -0800)]
Merge "docs: SearchView is iconified by default" into honeycomb
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.
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.
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.
Xavier Ducrohet [Mon, 7 Feb 2011 05:05:21 +0000 (21:05 -0800)]
LayoutLib: Handle color state list in methods returning an int.
Change-Id: Ia35ea09b992a239873026c7ef1629a01dd2e6cec
Scott Main [Sun, 6 Feb 2011 23:51:47 +0000 (15:51 -0800)]
docs: SearchView is iconified by default
Change-Id: Iabe0fdc0b28847f0c401e3692932a73b7d595c88
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.
OSDN Git Service
