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

Merge "docs: fix index pages" into klp-modular-dev

Browse Source
This commit is contained in:
Robert Ly
2014-06-16 01:41:10 +00:00
committed by Android (Google) Code Review
parent 09e2459cc3 1568c19fe3
commit d73b045090
6 changed files with 50 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docs/html/auto/index.jd
View File

@@ -13,29 +13,20 @@ page.type=about
}
</style>
<div id="video-container">
<div id="video-frame">
<div class="video-close">
<span id="icon-video-close">&nbsp;</span>
</div>
<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
<div id="ytapiplayer">
<a href="http://www.youtube.com/watch?v=0xQ3y902DEQ"><img width=940
src="https://i1.ytimg.com/vi/0xQ3y902DEQ/maxresdefault.jpg"></a><!--You need Flash player 8+ and JavaScript enabled to view this video. -->
</div>
</div>
</div>
<style>
#footer {
display: none;
}
.content-footer {
display: none;
}
</style>
<div class="landing-body-content">
<div class="landing-hero-container">
<div class="landing-section auto-hero">
<div class="landing-hero-scrim"></div>
<div class="landing-hero-wrap">
<div class="vertical-center-outer">
@@ -45,12 +36,11 @@ page.type=about
<div class="landing-section-header">
<div class="landing-h1 hero">Android Auto</div>
<div class="landing-subhead hero">Entertainment and services on your dashboard</div>
</div>
<div class="landing-hero-description">
<p>Maps, music, search and more in your vehicle, powered by your Android phone.
Voice actions and feedback. Useful local information. Clean user interfaces to
keep your eyes on the road.</p>
</div>
<div class="landing-hero-description">
<p>Display and control your handheld app in vehicles.
Build apps with easy-to-use UI templates that
let users keep ther eyes on the road.</p>
</div>
<div class="landing-body">
<a href="{@docRoot}auto/overview.html" class="landing-button landing-primary" style="margin-top: 40px;">

24
docs/html/index.jd
View File

@@ -13,7 +13,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
<div class="vcenter">
<div class="wrap clearfix">
<div class="resource-widget resource-flow-layout wrap col-16"
data-query="collection:launch/static"
data-query="collection:index/primary"
data-resourceStyle="card"
data-sortOrder="-timestamp"
data-numStacks="3"
@@ -28,10 +28,10 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
<div class="actions-bar">
<div class="wrap">
<div class="actions">
<div><a href="http://developer.android.com/sdk/index.html">Get the SDK</a></div>
<div><a href="http://developer.android.com/samples/index.html">Sample Code</a></div>
<div><a href="http://developer.android.com/design/videos/index.html">Videos</a></div>
<div><a href="https://developer.android.com/distribute/googleplay/developer-console.html">Developer Console</a></div>
<div><a href="{@docRoot}sdk/index.html">Get the SDK</a></div>
<div><a href="{@docRoot}samples/index.html">Browse Samples</a></div>
<div><a href="//www.youtube.com/user/androiddevelopers">Watch Videos</a></div>
<div><a href="{@docRoot}distribute/googleplay/developer-console.html">Manage Your Apps</a></div>
</div><!-- end .actions -->
</div><!-- end .wrap -->
</div><!-- end .actions-bar -->
@@ -45,20 +45,16 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
<div class="landing-h1">Android, Everywhere You Need It</div>
<div class="landing-subhead">
Android runs on hundreds of millions of handheld devices around the world, <br /> and it now supports these exciting, new form-factors.
</div>
</div>
<div class="landing-body">
<div class="landing-breakout cols">
<!--<div class="resource-widget resource-flow-layout col-16" data-query="collection:index/devices" data-sortorder="" data-cardsizes="6x2, 6x2, 6x2" data-maxresults="3"></div>-->
<!-- <div class="resource-widget resource-flow-layout col-16" data-query="collection:index/devices"
data-sortorder="" data-cardsizes="6x6, 6x6, 6x6" data-maxresults="3"></div>-->
<div class="col-3-wide">
<img src="{@docRoot}tv/images/placeholder-square.png" alt="">
<img src="" alt="">
<p>Wear</p>
<p class="landing-small">
@@ -70,7 +66,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
</div>
<div class="col-3-wide">
<img src="{@docRoot}tv/images/placeholder-square.png" alt="">
<img src="" alt="">
<p>TV</p>
<p class="landing-small">
@@ -82,7 +78,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
</div>
<div class="col-3-wide">
<img src="{@docRoot}tv/images/placeholder-square.png" alt="">
<img src="" alt="">
<p>Auto</p>
<p class="landing-small">

