summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: fix typoRobert Ly2014-07-291-2/+2
| | | | Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
* Merge "Doc change: add reminder for developers on using ad id." into ↵Robert Ly2014-07-222-0/+18
|\ | | | | | | klp-modular-docs
| * Doc change: add reminder for developers on using ad id.Dirk Dougherty2014-07-222-0/+18
| | | | | | | | Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
* | Merge "Added an "In This Document" nav list at top-right of page, and ↵David Friedman2014-07-221-74/+90
|\ \ | |/ |/| | | deleted corresponding text from body." into klp-modular-docs
| * Added an "In This Document" nav list at top-right of page, and deleted ↵David Friedman2014-07-221-74/+90
| | | | | | | | | | | | corresponding text from body. Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
* | Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID ↵Scott Rowe2014-07-171-2/+1
|\ \ | | | | | | | | | Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
| * | cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: ↵Scott Rowe2014-07-171-2/+1
| | | | | | | | | | | | | | | | | | I83d4389bb8322c2dbca10042e666fc9b75ea8a12 Change-Id: I2ee3cc1269fcd9b31f1f71fc5fc3cd8d62ebf31f
* | | Merge "DO NOT MERGE" into klp-modular-docsAndrew Solovay2014-07-182-3/+36
|\ \ \
| * | | DO NOT MERGEAndrew Solovay2014-07-222-3/+36
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from klp-modular-dev docs: Noted how singleTop affects "up" navigation. Change-Id: 4d06d970526b58ddaf8db89858615217fa88772b Docs are staged to: http://asolovay.mtv:9411/training/implementing-navigation/ancestral.html#NavigateUp http://asolovay.mtv:9411/guide/topics/manifest/activity-element.html#lmode bug: 14527411 Change-Id: Ia414f2206339fc33739c8244f14140dd2e5d1607 (cherry picked from commit 4d06d970526b58ddaf8db89858615217fa88772b)
* | | Merge "docs: Removed reference to a sample notepad app." into klp-modular-docsAndrew Solovay2014-07-181-16/+8
|\ \ \
| * | | docs: Removed reference to a sample notepad app.Andrew Solovay2014-07-211-16/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first section incorrectly said that there was a full Notepad sample app in the "samples" directory; removed that reference. Also changed the description in "Other Resources and Further Learning" to point to the sample in "samples/legacy/NotePad". Doc is staged to: http://asolovay.mtv:9249/training/notepad/ bug: 15612249 Change-Id: I6c17565fd7708fb50915e8cdd73043964cc2878a
* | | Merge "docs: update links and add new wear design materials" into ↵Robert Ly2014-07-221-4/+4
|\ \ \ | | | | | | | | | | | | klp-modular-docs
| * | | docs: update links and add new wear design materialsRobert Ly2014-07-221-4/+4
| | | | | | | | | | | | | | | | Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
* | | | docs: remove android translation plugin docRobert Ly2014-07-221-69/+1
| | | | | | | | | | | | | | | | Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
* | | | Merge "docs: fix speech code for bug 16461337" into klp-modular-docsRobert Ly2014-07-211-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | docs: fix speech code for bug 16461337Robert Ly2014-07-221-2/+2
| |/ / | | | | | | Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
* | | Merge "docs: Added note suggesting use of Android Studio over ADT" into ↵Ricardo Cervera2014-07-211-0/+3
|\ \ \ | | | | | | | | | | | | klp-modular-docs
| * | | docs: Added note suggesting use of Android Studio over ADTRicardo Cervera2014-07-211-0/+3
| | | | | | | | | | | | | | | | Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
* | | | docs: change copy for edu videoRobert Ly2014-07-211-2/+2
| |/ / |/| | | | | | | | Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
* | | Merge "Minor typos, consistency things, one grammatical error." into ↵David Friedman2014-07-171-6/+6
|\ \ \ | | | | | | | | | | | | klp-modular-docs
| * | | Minor typos, consistency things, one grammatical error.David Friedman2014-07-181-6/+6
| | | | | | | | | | | | | | | | Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c
* | | | docs: Fixed bugs in Game Controller training doc.Quddus Chong2014-07-181-34/+14
|/ / / | | | | | | | | | | | | bug: 16375247, 14671463 Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a
* | | Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docsRicardo Cervera2014-07-171-1/+1
|\ \ \
| * | | docs: Fixed RecyclerView example. Bug: 15973665Ricardo Cervera2014-07-151-1/+1
| |/ / | | | | | | | | | Change-Id: Ia3c2264d014c8d2e67b2ee96d097be110042c56f
* | | Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docsRobert Ly2014-07-171-2/+2
|\ \ \
| * | | docs: Fix typo in Wear docs. Bug: 16327298Ricardo Cervera2014-07-161-2/+2
| |/ / | | | | | | | | | Change-Id: I682b9bba9d01712b98d5de97d31ef2d88b5b6ea0
* | | docs: Update ADT-1 page with supported appsJoe Fernandez2014-07-161-4/+4
| |/ |/| | | | | Change-Id: I7281767e3a51ce518f4e14f0751ba71859e16d24
* | Merge "Doc Update: new Smack sample." into klp-modular-docskmccormick2014-07-161-292/+320
|\ \
| * | Doc Update: new Smack sample.kmccormick2014-07-151-292/+320
| | | | | | | | | | | | Change-Id: I4395d13eab5e7801dae85394350536ae6cb38e9e
* | | A linebreak had somehow wrongly replaced a blank space. Blank space restored.David Friedman2014-07-161-2/+1
| | | | | | | | | | | | | | | Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab (cherry picked from commit fe545cdb4e9d49d8cf58626ef77709abecf8f26b)
* | | Merge "docs: add EU legal notice" into klp-modular-docsRobert Ly2014-07-161-0/+10
|\ \ \
| * | | docs: add EU legal noticeRobert Ly2014-07-161-0/+10
| | | | | | | | | | | | | | | | | | | | bug 16345613 Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
* | | | Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docsQuddus Chong2014-07-161-1/+1
|\ \ \ \
| * | | | docs: Fixed small typo.Quddus Chong2014-07-161-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | bug: 14617866 Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
* | | | docs: Fix minor issues with Wear data events docs.Chris Smith2014-07-161-2/+3
|/ / / | | | | | | | | | Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
* | | Merge "cherrypick from klp-docs docs: Corrected doc for ↵Andrew Solovay2014-07-151-12/+10
|\ \ \ | |/ / |/| | | | | getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
| * | cherrypick from klp-docs docs: Corrected doc for ↵Andrew Solovay2014-07-151-12/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38 Doc had inaccurately said that getLaunchIntentForPackage() throws an exception if the package name is not recognized; in fact, it returns null. Also cleaned up some style issues for that Javadoc item. Doc is staged to: http://asolovay.mtv:9655/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String) Bug: 15022655 Original SHA1: I2eab0956eaedac71289e19a3618a3553908f8c38 Change-Id: Ief8dfaac248ba03779c6f13237aff9b26d362fd9
* | Merge "NDK filesizes and hashes updated" into klp-modular-docsRobert Ly2014-07-151-125/+504
|\ \
| * | NDK filesizes and hashes updatedDavid Friedman2014-07-151-125/+504
| | | | | | | | | | | | Change-Id: I537f46335a27a753f93e8a7b85c3405e7bd3124c
* | | Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview ↵Ricardo Cervera2014-07-151-2/+2
|\ \ \ | | | | | | | | | | | | docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs
| * | | cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs ↵Ricardo Cervera2014-07-151-2/+2
| |/ / | | | | | | | | | | | | | | | Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee Change-Id: I328fc60924d76c633e2f2576c514df22153cdc80
* | | Merge "docs: add edu video highlights" into klp-modular-docsRobert Ly2014-07-156-29/+147
|\ \ \
| * | | docs: add edu video highlightsRobert Ly2014-07-156-29/+147
| |/ / | | | | | | | | | Change-Id: I1339245330087486faf95023d3a4e8b4dc687a6e
* | | Merge "docs: Replaced deprecated fill_parent with match_parent." into ↵Andrew Solovay2014-07-155-20/+20
|\ \ \ | |/ / |/| | | | | klp-modular-docs
| * | docs: Replaced deprecated fill_parent with match_parent.Andrew Solovay2014-07-115-20/+20
| |/ | | | | | | | | | | | | | | | | | | | | Docs are staged to http://asolovay.mtv:9689/guide/topics/ui/declaring-layout.html (...and its child pages.) bug: 15939689 Change-Id: I6c4c816fd0e983afb3425e9adc0e1e0a2cfc87ed
* | docs: Fixed typo in L Preview API Overview.Quddus Chong2014-07-151-1/+1
| | | | | | | | | | | | bug: 15696551 Change-Id: I410fa60b9f60ff61a80cd5b059d4b6bd52c33a04
* | docs: Fix typos in the L preview docs. Bug: 16240486Ricardo Cervera2014-07-159-12/+12
|/ | | | Change-Id: I44b417b0a38fc2ce89220cd087d8f2bbd58562f8
* Fixed a randomly discovered typo and missing hyphen.David Friedman2014-07-111-2/+2
| | | | | | Change not staged. Change-Id: I5bf2e7dbae3b76ba937d9acdec3bbf3ab6717a9c
* Merge "Revert "Change list for NDK Revision 10. Staged at: ↵Robert Ly2014-07-091-504/+125
|\ | | | | | | http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
| * Revert "Change list for NDK Revision 10. Staged at: ↵Robert Ly2014-07-101-504/+125
| | | | | | | | | | | | | | | | http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" This reverts commit 42fcd1463d416ede744550810bdfd7974e685f15. Change-Id: I0956e4e07b558c1f445d3209a52a54974e060b99