Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,859 Commits 3 Branches 0 Tags
fa67d647d4e4d05032bec5344abdb680ee59fa20
Commit Graph

164 Commits

Author SHA1 Message Date
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
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
a35f65692d Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery 
Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
 2011-02-07 12:14:31 -08:00
Scott Main
6a7ca8f807 am 51768f4b: am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 
* commit '51768f4be3b8cf51ccbcd2c839e0a6ac98b73e99':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
 2011-02-03 16:04:34 -08:00
Scott Main
51768f4be3 am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 
* commit '779f7410b35267fafb725061d76fc684cd77f26b':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
 2011-02-03 15:56:02 -08:00
Scott Main
00a600e845 cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 
update dashboard

Change-Id: Iea5d441e417fc1a407c623ec2faf0cff90059592
 2011-02-03 15:22:54 -08:00
Scott Main
45c66a0e1c am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread 
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
 2011-02-02 16:44:55 -08:00
Scott Main
cbbdefcb71 wholesale manual merge of docs from gingerbread-docs to gingerbread 
includes misc changes that occured for preview sdk and shortly after
plus misc older stuff that got missed

Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
 2011-02-02 16:09:45 -08:00
Robert Ly
50241d5c27 Doc change: adding missing nfc demo png 
Change-Id: Id96b13f4d075cec48dbc528c8396d1c2f6ed50d9
 2011-01-19 22:52:18 -08:00
Robert Ly
3f9b6445cb Doc change: adding missing samples 
Change-Id: Id5f63a02b80f88b5cb0c4db18322554944b944c9
 2011-01-19 19:57:37 -08:00
Alexander Lucas
d84725401d Added Honeycomb-Gallery to docs. 
Change-Id: I3879ee553f761113b30f8ad82c0a226d0823dd2c
 2011-01-19 18:31:44 -08:00
Robert Ly
67c2d979e3 Doc change: fixing links set 3 
Change-Id: Id4123a2f0685887417d0b17a6fa81368aa756b6e
 2011-01-07 18:57:06 -08:00
Robert Ly
c74a69a89a Doc Change: Fixing broken links and miscellaneous text revisions to support link fixing 
Change-Id: I192595a3c7af520bf8598e80ae25d0dea289fcbd
 2011-01-07 18:54:44 -08:00
Scott Main
60c4e039d7 cherrypick Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021 
docs: catchup honeycomb to gingerbread-docs with misc changes

Change-Id: Ia192e253a1b0aca026e1809b4e68011975c1ad8c
 2011-01-07 16:40:11 -08:00
Scott Main
ac8d79266b am 9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes 
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
  docs: catchup gingerbread to gingerbread-docs with misc changes
 2011-01-07 15:32:04 -08:00
Scott Main
9b447d122a docs: catchup gingerbread to gingerbread-docs with misc changes 
Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021
 2011-01-07 14:55:59 -08:00
Scott Main
e6320beff7 cherrypick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f 
docs: update dashboard

Change-Id: Ifb21e6277ca71f717e4d91fca1ec4a49a810a7dc
 2011-01-07 13:37:04 -08:00
Scott Main
246a01b1de am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard 
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
 2011-01-07 13:36:58 -08:00
Scott Main
3d0f0108f9 cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f 
docs: update dashboard

Change-Id: I2b91243b28cc831348d29fcf11e23f5018838396
 2011-01-07 13:31:28 -08:00
Brad Fitzpatrick
70588bf864 resolved conflicts for merge of 3a2c6bf0 to master 
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
 2011-01-05 14:04:06 -08:00
Brad Fitzpatrick
3a2c6bf0fc am 69ea4e15: Documentation fixes found over vacation hacking. 
* commit '69ea4e15e52c456537575d21443ac1efdb03a902':
  Documentation fixes found over vacation hacking.
 2011-01-05 13:52:53 -08:00
Brad Fitzpatrick
69ea4e15e5 Documentation fixes found over vacation hacking. 
Change-Id: I28900026465d66d950cf4f05f0c202b46c3c2d43
 2011-01-05 13:07:34 -08:00
