Merge branch 'froyo' into froyo-release
diff --git a/target/product/generic.mk b/target/product/generic.mk
index 61b6dd5..f05c441 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -35,6 +35,7 @@
Mms \
Music \
Provision \
+ Protips \
QuickSearchBox \
Settings \
Sync \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index d9d88fa..c0e6c6d 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -29,6 +29,7 @@
Gallery \
GPSEnable \
Launcher2 \
+ Protips \
Music \
Mms \
Settings \
@@ -53,6 +54,8 @@
PRODUCT_COPY_FILES := \
system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \
+ frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
+ frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 2d1708a..750567e 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -28,21 +28,21 @@
color:#000;
font-size:13px;
color:#333;
- background-image:url(images/bg_fade.jpg);
+ background-image:url(images/bg_fade.jpg);
background-repeat:repeat-x;
}
-a, a code {
+a, a code {
color:#006699;
}
a:active,
-a:active code {
+a:active code {
color:#f00;
}
a:visited,
-a:visited code {
+a:visited code {
color:#006699;
}
@@ -107,7 +107,7 @@
padding:0;
}
-dt {
+dt {
margin:0;
padding:0;
}
@@ -129,7 +129,9 @@
margin:.5em 0 0 1em;
}
-dd pre, dd table, dd img {
+dd pre,
+#jd-content dd table,
+#jd-content dd img {
margin:1em 0 0 1em;
}
@@ -226,7 +228,7 @@
#header ul {
list-style: none;
- margin: 7px 0 0;
+ margin: 7px 0 0;
padding: 0;
height: 29px;
}
@@ -340,7 +342,7 @@
}
#mainBodyFixed h2,
-#mainBodyFluid h2 {
+#mainBodyFluid h2 {
color:#336666;
font-size:1.25em;
margin: 0;
@@ -348,7 +350,7 @@
}
#mainBodyFixed h1,
-#mainBodyFluid h1 {
+#mainBodyFluid h1 {
color:#435A6E;
font-size:1.7em;
margin: 1em 0;
@@ -356,7 +358,7 @@
#mainBodyFixed .green,
#mainBodyFluid .green,
-#jd-content .green {
+#jd-content .green {
color:#7BB026;
background-color:none;
}
@@ -364,13 +366,13 @@
#mainBodyLeft {
float: left;
width: 600px;
- margin-right: 20px;
+ margin-right: 20px;
color: #333;
position:relative;
}
div.indent {
- margin-left: 40px;
+ margin-left: 40px;
margin-right: 70px;
}
@@ -583,7 +585,7 @@
.gsc-cursor-box .gsc-cursor div.gsc-cursor-page,
.gsc-cursor-box .gsc-trailing-more-results a.gsc-trailing-more-results,
-#leftSearchControl a,
+#leftSearchControl a,
#leftSearchControl a b {
color:#006699;
}
@@ -669,7 +671,7 @@
#homeTitle {
padding:15px 15px 0;
- height:30px;
+ height:30px;
}
#homeTitle h2 {
@@ -704,8 +706,8 @@
}
#carouselMain {
- background: url(images/home/bg_home_carousel_board.png) 0 0 no-repeat;
- height:auto;
+ background: url(images/home/bg_home_carousel_board.png) 0 0 no-repeat;
+ height:auto;
padding: 25px 21px 0;
overflow:hidden;
position:relative;
@@ -717,19 +719,19 @@
}
#carouselMain .bulletinDesc h3 {
- margin:0;
- padding:0;
+ margin:0;
+ padding:0;
}
#carouselMain .bulletinDesc p {
- margin:0;
- padding:0.7em 0 0;
+ margin:0;
+ padding:0.7em 0 0;
}
#carouselWheel {
- background: url(images/home/bg_home_carousel_wheel.png) 0 0 no-repeat;
- padding-top:40px;
- height:150px;
+ background: url(images/home/bg_home_carousel_wheel.png) 0 0 no-repeat;
+ padding-top:40px;
+ height:150px;
}
.clearer { clear:both; }
@@ -748,17 +750,17 @@
margin:35px 10px 0 0;
}
a.arrow-left-off,
-a#arrow-left.arrow-left-off:hover {
+a#arrow-left.arrow-left-off:hover {
background-position:0 0;
}
-a.arrow-right-off,
-a#arrow-right.arrow-right-off:hover {
+a.arrow-right-off,
+a#arrow-right.arrow-right-off:hover {
background-position:-42px 0;
}
-a#arrow-left:hover {
+a#arrow-left:hover {
background-position:0 -42px;
}
-a#arrow-right:hover {
+a#arrow-right:hover {
background-position:-42px -42px;
}
a.arrow-left-on {
@@ -778,17 +780,17 @@
width:100%;
}
-div#list-clip {
- height:110px;
+div#list-clip {
+ height:110px;
width:438px;
- overflow:hidden;
- position:relative;
- float:left;
+ overflow:hidden;
+ position:relative;
+ float:left;
}
-div#app-list {
- left:0;
- z-index:1;
+div#app-list {
+ left:0;
+ z-index:1;
position:absolute;
margin:11px 0 0;
_margin-top:13px;
@@ -817,14 +819,14 @@
top:-4px;
}
-#app-list img {
+#app-list img {
width:90px;
height:70px;
margin:0;
}
-#app-list a.selected,
-#app-list a:active.selected,
+#app-list a.selected,
+#app-list a:active.selected,
#app-list a:hover.selected {
background:#A4C639;
color:#fff;
@@ -832,12 +834,12 @@
text-decoration:none;
}
-#app-list a:hover,
+#app-list a:hover,
#app-list a:active {
background:#ff9900;
}
-#app-list a:hover span,
+#app-list a:hover span,
#app-list a:active span {
text-decoration:underline;
}
@@ -851,7 +853,7 @@
/*IE6*/
* html #app-list a { zoom: 1; margin:0 24px 0 15px;}
-* html #list-clip {
+* html #list-clip {
width:430px !important;
}
@@ -1146,13 +1148,13 @@
}
#mainBodyRight ul.videoPreviews p {
- line-height:1.2em;
+ line-height:1.2em;
padding:0;
margin:4px 0 0 130px;
}
#mainBodyRight ul.videoPreviews img {
- margin-top:5px;
+ margin-top:5px;
}
/* Pretty printing styles. Used with prettify.js. */
@@ -1164,8 +1166,10 @@
.lit { color: #066; }
.pun { color: #660; }
.pln { color: #000; }
+dl.tag-list dt code,
.tag { color: #008; }
-.atn { color: #606; }
+dl.atn-list dt code,
+.atn { color: #828; }
.atv { color: #080; }
.dec { color: #606; }
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css
index 47a30a3..98f2d5e 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates/assets/android-developer-docs.css
@@ -100,7 +100,6 @@
#side-nav li a+a {
padding: 0;
}
-
/*second level (nested) list*/
#side-nav li li li a {
padding: 0 0 0 28px;
@@ -518,8 +517,7 @@
color:#111;
border-top:2px solid #ccc;
padding: .5em 0 0;
- margin: 1.5em 0 1em 0;
- max-width:968px;
+ margin: 2em 0 1em 0;
}
#jd-content h3 {
@@ -545,6 +543,10 @@
position:inherit;
}
+#jd-content table {
+ margin: 0 0 1em 1em;
+}
+
#jd-content img {
margin: 0 0 1em 1em;
}
@@ -807,13 +809,17 @@
div.figure {
float:right;
clear:right;
- padding:0 0 20px 20px;
+ padding:1em 0 1em 2em;
+ background-color:#fff;
/* width must be defined w/ an inline style matching the image width */
}
-#jd-content div.figure img {
- display:block;
- margin:0 0 10px 0;
+p.img-caption {
+ margin: -0.5em 0 1em 1em; /* matches default img left-margin */
+}
+
+p.table-caption {
+ margin: 0 0 0.5em 1em; /* matches default table left-margin */
}
/* BEGIN quickview sidebar element styles */
@@ -967,7 +973,7 @@
td.image-caption-i {
font-size:92%;
- padding:0;
+ padding:0 5px;
margin:0;
border:0;
}
@@ -982,10 +988,6 @@
text-align:center;
}
-.image-list .caption {
- margin:0 2px;
-}
-
td.image-caption-c {
font-size:92%;
padding:1em 2px 2px 2px;
