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

am 03fb5698: am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev

Browse Source 
* commit '03fb5698baba5686143385e0d5771d2e26d3665b':
  docs: add templated tabs for jb highlights
This commit is contained in:
Scott Main
2012-11-13 07:48:43 -08:00
committed by Android Git Automerger
parent a6e0fb0475 03fb5698ba
commit 67f46470a5
2 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
docs/html/about/versions/jelly-bean.jd
View File

@@ -1,37 +1,13 @@
page.title=Jelly Bean
tab1=Android 4.2
tab1.link=#android-42
tab2=Android 4.1
tab2.link=#android-41
@jd:body
<style>
h1 {
margin-bottom:0;
}
ul#version-tabs {
list-style:none;
border-bottom: 1px solid #93C;
padding:0;
height:29px;
margin:0 0 20px;
font-size:16px;
line-height:26px;
}
ul#version-tabs li {
display:block;
float:left;
margin-right:60px;
border-bottom: 3px solid transparent;
}
ul#version-tabs li.selected {
border-bottom: 3px solid #93C;
}
ul#version-tabs li a {
color:#333;
}
ul#version-tabs li a:hover,
ul#version-tabs li a:active {
color:#93C !important;
}
#android-41 {display:none;}
</style>
@@ -39,7 +15,7 @@ ul#version-tabs li a:active {
function revealSection(hashy) {
if (hashy != "" && !$(hashy).is(":visible")) {
sectionId = $(hashy).closest(".version-section").attr("id");
link = $("#version-tabs a[href$="+sectionId+"]");
link = $("#title-tabs a[href$="+sectionId+"]");
link.parent().addClass("selected");
link.parent().siblings().removeClass("selected");
@@ -56,7 +32,7 @@ function revealSection(hashy) {
}
$(document).ready(function() {
$("#version-tabs li a").each(function() {
$("#title-tabs li a").each(function() {
$(this).click(function(){
$(this).parent().addClass("selected");
$(this).parent().siblings().removeClass("selected");
@@ -78,13 +54,6 @@ window.onhashchange = function () {
<ul id="version-tabs">
<li class="selected"><a href="#android-42">Android 4.2</a></li>
<li><a href="#android-41">Android 4.1</a></li>
</ul>
<!-- BEGIN ANDROID 4.2 -->
<div id="android-42" class="version-section">
<div style="float:right;padding:0px 0px 12px 34px;">

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

@@ -51,11 +51,11 @@ page.title=Developer Tools
<li>Quickly capture bug reports onto the device.</li>
<li>Show CPU usage on screen.</li>
<li>Draw debugging information on screen such as layout bounds,
updates on GPU views and hardware layers, touch location, and others.</li>
updates on GPU views and hardware layers, and other information.</li>
<li>Plus many more options to simulate app stresses or enable debugging options.</li>
</ul>
<p>To access these on your device, open the <em>Developer options</em> in the
system Settings. Note that on Android 4.2 and higher, the Developer options screen is
<p>To access these settings, open the <em>Developer options</em> in the
system Settings. On Android 4.2 and higher, the Developer options screen is
hidden by default. To make it available, go to
<b>Settings > About phone</b> and tap <b>Build number</b> seven times. Return to the previous
screen to find Developer options.</p>