summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Doc change: edits to ICS MR1 API Overview.Dirk Dougherty2011-12-162-8/+7
| | | | Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
* Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib ↵Joe Fernandez2011-12-152-62/+72
|\ | | | | | | r5-r6" into ics-mr1
| * docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez2011-12-152-62/+72
| | | | | | | | Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
* | am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2011-12-152-4/+2
|\ \ | |/ |/| | | | | * commit '48e0617b9e7d06da803c572d6584d68898733d37': Fixed Android U Enterprise lesson pre-requisites and a minor typo.
| * Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2011-12-152-4/+2
| | | | | | | | Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
* | Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" ↵Scott Main2011-12-154-29/+131
|\ \ | | | | | | | | | into ics-mr1
| * | docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez2011-12-154-29/+131
| | | | | | | | | | | | Change-Id: Ia8e14c1ab4dad7c51677e759d10891bd75cbe7b1
* | | docs: update homepage for 4.0.3 announcmentScott Main2011-12-151-8/+8
| | | | | | | | | | | | Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
* | | am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)Scott Main2011-12-154-4/+4
|\ \ \ | | |/ | |/| | | | | | | * commit '98af5edc70b0b418366f5197b9aeef30f135d40e': docs: fix encoding issue or whatever with docs (not showing titles)
| * | docs: fix encoding issue or whatever with docs (not showing titles)Scott Main2011-12-154-4/+4
| | | | | | | | | | | | Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
* | | am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0Scott Main2011-12-151-0/+19
|\ \ \ | |/ / | | | | | | | | | * commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54': docs: add remembering users class to nav
| * | Merge "docs: add remembering users class to nav" into ics-mr0Scott Main2011-12-151-0/+19
| |\ \
| | * | docs: add remembering users class to navScott Main2011-12-151-0/+19
| | | | | | | | | | | | | | | | Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
* | | | am 5dac1976: Merge "Doc merge from master:Training class on Identifying and ↵Scott Main2011-12-155-31/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Authenticating Users." into ics-mr0 * commit '5dac1976198e5fa553749cd145c7484f3ff45c6b': Doc merge from master:Training class on Identifying and Authenticating Users.
| * | | Merge "Doc merge from master:Training class on Identifying and ↵Scott Main2011-12-155-31/+31
| |\ \ \ | | |/ / | |/| | | | | | Authenticating Users." into ics-mr0
| | * | Doc merge from master:Training class on Identifying and Authenticating Users.Dirk Dougherty2011-12-155-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/html/training/id-auth/authenticate.jd docs/html/training/id-auth/custom_auth.jd docs/html/training/id-auth/identify.jd docs/html/training/id-auth/index.jd Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
* | | | am abfcbd16: docs: typo in training orientationScott Main2011-12-151-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1': docs: typo in training orientation
| * | | docs: typo in training orientationScott Main2011-12-151-5/+5
| | | | | | | | | | | | | | | | Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
* | | | am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" ↵Roman Nurik2011-12-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05': docs: Minor bugfix to Android U navigation design class
| * | | Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0Roman Nurik2011-12-151-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | docs: Minor bugfix to Android U navigation design classRoman Nurik2011-12-151-1/+1
| | | | | | | | | | | | | | | | Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
* | | | am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, ↵Scott Main2011-12-155-10/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | wording and a screenshot." into ics-mr0 * commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
| * | | Merge "Minor tweaks to Sharing class, updated some typos, wording and a ↵Scott Main2011-12-155-10/+10
| |\ \ \ | | | | | | | | | | | | | | | screenshot." into ics-mr0
| | * | | Minor tweaks to Sharing class, updated some typos, wording and a screenshot.Adam Koch2011-12-155-10/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
* | | | | am 580f0146: docs: add camera and design, remove users update title names ↵Scott Main2011-12-1529-56/+88
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | for many lessons * commit '580f0146535e7daed83aef721f505270f7b040e1': docs: add camera and design, remove users update title names for many lessons
| * | | | docs: add camera and design, remove usersScott Main2011-12-1529-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update title names for many lessons Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
* | | | | am fc3f8e69: Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f': Remove references to sample application
| * | | | Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
| |\ \ \ \
| | * | | | Remove references to sample applicationSparky Rhode2011-12-152-37/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
* | | | | | am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App ↵Roman Nurik2011-12-1532-0/+4488
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation" into ics-mr0 * commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c': Android U Class: Designing Effective and Intuitive App Navigation
| * | | | | Merge "Android U Class: Designing Effective and Intuitive App Navigation" ↵Roman Nurik2011-12-1532-0/+4488
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | into ics-mr0
| | * | | Android U Class: Designing Effective and Intuitive App NavigationRoman Nurik2011-12-1532-0/+4488
| | |/ / | | | | | | | | | | | | Change-Id: Ic05d73c27a4ae4b18fd682e1f193acd73b8d9dc5
* | | | am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title ↵Scott Main2011-12-159-6/+212
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | changes" into ics-mr0 * commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0': docs: Add training homepage, side nav, and title changes
| * | | Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0Scott Main2011-12-159-6/+212
| |\ \ \
| | * | | docs: Add training homepage, side nav, and title changesScott Main2011-12-159-6/+212
| | | | | | | | | | | | | | | | | | | | Change-Id: I2ac6047faa7a70e06ced47665813ace4aa974af8
* | | | | am 564e8aa4: docs: Android University - Camera classScott Main2011-12-155-0/+744
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71': docs: Android University - Camera class
| * | | | docs: Android University - Camera classScott Main2011-12-155-0/+744
| |/ / / | | | | | | | | | | | | Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
| * | | cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: ↵Scott Main2011-12-152-13/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
* | | docs: remove some "new" tags from side navsScott Main2011-12-152-13/+12
| | | | | | | | | | | | Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
* | | am 3d672e1e: Android U Class: Monetization / Ads without Compromising User ↵Scott Main2011-12-158-0/+304
|\ \ \ | |/ / | | | | | | | | | | | | | | | Experience * commit '3d672e1e789e171e913605945efe95a477ab0505': Android U Class: Monetization / Ads without Compromising User Experience
| * | Android U Class: Monetization / Ads without Compromising User ExperienceScott Main2011-12-158-0/+304
| | | | | | | | | | | | Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
* | | am aed4ced6: Android U Class: Developing Android Applications for the ↵Scott Main2011-12-155-0/+281
|\ \ \ | |/ / | | | | | | | | | | | | | | | Enterprise. This class uses a sample app. * commit 'aed4ced6556383483209f454c9e4872e8ad28ebf': Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
| * | Android U Class: Developing Android Applications for the Enterprise.Scott Main2011-12-155-0/+281
| | | | | | | | | | | | | | | | | | This class uses a sample app. Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
* | | am f9cca66e: Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
|\ \ \ | |/ / | | | | | | | | | * commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1': Docs: Training class on Identifying and Authenticating Users.
| * | Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
| | | | | | | | | | | | Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
* | | Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1Dirk Dougherty2011-12-144-13/+532
|\ \ \
| * | | Doc change: add MR1 API summary and updated highlights.Dirk Dougherty2011-12-144-13/+532
| | |/ | |/| | | | | | | Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
* | | am 56a3e326: Merge "docs: add Android U class for "Improving Performance of ↵Scott Main2011-12-1410-0/+574
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Layouts"" into ics-mr0 * commit '56a3e326192c7496b67666b29071dc9f38c59da9': docs: add Android U class for "Improving Performance of Layouts"
| * | Merge "docs: add Android U class for "Improving Performance of Layouts"" ↵Scott Main2011-12-1410-0/+574
| |\ \ | | | | | | | | | | | | into ics-mr0
| | * | docs: add Android U class for "Improving Performance of Layouts"Scott Main2011-12-0610-0/+574
| | | | | | | | | | | | | | | | Change-Id: I3981223b7219179e1d68f982491effe655734c1e
generated by cgit v1.1 at 2025-01-26 20:21:31 +0000