summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. ↵Dirk Dougherty2012-10-243-892/+0
|\ | | | | | | | | | | | | These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs * commit '1a13c317627996234a1dfa2c0736733bd1c4c696': Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
| * am a4375a19: Merge "Doc change: clean up a few stray css files. These are ↵Dirk Dougherty2012-10-243-892/+0
| |\ | | | | | | | | | | | | | | | | | | moved to frameworks/base/docs/image_sources/*." into jb-dev-docs * commit 'a4375a19c6ff958d33d62ee96f6ccdde223b0c7a': Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
| | * Merge "Doc change: clean up a few stray css files. These are moved to ↵Dirk Dougherty2012-10-243-892/+0
| | |\ | | | | | | | | | | | | frameworks/base/docs/image_sources/*." into jb-dev-docs
| | | * Doc change: clean up a few stray css files. These are moved to ↵Dirk Dougherty2012-10-133-892/+0
| | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/docs/image_sources/*. Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
* | | | am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepageScott Main2012-10-221-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6613a2327512f3742d55cf0eb79fc4d52cf9a7cb': fix spacing in carousel text for Develop homepage
| * | | am 0e585706: fix spacing in carousel text for Develop homepageScott Main2012-10-221-4/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0e585706f0199f9d277e0d099ece682a2ee502ef': fix spacing in carousel text for Develop homepage
| | * | fix spacing in carousel text for Develop homepageScott Main2012-10-221-4/+10
| | |/ | | | | | | | | | Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
* | | am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.Dirk Dougherty2012-10-112-4/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'e37b7a52abb488f853fefa1a13eec1b5c20844a6': Doc change: add new items to qv and adjust height.
| * | am 8f20607c: Doc change: add new items to qv and adjust height.Dirk Dougherty2012-10-112-4/+6
| |\ \ | | |/ | | | | | | | | | * commit '8f20607ccb9c41469eec8f1f481d8d841bbeb2a1': Doc change: add new items to qv and adjust height.
| | * Doc change: add new items to qv and adjust height.Dirk Dougherty2012-10-112-4/+6
| | | | | | | | | | | | Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
* | | am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pagesScott Main2012-10-081-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b': fix layout bug on API Guide landing pages
| * | am e6850d2d: fix layout bug on API Guide landing pagesScott Main2012-10-081-0/+1
| |\ \ | | |/ | | | | | | | | | * commit 'e6850d2db787a4e268b5cee57d74e9308180a589': fix layout bug on API Guide landing pages
| | * fix layout bug on API Guide landing pagesScott Main2012-10-081-0/+1
| | | | | | | | | | | | Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
* | | am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloadsScott Main2012-10-031-9/+18
|\ \ \ | |/ / | | | | | | | | | * commit '860287560db20e6f46a282284d8a04d5e001d2ea': add analytics tracking event for sdk/ndk downloads
| * | am 46c5804c: add analytics tracking event for sdk/ndk downloadsScott Main2012-10-031-9/+18
| |\ \ | | |/ | | | | | | | | | * commit '46c5804c47e02206a4c97c0890991c2d3bff87bf': add analytics tracking event for sdk/ndk downloads
| | * add analytics tracking event for sdk/ndk downloadsScott Main2012-10-031-9/+18
| | | | | | | | | | | | Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605
* | | am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of ↵Scott Main2012-10-021-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | page to account for russian string length * commit '9341d398a87fd9679366fafbbc398601c4c01de4': adjust position of prev/next links at bottom of page to account for russian string length
| * | am a4888dc8: adjust position of prev/next links at bottom of page to account ↵Scott Main2012-10-021-6/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | for russian string length * commit 'a4888dc8657c46ff3fec9ae2e840432255d40a88': adjust position of prev/next links at bottom of page to account for russian string length
| | * adjust position of prev/next links at bottom of page to account for russian ↵Scott Main2012-10-021-6/+6
| | | | | | | | | | | | | | | | | | string length Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13
* | | am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev ↵Scott Main2012-10-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 * commit '5150b1f770301f5359c07da1be5ce0fdaf342ba9': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
| * | am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: ↵Scott Main2012-10-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Iaab2b30349943a236607d54394019fa8d89de800 * commit 'f3d0104a8039af22daab02a914c6639fe078c9a6': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
| | * DO NOT MERGEScott Main2012-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 provide more width for buttons in training top nav to accomodate longer strings from translation Change-Id: Ia1d8f7caa532ad1060d8a54fda082ada754c1f48
* | | am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev ↵Scott Main2012-10-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit '142158bd218421741d6d133e9ebbb1203ae6e6a6': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
| * | am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: ↵Scott Main2012-10-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit '6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
| | * DO NOT MERGEScott Main2012-10-024-247/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title. Change-Id: I09c65a8dce9b3d9623e32fe17876b055e452618b
* | | am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev ↵Scott Main2012-10-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings * commit 'f5878b3ea31a04d13888f14bd652340da8a38437': DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
| * | am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: ↵Scott Main2012-10-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings * commit 'aa2ce5d9aa16d72e4f5c4203bc9a8c6f87d83719': DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
| | * DO NOT MERGEScott Main2012-10-024-25/+182
| | | | | | | | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings Change-Id: I02b6c5b5d83247a352dc041e9885befe82502adc
* | | am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from ↵Scott Main2012-10-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs * commit 'e0cc9e30520b0fb7690b3f4724fc0ce77c7f03e4': DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
| * | am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: ↵Scott Main2012-10-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs * commit '24bbcd5026cd8de5a77cd09ec8754753fff2280b': DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
| | * DO NOT MERGEScott Main2012-10-022-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407
* | | am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev ↵Scott Main2012-10-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them * commit '61e63c8a4bdb6174a08023d4b55fe2af896ed878': DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
| * | am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: ↵Scott Main2012-10-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them * commit '52948fcf8ccdad1f4ba91d63ece2022e2d807aff': DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
| | * DO NOT MERGEScott Main2012-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977
* | | am 0c81a130: provide more width for buttons in training top nav to ↵Scott Main2012-10-021-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | accomodate longer strings from translation * commit '0c81a130ef01981a0cbc3564c26658c51951812d': provide more width for buttons in training top nav to accomodate longer strings from translation
| * | provide more width for buttons in training top nav to accomodate longerScott Main2012-10-021-3/+3
| | | | | | | | | | | | | | | | | | strings from translation Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* | | am 235f4d4f: refactor the logic for changing languages in global strings. ↵Scott Main2012-10-024-247/+162
|\ \ \ | |/ / | | | | | | | | | | | | | | | instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title. * commit '235f4d4f8580a56d553e19c1beab1f8c22132e84': refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
| * | refactor the logic for changing languages in global strings.Scott Main2012-10-024-247/+162
| | | | | | | | | | | | | | | | | | | | | | | | instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title. Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* | | am dd3d3eea: add localize langs for global stringsScott Main2012-10-024-25/+182
|\ \ \ | |/ / | | | | | | | | | * commit 'dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f': add localize langs for global strings
| * | add localize langs for global stringsScott Main2012-10-024-25/+182
| | | | | | | | | | | | Change-Id: I90412e1e03a2676d927796187fe811481bf38455
| | |
| \ \
*-. \ \ Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83
| | * | | JRO03XThe Android Automerger2012-09-281-1/+1
| | | | |
| * | | | JZO54KThe Android Automerger2012-10-021-1/+1
| | | | |
* | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-280-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211
| * | | | JZO54JThe Android Automerger2012-09-281-1/+1
| | | | |
* | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
| * | | | JZO54IThe Android Automerger2012-09-251-1/+1
| | | | |
* | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
| * | | | JZO54HThe Android Automerger2012-09-211-1/+1
| | | | |
* | | | | am 582db97b: add style for code captions; ignore sidenav headers for HRsScott Main2012-09-212-6/+13
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71': add style for code captions; ignore sidenav headers for HRs
generated by cgit v1.1 at 2024-10-27 05:24:17 +0000