summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docsJoe Fernandez2015-05-041-24/+24
|\
| * docs: Android Developer Dashboard update - May 2015Joe Fernandez2015-05-041-24/+24
| | | | | | | | Change-Id: Ia4cfae39c0ccb744f9489615b6dd36f455a652c0
* | Update N6 device art port image to remove shadow.Dirk Dougherty2015-05-021-0/+0
| | | | | | | | Change-Id: I3d563be3c0c29bc24b06b2019460b27462ac3731
* | am e7bfe5b3: docs: sdk 24.2.0 revisionsRich Slogar2015-05-022-12/+39
|\ \ | |/ |/| | | | | * commit 'e7bfe5b3ccdaa84f94eb30c607d7d6a831d57b7b': docs: sdk 24.2.0 revisions
| * docs: sdk 24.2.0 revisionsRich Slogar2015-05-012-12/+39
| | | | | | | | Change-Id: I658ddc34c134741f706d58fd0bbf085ee4724fcf
* | am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docsRich Slogar2015-04-301-1/+1
|\ \ | |/ | | | | | | * commit '3e70c6b49ff993aef9fd554ade3444e3d3afa032': docs: studio 1.2 download link fix
| * Merge "docs: studio 1.2 download link fix" into lmp-docsRich Slogar2015-04-301-1/+1
| |\
| | * docs: studio 1.2 download link fixRich Slogar2015-04-301-1/+1
| | | | | | | | | | | | Change-Id: Ib0234749f64427fbada795a49d2b52d5a67dbd3b
* | | am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-3011-91/+549
|\ \ \ | |/ / | | | | | | | | | * commit '2a3aa2d343820be9e05101a25b955d525e9bfa54': docs: studio 1.2 updates
| * | docs: studio 1.2 updatesRich Slogar2015-04-2911-91/+549
| |/ | | | | | | Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
* | am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docsRich Slogar2015-04-301-18/+19
|\ \ | |/ | | | | | | * commit '999b08b74c29937b49c4106a784117eed6168045': docs: studio 1.2 downloads
| * Merge "docs: studio 1.2 downloads" into lmp-docsRich Slogar2015-04-301-18/+19
| |\
| | * docs: studio 1.2 downloadsRich Slogar2015-04-291-18/+19
| | | | | | | | | | | | Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e
* | | am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docsRich Slogar2015-04-301-0/+68
|\ \ \ | |/ / | | | | | | | | | * commit '07aca646e43ea27329c079d8ff6549127e4fcc25': docs: plugin 1.2.0 revision updates
| * | Merge "docs: plugin 1.2.0 revision updates" into lmp-docsRich Slogar2015-04-301-0/+68
| |\ \
| | * | docs: plugin 1.2.0 revision updatesRich Slogar2015-04-291-0/+68
| | | | | | | | | | | | | | | | Change-Id: Ic58da005e16c4a51dacff741ac3e5a7856ac3edb
* | | | am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docsRich Slogar2015-04-303-5/+58
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5b7546a67b5fef2adab70d95da4879381b9b0e92': docs: studio 1.2 revision updates
| * | | Merge "docs: studio 1.2 revision updates" into lmp-docsRich Slogar2015-04-303-5/+58
| |\ \ \
| | * | | docs: studio 1.2 revision updatesRich Slogar2015-04-293-5/+58
| | | | | | | | | | | | | | | | | | | | Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a
* | | | | Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docsAndrew Solovay2015-04-301-2/+3
|\ \ \ \ \
| * | | | | docs: Minor formatting cleanup.Andrew Solovay2015-04-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code sample had an overlong line, which caused a horizontal scroll- bar in the generated doc. Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
* | | | | | am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docsDavid Friedman2015-04-297-38/+581
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '75f071df44d3231f2f9d2616277b9065e1dedc12': Localized Android landing pages Bug: 19124242
| * | | | | Merge "Localized Android landing pages Bug: 19124242" into lmp-docsDavid Friedman2015-04-297-38/+581
| |\ \ \ \ \
| | * | | | | Localized Android landing pagesDavid Friedman2015-03-107-38/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19124242 Change-Id: Ie393202008ba7fd630919e493a2545b95f3030bf
* | | | | | | docs: Update information on delivering message to clarify thatLuan Nguyen2015-04-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageAPI is not reliable. bug: 20088602 Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
* | | | | | | Merge "docs: Modify Branding guidelines for Android form factors" into ↵Joe Fernandez2015-04-281-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-docs
| * | | | | | | docs: Modify Branding guidelines for Android form factorsJoe Fernandez2015-04-271-0/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19835619 Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
* | | | | | | Merge "docs: Add note about overriding onConnectedNodes() when listening for ↵Joe Fernandez2015-04-281-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | capability node changes." into lmp-mr1-ub-docs
| * | | | | | | docs: Add note about overriding onConnectedNodes() when listeningLuan Nguyen2015-04-271-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for capability node changes. bug: 20523695 Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
* | | | | | | | Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into ↵Joe Fernandez2015-04-282-30/+101
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | lmp-mr1-ub-docs
| * | | | | | | docs: Update Wearable API setup to mention addApiIfAvailable().Luan Nguyen2015-04-272-30/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20486912 Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
* | | | | | | | am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for ↵Scott Rowe2015-04-260-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android TV" into lmp-docs * commit '02e4f2fbe6e0511789d42d5942548158d2dd154f': docs: Supported media protocols, codecs, formats for Android TV
| * | | | | | | Merge "docs: Supported media protocols, codecs, formats for Android TV" into ↵Scott Rowe2015-04-242-4/+51
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | * | | | | | | docs: Supported media protocols, codecs, formats for Android TVScott Rowe2015-03-232-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
* | | | | | | | | am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in ↵Andrew Solovay2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings." into lmp-docs * commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08': Docs: Correcting section on how to escape quotes in strings.
| * | | | | | | | Merge "Docs: Correcting section on how to escape quotes in strings." into ↵Andrew Solovay2015-04-231-7/+23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | * | | | | | | | Docs: Correcting section on how to escape quotes in strings.Andrew Solovay2015-04-081-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior for single and double-quotes is different--I expanded this section to note how they differ. (New version of a Gerrit CL I abandoned because of a commit mess-up.) See first comment for doc stage location. bug: 19959941 Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
* | | | | | | | | | am 09cf4d50: Merge "docs: Update to doc on listening for ↵Andrew Solovay2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restrictions-changed intent" into lmp-docs * commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0': docs: Update to doc on listening for restrictions-changed intent
| * | | | | | | | | Merge "docs: Update to doc on listening for restrictions-changed intent" ↵Andrew Solovay2015-04-231-2/+12
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs
| | * | | | | | | | | docs: Update to doc on listening for restrictions-changed intentAndrew Solovay2015-03-201-2/+12
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per bug 19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED is only sent to dynamically-declared listeners, *not* to listeners declared in the manifest. Updated doc to note this. (The code snippet already showed how to dynamically declare a listener.) See first comment for doc stage location. bug: 19848206 Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
* | | | | | | | | | am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS ↵Quddus Chong2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parmesan release." into lmp-docs * commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3': docs: Added 3rd-party Javadocs for GMS Parmesan release.
| * | | | | | | | | Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docsQuddus Chong2015-04-22733-3472/+56636
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | docs: Added 3rd-party Javadocs for GMS Parmesan release.Quddus Chong2015-04-20733-3472/+56636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
* | | | | | | | | | | am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 ↵Quddus Chong2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Parmesan)." into lmp-docs * commit '789c59711e55be981ed2093228ded0c588e74ba0': docs: Added What's New section for GMS v7.3 (Parmesan).
| * | | | | | | | | | Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docsQuddus Chong2015-04-222-23/+122
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | docs: Added What's New section for GMS v7.3 (Parmesan).Quddus Chong2015-04-222-23/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
* | | | | | | | | | | | am 33ac358a: docs: Add Wear Capability trainingLuan Nguyen2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85': docs: Add Wear Capability training
| * | | | | | | | | | | docs: Add Wear Capability trainingLuan Nguyen2015-04-214-31/+4526
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20088602 Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
* | | | | | | | | | | | am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docsLuan Nguyen2015-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a': docs: Add Channel API summary for Wear.
| * | | | | | | | | | | Merge "docs: Add Channel API summary for Wear." into lmp-docsLuan Nguyen2015-04-211-0/+24
| |\ \ \ \ \ \ \ \ \ \ \