Scott Main
c3df4ee009
am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
...
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:19:55 -08:00
Scott Main
d8f66098f8
am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
...
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
2011-12-15 19:56:47 -08:00
Scott Main
b6f7ffd6ad
Merge "docs: add remembering users class to nav" into ics-mr0
2011-12-15 19:55:25 -08:00
Scott Main
75e12152fd
am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
...
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:52:50 -08:00
Scott Main
9827c71df4
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
2011-12-15 19:51:48 -08:00
Scott Main
275749e796
am abfcbd16: docs: typo in training orientation
...
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
2011-12-15 19:47:47 -08:00
Roman Nurik
21c8f7b615
am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
...
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
2011-12-15 19:25:25 -08:00
Dave Burke
5e2c246218
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
2011-12-15 19:23:26 -08:00
Roman Nurik
d2db6cf3a0
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
2011-12-15 19:23:00 -08:00
Scott Main
0bee144610
am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
...
* commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:39:35 -08:00
Scott Main
ef007ca60f
am 580f0146: docs: add camera and design, remove users update title names for many lessons
...
* commit '580f0146535e7daed83aef721f505270f7b040e1':
docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:37:36 -08:00
Scott Main
bf60c4d34b
Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
2011-12-15 17:36:58 -08:00
Sparky Rhode
c5d14267a3
am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
...
* commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
Remove references to sample application
2011-12-15 17:23:11 -08:00
Sparky Rhode
7f3aac506a
Merge "Remove references to sample application" into ics-mr0
2011-12-15 17:21:51 -08:00
Roman Nurik
a8c593f17d
am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
...
* commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:48:25 -08:00
Roman Nurik
189d5afa91
Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
2011-12-15 16:45:55 -08:00
Scott Main
c9a175a70f
am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
...
* commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0':
docs: Add training homepage, side nav, and title changes
2011-12-15 16:29:42 -08:00
Scott Main
431002d2f7
Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
2011-12-15 16:28:19 -08:00
Scott Main
c55dd46c91
am 564e8aa4: docs: Android University - Camera class
...
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
docs: Android University - Camera class
2011-12-15 16:10:10 -08:00
Scott Main
a5261478a0
am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
...
* commit 'd25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
2011-12-15 15:55:31 -08:00
Scott Main
a44a3f8b82
am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
...
* commit '3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
2011-12-15 11:08:51 -08:00
Scott Main
15cd12dcec
am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
...
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
2011-12-15 10:41:18 -08:00
Scott Main
bff64425b6
am f9cca66e: Docs: Training class on Identifying and Authenticating Users.
...
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
2011-12-15 10:13:07 -08:00
The Android Automerger
6d0a1275e1
merge in ics-mr1-release history after reset to ics-mr1
2011-12-14 22:14:25 -08:00
Dianne Hackborn
595c99dff2
Merge "Fix some java docs." into ics-mr1
2011-12-14 18:18:29 -08:00
Dirk Dougherty
cb153108db
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
2011-12-14 17:21:13 -08:00
Scott Main
bff0727132
am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
...
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 14:55:44 -08:00
Scott Main
237818dc58
am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
...
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
2011-12-14 14:53:40 -08:00
Scott Main
86899230f7
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
2011-12-14 14:53:04 -08:00
Scott Main
e74d5a1abc
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
2011-12-14 14:51:30 -08:00
Scott Main
932651387c
am 70645e36: Docs: Add class for Sharing Content
...
* commit '70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
2011-12-14 14:40:19 -08:00
Dirk Dougherty
b2177213f0
Merge "Doc change: API diff report for 15." into ics-mr1
2011-12-13 18:33:04 -08:00
The Android Automerger
cbe3d5bc7e
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 16:03:26 -08:00
Dianne Hackborn
1b90c5bd0d
Merge "Fix issue #5756204 : Crespo IME briefly appears shortened when..." into ics-mr1
2011-12-13 15:40:18 -08:00
Gilles Debunne
8d0b3f3474
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
2011-12-13 15:36:48 -08:00
Dianne Hackborn
f3600e569a
Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
2011-12-13 13:38:56 -08:00
Gilles Debunne
366d1432ed
Merge "NPE in GMail / TextLine" into ics-mr1
2011-12-13 13:37:29 -08:00
Scott Main
db20a9b152
am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
2011-12-13 13:10:45 -08:00
Scott Main
568bf65826
am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:10:42 -08:00
Scott Main
f07b37cde6
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
2011-12-13 12:25:38 -08:00
Andreas Huber
3ef0a52028
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
2011-12-13 11:59:50 -08:00
The Android Automerger
0998dbaa26
merge in ics-mr1-release history after reset to ics-mr1
2011-12-12 22:08:59 -08:00
Jeff Sharkey
b4d1ec8d9d
Merge "Avoid NPE when missing network stats." into ics-mr1
2011-12-12 20:19:27 -08:00
Mike Cleron
ee5de0ffff
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
2011-12-12 18:15:59 -08:00
Dianne Hackborn
ff934866fc
Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
2011-12-12 16:09:54 -08:00
Gilles Debunne
8754c8f146
Merge "Prevent a memory leak in TextLine." into ics-mr1
2011-12-12 15:53:25 -08:00
Gilles Debunne
8d1381027d
Merge "Text blinking cursor hard to see." into ics-mr1
2011-12-12 15:52:39 -08:00
Adam Powell
3786085f8e
Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
2011-12-12 15:40:00 -08:00
Jamie Gennis
07584d6321
Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
2011-12-12 14:10:04 -08:00
Raphael
afcfa2f23a
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
2011-12-12 13:14:12 -08:00