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

am 4d484a82: Merge change 24700 into donut

Browse Source 
Merge commit '4d484a823d336ea587e37508fe73178d711dcdca' into eclair

* commit '4d484a823d336ea587e37508fe73178d711dcdca':
  docs only.
This commit is contained in:
Scott Main
2009-09-11 10:49:33 -07:00
committed by Android Git Automerger
parent e1a9de7a2e 4d484a823d
commit aab72e7c77
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docs/html/sdk/android-1.6-highlights.jd
View File

@@ -5,7 +5,8 @@ sdk.date=September 2009
<style type="text/css"> <style type="text/css">
#jd-content div.screenshot { #jd-content div.screenshot,
#jd-content div.video {
float:right; float:right;
clear:right; clear:right;
padding:15px 70px; padding:15px 70px;
@@ -13,11 +14,25 @@ sdk.date=September 2009
font-weight:bold; font-weight:bold;
line-height:1.7em; line-height:1.7em;
} }
#jd-content div.video {
padding-top:0;
margin-top:-15px;
}
#jd-content div.screenshot img { #jd-content div.screenshot img {
margin:0; margin:0;
} }
</style> </style>
<div class="video">
<object width="293" height="180">
<param name="movie" value="http://www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&"></param>
<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
<embed src="http://www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&" type="application/x-shockwave-flash"
allowscriptaccess="always" allowfullscreen="true" width="293" height="180"></embed>
</object>
</div>
<p>The Android 1.6 platform introduces new features for users and developers. <p>The Android 1.6 platform introduces new features for users and developers.
This page provides an overview of some new features and technologies.</p> This page provides an overview of some new features and technologies.</p>
@@ -29,7 +44,7 @@ This page provides an overview of some new features and technologies.</p>
<h2 id="UserFeatures">New User Features</h2> <h2 id="UserFeatures" style="clear:right">New User Features</h2>
<!-- screenshots float right --> <!-- screenshots float right -->

4
docs/html/videos/index.jd
View File

@@ -37,10 +37,12 @@ var playlistsWithTitleInDescription = "734A052F802C96B9";
* Each playlist ID is paired with a custom video description. * Each playlist ID is paired with a custom video description.
*/ */
var featured = { var featured = {
// Android 1.6 Release
'MBRFkLKRwFw' : "The Android 1.6 release includes new features and improvements to the Android platform. Here's an introduction to what's new in Android 1.6.",
// How to Make your Android UI Fast.. // How to Make your Android UI Fast..
'N6YdwzAvwOA' : "Make your user interface fast, with more efficient AdapterViews, better bitmap scaling, faster redrawing, ViewStub layouts, fewer Views, and more.", 'N6YdwzAvwOA' : "Make your user interface fast, with more efficient AdapterViews, better bitmap scaling, faster redrawing, ViewStub layouts, fewer Views, and more.",
// Coding for Life: Battery Life // Coding for Life: Battery Life
'OUemfrKe65c' : "Learn what kinds of operations consume the most battery and how you can reduce your usage, with tips for parsing and zipping data, using wakelocks, and running a Service.", // 'OUemfrKe65c' : "Learn what kinds of operations consume the most battery and how you can reduce your usage, with tips for parsing and zipping data, using wakelocks, and running a Service.",
// How Do I Code Thee? // How Do I Code Thee?
'GARMe7Km_gk' : "If you'd like to augment your Android applications with pieces written in JavaScript or native code, watch this video." 'GARMe7Km_gk' : "If you'd like to augment your Android applications with pieces written in JavaScript or native code, watch this video."
}; };