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

Commit f0b3fa60 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from...

am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items

Merge commit '3d40cd50' into gingerbread-plus-aosp

* commit '3d40cd50':
  update featured videos
parents 41d21efd 3d40cd50
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -167,14 +167,12 @@
          </a></li>
          </a></li>
      <li><a href="<?cs var:toroot ?>resources/tutorials/testing/helloandroid_test.html">
      <li><a href="<?cs var:toroot ?>resources/tutorials/testing/helloandroid_test.html">
            <span class="en">Hello Testing</span></a>
            <span class="en">Hello Testing</span></a>
            <span class="new">new!</span>
      </li>
      </li>
      <li><a href="<?cs var:toroot ?>resources/tutorials/notepad/index.html">
      <li><a href="<?cs var:toroot ?>resources/tutorials/notepad/index.html">
            <span class="en">Notepad Tutorial</span>
            <span class="en">Notepad Tutorial</span>
          </a></li>
          </a></li>
      <li><a href="<?cs var:toroot ?>resources/tutorials/testing/activity_test.html">
      <li><a href="<?cs var:toroot ?>resources/tutorials/testing/activity_test.html">
            <span class="en">Activity Testing</span></a>
            <span class="en">Activity Testing</span></a>
            <span class="new">new!</span>
      </li>
      </li>
    </ul>
    </ul>
  </li>
  </li>
+6 −8
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@
      </li>
      </li>
    </ul>
    </ul>
    <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-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.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>
      <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Platform</a></li>
@@ -75,8 +75,7 @@
      </li>
      </li>
    </ul>
    </ul>
    <ul>
    <ul>
      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a>
      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a></li>
      <span class="new">new!</span></li>
      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">USB Driver for
      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">USB Driver for
      Windows, r3</a>
      Windows, r3</a>
      </li>
      </li>
@@ -116,8 +115,7 @@
      <span style="display:none" class="zh-TW"></span>
      <span style="display:none" class="zh-TW"></span>
    </h2>
    </h2>
    <ul>
    <ul>
      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a>
      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a></li>
      <span class="new">new!</span></li>
    </ul>
    </ul>
  </li>
  </li>
  <li>
  <li>
+66 −66
Original line number Original line Diff line number Diff line
@@ -37,12 +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 2.0 Release
// Android UI design patterns
  'opZ69P-0Jbc' : "The Android 2.0 platform adds exciting new user features and developer APIs. Here's an introduction to what's new.",
  'M1ZBjlCRfz0' : "The Android user experience team provides suggestions for how to make your applications more useable and engaging.",
// How to Make your Android UI Fast..
// The world of ListView
  'N6YdwzAvwOA' : "Make your user interface fast, with more efficient AdapterViews, better bitmap scaling, faster redrawing, ViewStub layouts, fewer Views, and more.", 
  '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.",
// How Do I Code Thee?
// Debugging Arts of the Ninja Masters
  'GARMe7Km_gk' : "If you'd like to augment your Android applications with pieces written in JavaScript or native code, watch this video."
  '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),
/* When an event on the browser history occurs (back, forward, load),