summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of cbc1ac33 to masterChris Banes2015-02-182-45/+83
|\ | | | | | | Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6
| * Merge "docs: studio training basics create and run project updates" into ↵Rich Slogar2015-02-172-44/+64
| |\ | | | | | | | | | lmp-docs
| | * docs: studio training basics create and run project updatesRich Slogar2015-01-302-44/+64
| | | | | | | | | | | | | | | | | | b/18742781 Change-Id: I80a207e24330c1b073934d671b3b9c94b0fb28e0
* | | am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and ↵David Friedman2015-02-171-83/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0 automerge: 40191d8 automerge: cdf0774 * commit 'cdf0774314842eb16f8db2b822a6d6538f17090e': This file is misplaced, and serves no purpose. I am sending it to oblivion.
| * | This file is misplaced, and serves no purpose. I am sending it to oblivion.David Friedman2015-02-121-83/+0
| | | | | | | | | | | | Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
* | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs ↵Joe Fernandez2015-01-311-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4 automerge: 14437e4 * commit '14437e4781fea9688b7c68ec6c3201e8a926ab04': docs: training intent doc error update
| * | docs: training intent doc error updateRich Slogar2015-01-301-1/+2
| |/ | | | | | | | | | | b/18386294 Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
* | Merge "Remove references to apache-http from various documents."Narayan Kamath2014-12-121-2/+2
|\ \
| * | Remove references to apache-http from various documents.Narayan Kamath2014-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | Most of them are pointless links to a "text/plain" constant which are far clearer when inlined with the relevant text. Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
* | | am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 ↵smain@google.com2014-12-119-2/+16
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | pages" into lmp-docs automerge: e04a9fc automerge: bac113b automerge: c73a65d * commit 'c73a65d61892542ece0dd9b95000048517f36c02': add helpouts widget to wave 3 pages
| * add helpouts widget to wave 3 pagessmain@google.com2014-12-109-2/+16
| | | | | | | | Change-Id: I83c1a0af4975a4544a7f7dcb745bf5fbdf173c6e
* | resolved conflicts for merge of c137d08c to mastersmain@google.com2014-12-091-1/+1
|\ \ | |/ | | | | Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca
| * revisions to Studio landing pagesmain@google.com2014-12-081-1/+1
| | | | | | | | Change-Id: I608b8a63b826f2f2ee2603d7426b501a4df24a38
| * misc fixes for studio launch:smain@google.com2014-12-083-34/+34
| | | | | | | | | | | | | | update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. Change-Id: I086bf63dddc9f653ce06db29eec9998dfa265040
| * docs:building your first app [CP]Rich Slogar2014-12-062-7/+5
| | | | | | | | | | Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01 (cherry picked from commit 0215606d8d58b93d07550ff6e857442306b96aae)
| * docs: Training refactor for Android Studio [CP]Scott Rowe2014-12-065-460/+575
| | | | | | | | | | | | | | Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612 Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06 (cherry picked from commit 8c068aeee06efd2ce0827c81e5919e90358c56e3)
* | docs:building your first appRich Slogar2014-12-052-7/+5
| | | | | | | | Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01
* | am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts ↵smain@google.com2014-11-2118-51/+32
|\ \ | |/ | | | | | | | | | | widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 automerge: 39d6b21 * commit '2dc4cfa09617cfa660728b3c972f840853a80583': add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
| * add the helpouts widget and necessary tags to "wave 2" of the Getting ↵smain@google.com2014-11-1818-51/+32
| | | | | | | | | | | | Started classes Change-Id: I79d5193d9a4d466d22f495d8685bb43a42d5c3fa
| * revise helpouts tags to use just one on each pagesmain@google.com2014-10-313-3/+3
| | | | | | | | Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
* | am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one ↵smain@google.com2014-11-013-3/+3
|\ \ | | | | | | | | | | | | | | | | | | on each page automerge: b2b3b37 automerge: 07c9807 * commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8': revise helpouts tags to use just one on each page
| * | revise helpouts tags to use just one on each pagesmain@google.com2014-10-313-3/+3
| |/ | | | | | | Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
* | docs: Training refactor for Android Studio Cherrypick from lmp-docs ↵Scott Rowe2014-10-305-460/+575
|/ | | | | | hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612 Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06
* fix a few of the tags for helpouts compatibilitysmain@google.com2014-10-223-3/+3
| | | | Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
* add helpouts widget to first round of pagessmain@google.com2014-10-225-20/+15
| | | | Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
* fix confusing sentencesmain@google.com2014-10-021-3/+3
| | | | | | https://memegen.googleplex.com/5524829602054144 Change-Id: I451c167bd1aedbde4b0e676f5f74a9dacb20fc10
* am c799a830: am 88d1c560: am ea5fa98c: am c659e746: Merge "Doc update: new ↵Katie McCormick2014-06-042-0/+10
|\ | | | | | | | | | | | | Volley class" into klp-docs * commit 'c799a830b2d29db5747cc89558c9effb6baddb22': Doc update: new Volley class
| * Doc update: new Volley classKatie McCormick2014-05-292-0/+10
| | | | | | | | Change-Id: Ife3a9a64439e07aaaf92a22adc6d1678138caf7d
* | am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO ↵Scott Rowe2014-05-191-2/+3
|\ \ | |/ | | | | | | | | | | language code, add link * commit '7a940a49745f51425e60bfde38b8c0dab454ef8b': docs: b/14510382 ISO language code, add link
| * docs: b/14510382 ISO language code, add linkScott Rowe2014-05-161-2/+3
| | | | | | Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
* | resolved conflices for merge of 93ccd1a2 to masterDirk Dougherty2014-05-143-2/+3
|\ \ | |/ | | | | Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
| * Doc change: Updated content for distribute.Dirk Dougherty2014-05-143-2/+3
| | | | | | | | Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
* | am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed ↵Ricardo Cervera2014-04-041-2/+2
|\ \ | |/ | | | | | | | | | | action bar example. Bug: 13806963" into klp-docs * commit '1ac6519b245c008ea6b3b6baba205fb58d75c807': docs: Fixed action bar example. Bug: 13806963
| * docs: Fixed action bar example. Bug: 13806963Ricardo Cervera2014-04-041-2/+2
| | | | | | | | Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
* | am 04c2a557: am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes ↵Ricardo Cervera2014-04-023-34/+42
|\ \ | |/ | | | | | | | | | | to use the last SDK version to the Build your First App class." into klp-docs * commit '04c2a5571620927f702af3707845b1b05769dc46': docs: Added notes to use the last SDK version to the Build your First App class.
| * docs: Added notes to use the last SDK version to the Build your First App class.Ricardo Cervera2014-04-013-34/+42
| | | | | | | | Change-Id: I35820ff887b3d0f4ccc0ce7720576e3e692109b5
* | am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge ↵Ricardo Cervera2014-03-144-39/+54
|\ \ | |/ | | | | | | | | | | "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs * commit 'd387206a84a35b86663adb5bf00671cafbf6aee4': docs: Updated Building your First App tutorial. Bug: 13429905
| * docs: Updated Building your First App tutorial. Bug: 13429905Ricardo Cervera2014-03-134-39/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Updated default code in activities from ADT -Updated screenshots for ADT wizards when changed -Updated activity_ with fragment_ where required -Other minor changes Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html Patch: Removed border from the new ADT screenshots. Patch: Replaced device screenshots using an Android 4.4 device. Patch: Addressed Katie's comments. Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
* | am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite ↵Scott Main2013-12-112-4/+8
|\ \ | |/ | | | | | | | | | | intent guide and add doc with intents supported by platform apps * commit '5f41b262a5edb9f2ffb44fff77dc75d5cabec2ba': rewrite intent guide and add doc with intents supported by platform apps
| * rewrite intent guide and add doc with intents supported by platform appsScott Main2013-12-102-4/+8
| | | | | | | | Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
* | Removing quotes from page.tags valuesJoe Fernandez2013-11-148-8/+8
|/ | | Change-Id: I9e12079568ef7be8574743a34856ed2839e1e76a
* DOC CHANGE: FileProvider training classJoe Malin2013-10-114-9/+12
| | | | Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a
* fix typo in code commentScott Main2013-10-081-3/+3
| | | | Change-Id: Iefe5a52db4bb5852f3651487e97917879cdfa890
* add jb mr2 uses-feature items to reference page and fix a couple doc bugsScott Main2013-08-261-4/+1
| | | | Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
* fix markup errors in action bar styling,Scott Main2013-08-224-22/+36
| | | | | | | add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting. Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
* Merge "update Getting Started class about fragments to remove support lib ↵Scott Main2013-08-012-14/+26
|\ | | | | | | lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs
| * update Getting Started class about fragments to remove support lib lessonScott Main2013-07-302-14/+26
| | | | | | | | | | | | | | and mention the action bar library, then update any links and add redirect bug: 10000221 Change-Id: I625c9cc888b213f1b1e31d8a83ae4dab2051395f
* | new class on using action bar for training basicsScott Main2013-08-016-1/+980
|/ | | | Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
* fix a few bugs.Scott Main2013-07-301-11/+12
| | | | | | | | xxhpi bug: 10071401 bitmap code, aosp: 58020 intent code, aosp: 57698 Change-Id: Ice59c52d095d1e173918cae692368bf0f6636a14
* update all links to the support libraryScott Main2013-07-233-6/+6
| | | | Change-Id: I173e3690148e5de3020bfdca8087906faa56b13b