Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs

Browse Source 
am: 242f06cd

* commit '242f06cd6754069e35f255945cfa602f93ce3fb2':
  Revert "Updates for Play" April Fool's joke.

Change-Id: I97a999693f4f181bf567a14021e3dcd55a63252b
This commit is contained in:
Andrew Solovay
2016-04-01 18:46:28 +00:00
committed by android-build-merger
parent f4658e26cf 242f06cd67
commit 0015bf0180
4 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/html/images/distribute/hero-space.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 167 KiB

66
docs/html/index.jd
View File

@@ -16,8 +16,37 @@ nonavpage=true
})
</script>
<div class="dac-hero-carousel" data-carousel-query="collection:index/secondary/carousel">
</div>
<section class="dac-expand dac-hero dac-invert" style="background-color:#455A64">
<div class="wrap" style="max-width:1100px;margin-top:0">
<div class="col-7of16 col-push-9of16" style="padding-left:2em;">
<a href="{@docRoot}preview/index.html">
<h1 class="dac-hero-title">Android N Developer Preview</h1>
<p class="dac-hero-description">
Get ready for the next version of Android!
<strong>Test your apps</strong> on Nexus and other devices. Support new system
behaviors to <strong>save power and memory</strong>.
Extend your apps with <strong>multi-window UI</strong>,
<strong>direct reply notifications</strong> and more.
</p>
<a class="dac-hero-cta" href="/preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
Learn more
</a><!--<br>
<a class="dac-hero-cta" href="/preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
Update to Developer Preview (final SDK)
</a><br>-->
</a>
</div>
<div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:0em;padding-right:1.5em;">
<a href="{@docRoot}preview/index.html">
<img style="" class="dac-hero-image" src="/images/home/n-preview-hero.png"
srcset="/images/home/n-preview-hero.png 1x,
/images/home/n-preview-hero_2x.png 2x">
</a>
</div>
</div>
</section>
<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
<div class="wrap dac-offset-parent">
@@ -80,37 +109,8 @@ nonavpage=true
data-maxResults="3"></div>
</div></section>
<section class="dac-expand dac-hero dac-invert" style="background-color:#455A64">
<div class="wrap" style="max-width:1100px;margin-top:0">
<div class="col-7of16 col-push-9of16" style="padding-left:2em;">
<a href="{@docRoot}preview/index.html">
<h1 class="dac-hero-title">Android N Developer Preview</h1>
<p class="dac-hero-description">
Get ready for the next version of Android!
<strong>Test your apps</strong> on Nexus and other devices. Support new system
behaviors to <strong>save power and memory</strong>.
Extend your apps with <strong>multi-window UI</strong>,
<strong>direct reply notifications</strong> and more.
</p>
<a class="dac-hero-cta" href="/preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
Learn more
</a><!--<br>
<a class="dac-hero-cta" href="/preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
Update to Developer Preview
</a><br>-->
</a>
</div>
<div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:0em;padding-right:1.5em;">
<a href="{@docRoot}preview/index.html">
<img style="" class="dac-hero-image" src="/images/home/n-preview-hero.png"
srcset="/images/home/n-preview-hero.png 1x,
/images/home/n-preview-hero_2x.png 2x">
</a>
</div>
</div>
</section>
<div class="dac-hero-carousel" data-carousel-query="collection:index/secondary/carousel">
</div>
<section class="dac-section dac-gray"><div class="wrap">
<div class="cols"><div class="col-10of12 col-push-1of12">

1
docs/html/jd_collections.js
View File

@@ -16,7 +16,6 @@ var RESOURCE_COLLECTIONS = {
"index/secondary/carousel": {
"title": "",
"resources": [
"https://www.youtube.com/watch?v=dFrgNiweQDk",
"http://www.youtube.com/watch?v=9m6MoBM-sFI",
"http://www.youtube.com/watch?v=Pms0pcyPbAM",
"http://www.youtube.com/watch?v=e7t3svG9PTk",

17
docs/html/jd_extras.js
View File

@@ -3835,14 +3835,6 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
"tags" : "users,googleplay,googleio",
"summary": "Learn how to get new users, using Universal app campaigns directly within the Google Play Developer Console to increase your installs from ads, and find out how your acquisition channels perform.",
},
{
"url":"https://www.youtube.com/watch?v=dFrgNiweQDk",
"image": "images/distribute/hero-space.jpg",
"title": "The Guardian goes galactic with Android and Google Play",
"type":"youtube",
"tags" : "googleplay,developerstory,featured",
"summary": "The Guardian has been testing our new Material Design guidelines and Google Play Developer Console features to get their app ready for space flight. Hear how they optimized their app so that astronauts and space travellers can keep up with the news while in orbit.",
},
]);
var CAROUSEL_OVERRIDE = {
@@ -3858,15 +3850,8 @@ var CAROUSEL_OVERRIDE = {
"title": "Android 5.0 Lollipop",
"summary": "The Android 5.0 update adds a variety of new features for your apps, such as notifications on the lock screen, an all-new camera API, OpenGL ES 3.1, the new naterial design interface, and much more.",
},
"https://www.youtube.com/watch?v=dFrgNiweQDk": {
"url":"https://www.youtube.com/watch?v=dFrgNiweQDk&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
"image": "images/distribute/hero-space.jpg",
"title": "The Guardian goes galactic with Android and Google Play",
"type":"youtube",
"summary": "The Guardian has been testing our new Material Design guidelines and Google Play Developer Console features to get their app ready for space flight. Hear how they optimized their app so that astronauts and space travellers can keep up with the news while in orbit.",
},
"http://www.youtube.com/watch?v=Pms0pcyPbAM": {
"url":"https://www.youtube.com/watch?v=Pms0pcyPbAM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
"url":"https://www.youtube.com/watch?v=Pms0pcyPbAM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c]",
"image": "images/distribute/hero-carousel-giftedmom.jpg",
"title": "Gifted Mom reaches more mothers across Africa with Android",
"type":"youtube",