1075 Commits

Author	SHA1	Message	Date
Gilles Debunne	c09a6977ae	Fixes regarding densities in "Providing Resources" documentation page. ... The ratio between densities is not constant. The Exception for dpi qualifier in point 4 of the algorithm should be detailed. I understand that if my config is ldpi-trackball-v5 and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen. Cherry-picked from master CL 59188. Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c	2010-07-29 16:54:03 -07:00
Romain Guy	8fb007e6d9	am 0f0b7160: am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)" ... Merge commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30' * commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30': Fixed a documentation Bug (Issue 9236)	2010-07-29 14:36:22 -07:00
Romain Guy	0f0b71600b	am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)" ... Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp * commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5': Fixed a documentation Bug (Issue 9236)	2010-07-29 14:32:29 -07:00
Romain Guy	e53fe4a465	Merge "Fixed a documentation Bug (Issue 9236)"	2010-07-29 14:00:02 -07:00
Gilles Debunne	aa6d39218b	Merge "Fixes regarding densities in "Providing Resources" documentation page."	2010-07-28 18:38:56 -07:00
Gilles Debunne	3e0a3d5b48	Fixes regarding densities in "Providing Resources" documentation page. ... The ratio between densities is not constant. The Exception for dpi qualifier in point 4 of the algorithm should be detailed. I understand that if my config is ldpi-trackball-v5 and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen. Change-Id: Icf7494c23f7e3af7d3c6aab770d0ba3c1fea2ebf	2010-07-28 17:08:15 -07:00
Elliott Hughes	44860da2be	Be brief. ... Excise much of the non-Android blurb so we don't distract from our primary messages of "allocate less stuff" and "do less work". Change-Id: Ifc2c12bc953dbfbaf4078d4f7b77aa75d1d942d7	2010-07-28 16:50:16 -07:00
Scott Main	ffdfd992e5	am 4e235622: am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo ... Merge commit '4e235622bc37e54208b88a18251f3682495af41f' * commit '4e235622bc37e54208b88a18251f3682495af41f': fix markup error	2010-07-28 14:30:21 -07:00
Scott Main	4e235622bc	am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo ... Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp * commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13': fix markup error	2010-07-28 14:27:13 -07:00
Scott Main	b1bb7180ec	am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo ... Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread * commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a': fix markup error	2010-07-28 14:23:16 -07:00
Scott Main	8a52f3d683	fix markup error ... bug:2871538 Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f	2010-07-28 14:15:26 -07:00
Dirk Dougherty	84aa506685	am 68344ba8: am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. ... Merge commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f' * commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f': Doc change: Add docs for licensing service.	2010-07-26 20:06:28 -07:00
Dirk Dougherty	68344ba8a8	am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. ... Merge commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp * commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1': Doc change: Add docs for licensing service.	2010-07-26 20:04:28 -07:00
Dirk Dougherty	2b989e1f7d	am 0ac8ac30: Doc change: Add docs for licensing service. ... Merge commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread * commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19': Doc change: Add docs for licensing service.	2010-07-26 20:01:12 -07:00
Dirk Dougherty	0ac8ac301d	Doc change: Add docs for licensing service. ... Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d	2010-07-26 11:07:24 -07:00
Dirk Dougherty	d116e3ee82	Doc change: Add nexus one to dev phones. ... Change-Id: I45d0207bff857db7355da6b7736d6a6a729a878a	2010-07-23 13:26:24 -07:00
Scott Main	25f79d9972	am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables ... Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938' * commit '3b3e368c73f4224b055635e6e79f57cc702d8938': docs: add information about using color resources as drawables	2010-07-20 16:54:52 -07:00
Scott Main	3b3e368c73	am 60a20061: am 2316d626: docs: add information about using color resources as drawables ... Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp * commit '60a200617791cf4dd3660c514ac6bf17dfcb85de': docs: add information about using color resources as drawables	2010-07-20 14:01:33 -07:00
Scott Main	60a2006177	am 2316d626: docs: add information about using color resources as drawables ... Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread * commit '2316d6260862230af10d8ca3ff446ad3f560f712': docs: add information about using color resources as drawables	2010-07-20 13:53:55 -07:00
Scott Main	2316d62608	docs: add information about using color resources as drawables ... Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0	2010-07-20 10:28:09 -07:00
Scott Main	9abf2067f0	am 3dfa6ec5: am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo ... Merge commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9' * commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9': docs: add troubleshooting to eclipse guide about restarting adb	2010-07-19 14:57:29 -07:00
Scott Main	3dfa6ec5f3	am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo ... Merge commit '945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp * commit '945ac54da56f79c8407c0111d6ded25afcc159fc': docs: add troubleshooting to eclipse guide about restarting adb	2010-07-19 14:52:35 -07:00
Scott Main	945ac54da5	am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo ... Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread * commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d': docs: add troubleshooting to eclipse guide about restarting adb	2010-07-19 14:50:32 -07:00
Scott Main	955f1551b6	am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo ... Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633' * commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633': docs: editorial revisions to Search guide	2010-07-16 16:25:03 -07:00
Scott Main	7e48908463	docs: add troubleshooting to eclipse guide about restarting adb ... Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce	2010-07-16 15:04:22 -07:00
Scott Main	aba4bf19fb	am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo ... Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp * commit 'e068b46408f3ff390b47dc78ccf10fab76883051': docs: editorial revisions to Search guide	2010-07-16 15:02:30 -07:00
Scott Main	e068b46408	am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo ... Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread * commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1': docs: editorial revisions to Search guide	2010-07-16 14:59:48 -07:00
Scott Main	2a8dd4e46f	Merge "docs: editorial revisions to Search guide" into froyo	2010-07-16 14:52:03 -07:00
Scott Main	5e892d8183	docs: editorial revisions to Search guide ... Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211	2010-07-16 14:33:14 -07:00
Scott Main	eb5d86f9d9	am 7ccdfbee: am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo ... Merge commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43' * commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43': docs: update notepad tutorial to change EditNote activity title and update codelab zip	2010-07-15 23:27:40 -07:00
Scott Main	5d66290d78	am c9659424: am b8f4a84a: am 80fa5c86: docs: dashboard update ... Merge commit 'c9659424cfa971f202f1bee44f7acb6873b0954b' * commit 'c9659424cfa971f202f1bee44f7acb6873b0954b': docs: dashboard update	2010-07-15 23:27:36 -07:00
Katie McCormick	ac29089ffc	am 3f50035c: am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo ... Merge commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e' * commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e': Doc change: Update AVD create instructions.	2010-07-15 23:24:16 -07:00
Scott Main	7ccdfbee63	am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo ... Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp * commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f': docs: update notepad tutorial to change EditNote activity title and update codelab zip	2010-07-15 18:19:27 -07:00
Scott Main	4cb8293bb3	am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo ... Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread * commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c': docs: update notepad tutorial to change EditNote activity title and update codelab zip	2010-07-15 18:17:16 -07:00
Scott Main	d59f1dea17	Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo	2010-07-15 18:14:16 -07:00
Scott Main	c9659424cf	am b8f4a84a: am 80fa5c86: docs: dashboard update ... Merge commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp * commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e': docs: dashboard update	2010-07-15 18:14:07 -07:00
Scott Main	b8f4a84ab9	am 80fa5c86: docs: dashboard update ... Merge commit '80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread * commit '80fa5c866eaf323c39bef4159a351950f0ea527a': docs: dashboard update	2010-07-15 18:10:39 -07:00
Scott Main	80fa5c866e	docs: dashboard update ... Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c	2010-07-15 17:56:59 -07:00
Katie McCormick	3f50035c3d	am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo ... Merge commit 'a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp * commit 'a6a134d42df5fde04f2cc379175c756aff333cb3': Doc change: Update AVD create instructions.	2010-07-15 17:32:04 -07:00
Katie McCormick	a6a134d42d	am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo ... Merge commit '28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread * commit '28da8e5e4aefd919064e3c33a311edf1af5a958e': Doc change: Update AVD create instructions.	2010-07-15 17:28:57 -07:00
Katie McCormick	28da8e5e4a	Merge "Doc change: Update AVD create instructions." into froyo	2010-07-15 17:25:10 -07:00
Katie McCormick	c46efe6696	Doc change: Update AVD create instructions. ... Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d	2010-07-15 16:20:41 -07:00
Scott Main	82e2b4cb51	am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo ... Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf' * commit '4fd416880e53c172bac4a51b2eafea699b58badf': docs: lots of additions to the resources docs	2010-07-15 11:54:15 -07:00
Scott Main	4fd416880e	am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo ... Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp * commit '5352d2378d2f92ebe0657e4caedb4498492fc404': docs: lots of additions to the resources docs	2010-07-15 11:23:08 -07:00
Scott Main	5352d2378d	am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo ... Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread * commit '38137d7a27b037611c70a9d900aa53b4c15563bf': docs: lots of additions to the resources docs	2010-07-15 11:20:32 -07:00
Scott Main	38137d7a27	Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo	2010-07-15 11:16:32 -07:00
Dirk Dougherty	798dc2f518	am 6ba9e6fb: am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread ... Merge commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e' * commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e': Doc change: add notes for ndk r4b.	2010-07-12 17:45:12 -07:00
Dirk Dougherty	6ba9e6fbef	am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread ... Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp * commit '5a93032dcbe54223e03102d497d7e04370491737': Doc change: add notes for ndk r4b.	2010-07-12 17:42:33 -07:00
Dirk Dougherty	5a93032dcb	doc change: resolved conflicts for merge of 3c691a8d to gingerbread ... Conflicts: docs/html/sdk/android-2.2.jd Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438	2010-07-12 17:30:05 -07:00
Dirk Dougherty	3c691a8d7f	Doc change: add notes for ndk r4b. ... Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa	2010-07-12 15:51:01 -07:00