From d25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Thu, 15 Dec 2011 13:11:12 -0800
Subject: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id:
 If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from
 side navs

Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
---
 docs/html/guide/guide_toc.cs          | 21 ++++++++++-----------
 docs/html/resources/resources-data.js |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 3eb7286edcdb..bfde56cfcdbc 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -85,7 +85,7 @@
       <li class="toggle-list">
           <div><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">
             <span class="en">Content Providers</span>
-          </a><span class="new">updated</span></div>
+          </a></div>
           <ul>
             <li><a href="<?cs var:toroot ?>guide/topics/providers/calendar-provider.html">
                   <span class="en">Calendar Provider</span></a>
@@ -119,7 +119,7 @@
               </a></li>
           <li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html">
                <span class="en">Action Bar</span>
-              </a> <span class="new">updated</span></li>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/topics/ui/dialogs.html">
                 <span class="en">Dialogs</span>
               </a></li>
@@ -253,7 +253,7 @@
             <span class="new">new!</span></li>
           <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">
               <span class="en">OpenGL</span>
-            </a><span class="new">updated</span></li>
+            </a></li>
         </ul>
       </li>
       <li class="toggle-list">
@@ -288,7 +288,7 @@
       <li class="toggle-list">
           <div><a href="<?cs var:toroot ?>guide/topics/media/index.html">
             <span class="en">Multimedia and Camera</span>
-          </a><span class="new">updated</span></div>
+          </a></div>
           <ul>
             <li><a href="<?cs var:toroot ?>guide/topics/media/mediaplayer.html">
                   <span class="en">Media Playback</span></a>
@@ -662,7 +662,7 @@
     <ul>
       <li><a href="<?cs var:toroot ?>guide/publishing/publishing_overview.html">
             <span class="en">Publishing Overview</span>
-          </a><span class="new">new!</span></li>
+          </a></li>
       <li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">
             <span class="en">Preparing for Release</span>
             <span class="de" style="display:none">Vorbereitung auf die Veröffentlichung</span>
@@ -672,7 +672,7 @@
             <span class="ja" style="display:none">公開の準備</span>
             <span class="zh-CN" style="display:none">准备发布</span>
             <span class="zh-TW" style="display:none">準備發佈</span>
-          </a><span class="new">updated</span></li>
+          </a></li>
       <li><a href="<?cs var:toroot ?>guide/publishing/app-signing.html">
             <span class="en">Signing Your Applications</span>
             <span class="de" style="display:none">Signieren Ihrer Anwendungen</span>
@@ -735,7 +735,7 @@ applications</span>
       <li class="toggle-list">
         <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">
                <span class="en">UI Guidelines</span>
-             </a> <span class="new-child">updated</span></div>
+             </a></div>
         <ul>
           <li class="toggle-list">
             <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">
@@ -767,7 +767,7 @@ applications</span>
           </li>
           <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">
                 <span class="en">App Widget Design</span>
-              </a> <span class="new">updated</span></li>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/activity_task_design.html">
                 <span class="en">Activity and Task Design</span>
               </a></li>
@@ -799,8 +799,7 @@ applications</span>
           </a></li>
       <li><a href="<?cs var:toroot ?>guide/practices/security.html">
             <span class="en">Designing for Security</span></a>
-            <span class="new">new!</span><!-- 11/7/10 -->
-          </li>
+            </li>
     </ul>
   </li>
 
@@ -845,7 +844,7 @@ applications</span>
           </a></li>
       <li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">
             <span class="en">Supported Media Formats</span>
-          </a> <span class="new">updated</span></li>
+          </a></li>
       <li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">
             <span class="en">Intents List: Google Apps</span>
           </a></li>
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 226ff9e5da96..8ad970ba7c45 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -883,7 +883,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['tutorial', 'gl', 'new'],
+    tags: ['tutorial', 'gl'],
     path: 'tutorials/opengl/opengl-es10.html',
     title: {
       en: 'OpenGL ES 1.0'
@@ -893,7 +893,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['tutorial', 'gl', 'new'],
+    tags: ['tutorial', 'gl'],
     path: 'tutorials/opengl/opengl-es20.html',
     title: {
       en: 'OpenGL ES 2.0'
-- 
cgit v1.2.3-59-g8ed1b