summaryrefslogtreecommitdiffstats
path: root/docs/html/training
Commit message (Collapse)AuthorAgeFilesLines
* am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed ↵quddusc2014-04-051-7/+14
|\ | | | | | | | | | | | | gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit 'f403d60fc8dfe2b833a65b6933a07c44d849e831': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| * am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to ↵quddusc2014-04-051-7/+14
| |\ | | | | | | | | | | | | | | | | | | recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit 'b430ec756473330f47bda2d8f0c266b3398169c9': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| | * Merge "docs: Fixed gamepad mapping doc to recommend that B button should be ↵quddusc2014-04-051-7/+14
| | |\ | | | | | | | | | | | | used for back navigation in menus. Bug: 13487101" into klp-docs
| | | * docs: Fixed gamepad mapping doc to recommend that B button should be used ↵quddusc2014-03-261-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for back navigation in menus. Bug: 13487101 Change-Id: If62a7415262877b7ef4ca19fcf0ab77c5323f1cb
* | | | am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: ↵Katie McCormick2014-04-042-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | notification bug fix." into klp-docs * commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502': Doc Update: notification bug fix.
| * | | am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into ↵Katie McCormick2014-04-042-4/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | klp-docs * commit 'f7bffe7707f31da920a8ff08d013934562e9a43d': Doc Update: notification bug fix.
| | * | Merge "Doc Update: notification bug fix." into klp-docsKatie McCormick2014-04-042-4/+6
| | |\ \
| | | * | Doc Update: notification bug fix.Katie McCormick2014-04-042-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: b/13429906 Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
* | | | | 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
| * | | | am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: ↵Ricardo Cervera2014-04-041-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 13806963" into klp-docs * commit 'a821af684e2a5f814fc8709518b5f0589c81661e': 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.
| * | | am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK ↵Ricardo Cervera2014-04-023-34/+42
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | version to the Build your First App class." into klp-docs * commit '5a218b186735534925d7fedb63f1c78a3a3ff543': 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 c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge ↵Adam Koch2014-03-206-12/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | "Point bitmaps training class to new samples directory." into klp-docs * commit 'c5640ea55aebf86ab652f5a2f8e00e130c479291': Point bitmaps training class to new samples directory.
| * | am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples ↵Adam Koch2014-03-206-12/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | directory." into klp-docs * commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354': Point bitmaps training class to new samples directory.
| | * Merge "Point bitmaps training class to new samples directory." into klp-docsAdam Koch2014-03-206-12/+12
| | |\
| | | * Point bitmaps training class to new samples directory.Adam Koch2014-03-206-12/+12
| | | | | | | | | | | | | | | | Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
* | | | 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
| * | | am 50694917: am 7e566239: Merge "docs: Updated Building your First App ↵Ricardo Cervera2014-03-144-39/+54
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | tutorial. Bug: 13429905" into klp-docs * commit '506949173761f9bde016b9d74de94df4b63df370': 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 b8645efb: am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc ↵Katie McCormick2014-02-111-24/+89
|\ \ \ | |/ / | | | | | | | | | | | | | | | update: clarify best practices." into klp-docs * commit 'b8645efbc8b7f57168d1f5108b65e5bea576b1d1': Doc update: clarify best practices.
| * | am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into ↵Katie McCormick2014-02-111-24/+89
| |\ \ | | |/ | | | | | | | | | | | | | | | klp-docs * commit '0a96a82bbe153ed2337b67435016d35eb434da16': Doc update: clarify best practices.
| | * Merge "Doc update: clarify best practices." into klp-docsKatie McCormick2014-02-111-24/+89
| | |\
| | | * Doc update: clarify best practices.Katie McCormick2014-02-101-24/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for: b/12515292 Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d
* | | | am a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge ↵Ricardo Cervera2014-02-101-20/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs * commit 'a11ac26b0e012eb9b9829afc74095a5cc6292452': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| * | | am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. ↵Ricardo Cervera2014-02-101-20/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 12815243" into klp-docs * commit 'd038afd39874238357a5ca9621921542f57db7a1': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| | * | docs: Fixed ViewPager animation tutorial. Bug: 12815243Ricardo Cervera2014-02-071-20/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Went through the tutorial and fixed a few minor issues. There is confusion with Fragment and FragmentManager from the support library vs. the main Android APIs. Clarified this by showing some imports explicitly. Tested the new code from the page on Eclipse and it works as expected. Change-Id: I8494a72f4c760a03a6b8f3322c5754e315f22e7c Review: http://quixote.mtv.corp.google.com:8002/training/animation/screen-slide.html
* | | am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc ↵Adam Koch2014-01-301-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs * commit '310b1e511f92c6972ccda2c7a779116fc0f89ced': Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
| * | am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying ↵Adam Koch2014-01-291-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | bitmaps training class Bug: 12715659" into klp-docs * commit 'b430d93b058a706be731e45f8c1836d97219a666': Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
| | * Doc fix: Update code snippet in displaying bitmaps training classAdam Koch2014-01-291-1/+2
| | | | | | | | | | | | | | | | | | Bug: 12715659 Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
* | | am ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge ↵quddusc2014-01-225-2/+1512
|\ \ \ | |/ / | | | | | | | | | | | | | | | "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs * commit 'ddef0ec94b01b18f4452dea7ed98a4ff5184e49b': cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
| * | am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training ↵quddusc2014-01-215-2/+1512
| |\ \ | | |/ | | | | | | | | | | | | | | | class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs * commit '0cb965a69aac9c2a83798960a0efeaa6e596e445': cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
| | * Merge "cherrypick from jb-mr2-docs docs: Training class for game ↵quddusc2014-01-225-2/+1512
| | |\ | | | | | | | | | | | | controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
| | | * cherrypick from jb-mr2-docs docs: Training class for game controllers. ↵quddusc2014-01-215-2/+1512
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I697770aee8604c965c3730691459c1e8f10705da Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
* | | | am 52288441: am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '52288441428d68337e01def025e540bc8ed968f6': fix code typo
| * | | am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-211-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9': fix code typo
| | * | fix code typoScott Main2014-01-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
* | | | Update doc wrt to android:debuggable and CheckJNIMarco Nelissen2014-01-161-1/+3
| | | | | | | | | | | | | | | | Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28
* | | | am 72e2c2a0: am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge ↵Ricardo Cervera2014-01-161-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs * commit '72e2c2a0b4df1d48e19b055d353094000c021c22': docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
| * | | am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: ↵Ricardo Cervera2014-01-161-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs * commit '294d5f790a564ac5f21d3dcfd1054abe544505a5': docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
| | * | Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: ↵Ricardo Cervera2014-01-161-2/+2
| | |\ \ | | | | | | | | | | | | | | | http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
| | | * | docs: Fixed typos in audio-focus.jd. Bug: 12528498Ricardo Cervera2014-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html Change-Id: I2198e4e27661b374d7c812bc7f26658073feae20
* | | | | am b5466418: am 7984122e: am 04666c91: am 96f6ce38: am 291fb4b5: Merge ↵Ricardo Cervera2014-01-161-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp- * commit 'b5466418d1313c59801a4acafa17b86ee4950f50': docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
| * | | | am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in ↵Ricardo Cervera2014-01-151-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs * commit '96f6ce38e383c0a2d416678bdfce41426e3f6b45': docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
| | * | | Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation ↵Ricardo Cervera2014-01-161-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
| | | * | | docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. ↵Ricardo Cervera2014-01-151-0/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9
* | | | | am 4645edea: am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge ↵quddusc2014-01-151-3/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs * commit '4645edeae0eec727909bcfe1ff7562ca4a7d1c80': docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
| * | | | am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing ↵quddusc2014-01-151-3/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | API guide and removed misleading statement. Bug: 9436754" into klp-docs * commit 'f40111731581f03dc1b447b432331b3415fb87b9': docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
| | * | | Merge "docs: Added link to in-app billing testing API guide and removed ↵quddusc2014-01-151-3/+6
| | |\ \ \ | | | |/ / | | |/| | | | | | | misleading statement. Bug: 9436754" into klp-docs