17
docs/html/jd_collections.js
View File

@@ -1,4 +1,21 @@
var RESOURCE_COLLECTIONS = {
"index/primary": {
"title": "",
"resources": [
"preview/index.html",
"preview/material/index.html",
"preview/material/index.html",
"preview/material/index.html"
]
},
"index/devices": {
"title": "",
"resources": [
"wear/index.html",
"tv/index.html",
"auto/index.html"
]
},
"launch/static": {
"title": "",
"resources": [

56
docs/html/tv/index.jd
View File

@@ -1,9 +1,10 @@
heropage.title=Android TV
page.title=Android TV
page.viewport_width=970
fullpage=true
no_footer_links=true
page.type=about
@jd:body
<style>
@@ -22,18 +23,6 @@ page.type=about
}
</style>
<div id="video-container">
<div id="video-frame">
<div class="video-close">
<span id="icon-video-close">&nbsp;</span>
</div>
<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
<div id="ytapiplayer">
<a href="http://www.youtube.com/watch?v=0xQ3y902DEQ"><img width=940
src="https://i1.ytimg.com/vi/0xQ3y902DEQ/maxresdefault.jpg"></a><!--You need Flash player 8+ and JavaScript enabled to view this video. -->
</div>
</div>
</div>
<div class="landing-body-content">
<div class="landing-hero-container">
@@ -47,48 +36,19 @@ page.type=about
<div class="col-10">
<div class="landing-section-header">
<div class="landing-h1 hero">Android TV</div>
<div class="landing-subhead hero">
<p>Big screen, big experience</p>
<div class="landing-subhead hero">Your apps on the big screen</div>
<div class="landing-hero-description">
<p>Engage users from the comfort of their couches.
Put your app on TV and bring everyone into
the action.</p>
</div>
<div class="landing-hero-description">
<p>Engage your users from the comfort of their couch.
Put your app on TV and bring the whole family into
the action.</p>
</div>
<div class="landing-body">
<a href="{@docRoot}wear/preview/start.html" class="landing-button landing-primary" style="margin-top: 40px;">
<a href="{@docRoot}preview/tv/index.html" class="landing-button landing-primary" style="margin-top: 40px;">
Get Started
</a>
<a id="watchVideo" href="https://youtube.googleapis.com/v/0xQ3y902DEQ">
<div class="landing-video-link">Watch the video</div>
</a>
<script>
$("#watchVideo").on("click", function(e) {
$("#video-container").fadeIn(400, function(){$("#video-frame").show()});
var params = { allowScriptAccess: "always"};
var atts = { id: "ytapiplayer" };
swfobject.embedSWF("//www.youtube.com/v/0xQ3y902DEQ?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1;autoplay=1",
"ytapiplayer", "940", "526.4", "8", null, null, params, atts);
e.preventDefault();
});
$("#icon-video-close").on("click", function() {
ytplayer = document.getElementById("ytapiplayer");
try {
ytplayer.stopVideo();
$(ytplayer).hide();
$("#video-container").fadeOut(400);
} catch(e) {
console.log('Video not available');
$("#video-container").fadeOut(400);
}
});
</script>
</div>
</div>
</div>
</div>
</div> <!-- end .wrap -->

BIN
docs/html/wear/images/hero.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 243 KiB

6
docs/html/wear/index.jd
View File

@@ -182,11 +182,9 @@ page.type=about
</div>
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
<<<<<<< HEAD
<!--
=======
>>>>>>> add page.types to various pages for dynamic content
<!--
<div class="landing-section landing-white-background">
<div class="wrap">
<div class="landing-section-header">