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

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

Merge "docs: change SearchableDictionary to "v2" and remove old "new"... 

Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
parents 7d167376 bf1d0b90

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ web_docs_sample_code_flags := \ 
                -samplecode $(sample_dir)/SampleSyncAdapter \

                            resources/samples/SampleSyncAdapter "Sample Sync Adapter" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            resources/samples/SearchableDictionary "Searchable Dictionary" \

		            resources/samples/SearchableDictionary "Searchable Dictionary v2" \

		-samplecode $(sample_dir)/Snake \

		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

docs/html/resources/resources_toc.cs

+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <ul>

      <li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">

            <span class="en">Platform Versions</span>

          </a>  <span class="new">new!</span></li>

          </a></li>

    </ul>

  </li>
@@ -36,7 +36,7 @@ 
      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>resources/articles/index.html">

               <span class="en">List of Articles</span>

             </a> <span class="new">new!</span></div>

             </a></div>

        <ul>

        <li><a href="<?cs var:toroot ?>resources/articles/avoiding-memory-leaks.html">

                <span class="en">Avoiding Memory Leaks</span>
@@ -85,7 +85,7 @@ 
                </a></li>

        <li><a href="<?cs var:toroot ?>resources/articles/live-wallpapers.html">

                <span class="en">Live Wallpapers</span>

                </a> <span class="new">new!</span></li>

                </a></li>

        <li><a href="<?cs var:toroot ?>resources/articles/on-screen-inputs.html">

                <span class="en">Onscreen Input Methods</span>

                </a></li>
@@ -118,7 +118,7 @@ 
                </a></li>

        <li><a href="<?cs var:toroot ?>resources/articles/contacts.html">

                <span class="en">Using the Contacts API</span>

                </a> <span class="new">new!</span></li>

                </a></li>

        <li><a href="<?cs var:toroot ?>resources/articles/using-webviews.html">

                <span class="en">Using WebViews</span>

                </a></li>
@@ -191,7 +191,7 @@ 
      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>resources/samples/index.html">

               <span class="en">List of Samples</span>

             </a> <span class="new">new!</span></div>

             </a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>resources/samples/ApiDemos/index.html">

                <span class="en">API Demos</span>
@@ -216,7 +216,7 @@ 
              </a></li>

          <li><a href="<?cs var:toroot ?>resources/samples/CubeLiveWallpaper/index.html">

                <span class="en">Live Wallpaper</span>

                </a> <span class="new">new!</span></li>

                </a></li>

          <li><a href="<?cs var:toroot ?>resources/samples/LunarLander/index.html">

                <span class="en">Lunar Lander</span>

              </a></li>
@@ -228,10 +228,10 @@ 
              </a></li>

          <li><a href="<?cs var:toroot ?>resources/samples/SampleSyncAdapter/index.html">

                <span class="en">Sample Sync Adapter</span>

              </a> <span class="new">new!</span></li>

          <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">

                <span class="en">Searchable Dictionary</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">

                <span class="en">Searchable Dictionary v2</span>

              </a> <span class="new">new!</span></li>

          <li><a href="<?cs var:toroot ?>resources/samples/Snake/index.html">

                <span class="en">Snake</span>

              </a></li>