Scott Main
61aeb2b721 am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup 
* commit 'b094b0c4a4309f48d9da7253de78ebda20a8a81c':
  modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
 2010-12-15 14:11:08 -08:00
Scott Main
b094b0c4a4 modifications to webinars: 
add the ability to add an upcoming webinar event to Google Calendar;
add some introduction text;
adjust some markup

Change-Id: I4d18a183b1520e79a45e114dc49e725fe27a43c9
 2010-12-15 14:02:59 -08:00
Scott Main
d99e0593a4 am 14e6325d: am 1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail 
* commit '14e6325da97289735c659ebf0de0e99ba83796e3':
  cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
 2010-12-14 17:09:29 -08:00
Scott Main
14e6325da9 am 1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail 
* commit '1bcfd85cc0f274b250b68a122f964b276ef4be4a':
  cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
 2010-12-14 17:06:58 -08:00
Scott Main
1bcfd85cc0 cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd 
docs: fix syntax error; enlarge screenshot thumbnail

Change-Id: I0fe043969a9754237c6bce6999598033c510d8f3
 2010-12-14 17:03:53 -08:00
Scott Main
dc76b1c3ff am a925b6a6: am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit 'a925b6a64c8137804547d5cfcd97415392d667b1':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:46:56 -08:00
Scott Main
a925b6a64c am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit '93d204ed98019322e434b714c7c0a619d69f24f5':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:43:28 -08:00
Scott Main
93d204ed98 cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df 
docs: fix misc broken links; update some screenshots using windows
bug: 3258882

Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
 2010-12-14 16:39:22 -08:00
Scott Main
0b0eb1ac11 am 178d5005: am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit '178d500551c1d88a2e8ec9425d9cbfbb7d998113':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:26:32 -08:00
Scott Main
178d500551 am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit 'b94df620959de658990c1ed1263e2e1c42df7f6b':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:22:56 -08:00
Scott Main
b94df62095 cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: edit manifest samples to indicate <application> element is always last

Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
 2010-12-14 16:11:02 -08:00
Megha Joshi
87c03b58a9 am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread 
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
 2010-12-10 12:33:59 -08:00
Megha Joshi
7a1f15b149 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Megha Joshi
cc0c9daa91 Integrating webinar hosting with developer.android.com 
Change-Id: I320378560bbb09efade14f583dbcf2d66f34a9d8
 2010-12-09 11:42:12 -08:00
Scott Main
63635c6903 am 5f9d8ecd: am 83df6ead: am a45d6937: docs: dashboard update 
* commit '5f9d8ecd2040ab3958ba3251fa12f3505dc85c34':
  docs: dashboard update
 2010-12-01 14:02:26 -08:00
Scott Main
5f9d8ecd20 am 83df6ead: am a45d6937: docs: dashboard update 
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
  docs: dashboard update
 2010-12-01 13:59:08 -08:00
Scott Main
83df6ead8d am a45d6937: docs: dashboard update 
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
  docs: dashboard update
 2010-12-01 12:59:42 -08:00
Scott Main
a45d693757 docs: dashboard update 
Change-Id: Ia96a015dea41e32d1d2c892dddfd9a4fed5d49d0
 2010-12-01 12:48:39 -08:00
Scott Main
d4fbcfa220 am 9e3d14c4: am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '9e3d14c4aad7e41406f633734973b191c21b5c5c':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 16:23:04 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties 
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
 2010-11-24 11:24:33 -08:00
Scott Main
183ecbc229 docs: de-'new' samples and tutorials 
Change-Id: I49cbabcb1f3a915259588bc98b05a9d702f5eb2d
 2010-11-19 10:20:45 -08:00
Megha Joshi
7e05971692 am 48c698fc: Adding NFC sample resources (DO NOT MERGE) 
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
 2010-11-12 18:46:38 -08:00
Megha Joshi
48c698fc14 Adding NFC sample resources (DO NOT MERGE) 
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
 2010-11-12 18:35:49 -08:00
Scott Main
d4b5d85e2c am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread 
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
 2010-11-10 14:55:48 -08:00
Scott Main
77f5c9542e resolved conflicts for merge of 5a726729 to gingerbread 
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
 2010-11-10 14:46:44 -08:00