Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd44bf9c authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of f0b3fa60 to master"

parents 068ee16b 024127c1
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@
  </li><?cs
  /if
?>

  <li>
    <h2><span class="en">More</span>
    </h2>
+6 −8
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@
      </li>
    </ul>
    <ul>
      <li><a href="<?cs var:toroot ?>sdk/android-2.2.html">Android 2.2 Platform</a> <span class="new">new!</span></li>
      <li><a href="<?cs var:toroot ?>sdk/android-2.2.html">Android 2.2 Platform</a></li>
      <li><a href="<?cs var:toroot ?>sdk/android-2.1.html">Android 2.1 Platform</a></li>
      <li><a href="<?cs var:toroot ?>sdk/android-1.6.html">Android 1.6 Platform</a></li>
      <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Platform</a></li>
@@ -75,8 +75,7 @@
      </li>
    </ul>
    <ul>
      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a>
      <span class="new">new!</span></li>
      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a></li>
      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">USB Driver for
      Windows, r3</a>
      </li>
@@ -116,8 +115,7 @@
      <span style="display:none" class="zh-TW"></span>
    </h2>
    <ul>
      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a>
      <span class="new">new!</span></li>
      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a></li>
    </ul>
  </li>
  <li>
+66 −66
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ var playlistsWithTitleInDescription = "734A052F802C96B9";
 * Each playlist ID is paired with a custom video description.
 */
var featured = {
// Android 2.0 Release
  'opZ69P-0Jbc' : "The Android 2.0 platform adds exciting new user features and developer APIs. Here's an introduction to what's new.",
// 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.", 
// 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."
// Android UI design patterns
  'M1ZBjlCRfz0' : "The Android user experience team provides suggestions for how to make your applications more useable and engaging.",
// The world of ListView
  'wDBM6wVEO70' : "ListView is a common widget that's customizable, but can be tricky to polish, so this talk shows how you can provide the best performance.",
// Debugging Arts of the Ninja Masters
  'Dgnx0E7m1GQ' : "The Android SDK includes tools to debug your apps like a ninja. Enter the dojo and become a master at debugging your apps."
};

/* When an event on the browser history occurs (back, forward, load),