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

Commit 35a5108f authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 05cc5c65: am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change:...

am 05cc5c65: am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.

# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '05cc5c65':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
parents 35e83273 05cc5c65
Loading
Loading
Loading
Loading
+328 −0
Original line number Original line Diff line number Diff line
# Redirects file.
# This file contains the list of rewrite rules that are applied when serving
# pages. Add "pattern: True" to use python regex in to or from.
#
#   WATCH OUT -- FROM LINE HAS TO START WITH A HYPHEN

redirects:
- from: ^/sdk/android-(.*$)
  to: /about/versions/android-\1
  pattern: True

- from: /sdk/adding-components.html
  to: /sdk/exploring.html

- from: /sdk/compatibility-library.html
  to: /tools/extras/support-library.html

- from: /sdk/eclipse-adt.html
  to: /tools/sdk/eclipse-adt.html

- from: /sdk/installing.html
  to: /sdk/installing/index.html

- from: /sdk/installing/next.html
  to: /training/basics/firstapp/index.html

- from: /sdk/ndk/...
  to: /tools/sdk/ndk/...

- from: /sdk/oem-usb.html
  to: /tools/extras/oem-usb.html

- from: /sdk/tools-notes.html
  to: /tools/sdk/tools-notes.html

- from: /sdk/requirements.html
  to: /sdk/index.html

# ------------------- GUIDE -------------------

- from: /guide/market/...
  to: /google/play/...

- from: /guide/google/gcm/client-javadoc/...
  to: /reference/com/google/android/gcm/package-summary.html

- from: /guide/google/gcm/server-javadoc/...
  to: /reference/com/google/android/gcm/server/package-summary.html

- from: /guide/google/play/services.html
  to: /google/play-services/index.html

- from: /guide/google/...
  to: /google/...

- from: /guide/publishing/licensing.html
  to: /google/play/licensing/index.html

- from: /google/play/billing/billing_about.html
  to: /google/play/billing/index.html

- from: /guide/developing/tools/...
  to: /tools/help/...

- from: /guide/developing/...
  to: /tools/...

- from: /tools/aidl.html
  to: /guide/components/aidl.html

- from: /guide/publishing/publishing.html
  to: /distribute/googleplay/publish/preparing.html

- from: /guide/publishing/...
  to: /tools/publishing/...

- from: /guide/topics/fundamentals.html
  to: /guide/components/fundamentals.html

- from: /guide/topics/intents/intents-filters.html
  to: /guide/components/intents-filters.html

- from: /guide/topics/fundamentals/...
  to: /guide/components/...

- from: /guide/topics/clipboard/copy-paste.html
  to: /guide/topics/text/copy-paste.html

- from: /guide/topics/ui/notifiers/index.html
  to: /guide/topics/ui/notifiers/notifications.html

- from: /guide/topics/wireless/...
  to: /guide/topics/connectivity/...

- from: /guide/topics/drawing/...
  to: /guide/topics/graphics/opengl.html

- from: /guide/topics/connectivity/usb/adk.html
  to: /tools/adk/index.html

- from: /tools/adk/aoa.html
  to: http://source.android.com/tech/accessories/aoap/aoa.html

- from: /tools/adk/aoa2.html
  to: http://source.android.com/tech/accessories/aoap/aoa2.html

- from: /guide/topics/usb/...
  to: /guide/topics/connectivity/usb/...

- from: /guide/appendix/api-levels.html
  to: /guide/topics/manifest/uses-sdk-element.html#ApiLevels

- from: /guide/appendix/install-location.html
  to: /guide/topics/data/install-location.html

- from: /guide/basics/what-is-android.html
  to: /about/index.html

- from: /guide/topics/security/security.html
  to: /training/articles/security-tips.html
#  type: permanent
#  comment: Move content and then adjust this

- from: /guide/appendix/market-filters.html
  to: /google/play/filters.html

- from: /guide/topics/testing/...
  to: /tools/testing/...

- from: /guide/topics/graphics/animation.html
  to: /guide/topics/graphics/overview.html

- from: /guide/topics/graphics/renderscript.html
  to: /guide/topics/renderscript/index.html

- from: /guide/topics/graphics/renderscript/
  to: /guide/topics/renderscript/index.html

- from: /guide/topics/location/obtaining-user-location.html
  to: /guide/topics/location/strategies.html

- from: /guide/topics/nfc/...
  to: /guide/topics/connectivity/nfc/...

- from: /guide/topics/wireless/...
  to: /guide/topics/connectivity/...

- from: /guide/topics/network/...
  to: /guide/topics/connectivity/...

- from: /resources/articles/creating-input-method.html
  to: /guide/topics/text/creating-input-method.html

- from: /resources/articles/spell-checker-framework.html
  to: /guide/topics/text/spell-checker-framework.html

- from: /resources/tutorials/notepad/...
  to: /training/notepad/...

- from: /resources/faq/...
  to: /guide/faq/...

- from: /resources/tutorials/hello-world.html
  to: /training/basics/firstapp/index.html

# add the rest of the tutorials here

- from: /guide/practices/design/...
  to: /guide/practices/...

- from: /guide/practices/accessibility.html
  to: /guide/topics/ui/accessibility/index.html

# move best practices to training

- from: /guide/practices/app-design/performance.html
  to: /training/articles/perf-tips.html

- from: /guide/practices/performance.html
  to: /training/articles/perf-tips.html

- from: /guide/practices/app-design/responsiveness.html
  to: /training/articles/perf-anr.html

- from: /guide/practices/responsiveness.html
  to: /training/articles/perf-anr.html

- from: /guide/practices/security.html
  to: /training/articles/security-tips.html

- from: /guide/practices/jni.html
  to: /training/articles/perf-jni.html

- from: /guide/tutorials/...
  to: /resources/tutorials/...

# ------------------- RESOURCES -------------------

- from: /resources/dashboard/...
  to: /about/dashboards/index.html

- from: /resources/community-groups.html
  to: /support.html

- from: /resources/tutorials/views/hello-linearlayout.html
  to: /guide/topics/ui/layout/linear.html

- from: /resources/tutorials/views/hello-relativelayout.html
  to: /guide/topics/ui/layout/relative.html

- from: /resources/tutorials/views/hello-listview.html
  to: /guide/topics/ui/layout/listview.html

- from: /resources/tutorials/views/hello-gridview.html
  to: /guide/topics/ui/layout/gridview.html

- from: /resources/tutorials/views/hello-webview.html
  to: /guide/webapps/webview.html

- from: /resources/tutorials/views/hello-formstuff.html
  to: /guide/topics/ui/controls.html

- from: /resources/tutorials/views/hello-datepicker.html
  to: /guide/topics/ui/controls/pickers.html

- from: /resources/tutorials/views/hello-timepicker.html
  to: /guide/topics/ui/controls/pickers.html

- from: /resources/tutorials/views/hello-autocomplete.html
  to: /guide/topics/ui/controls/text.html

- from: /resources/tutorials/views/hello-spinner.html
  to: /guide/topics/ui/controls/spinner.html

- from: /resources/tutorials/opengl/opengl-es10.html
  to: /training/graphics/opengl/index.html

- from: /resources/tutorials/opengl/opengl-es20.html
  to: /training/graphics/opengl/index.html

- from: /resources/tutorials/views/hello-mapview.html
  to: https://developers.google.com/maps/documentation/android/hello-mapview

- from: /resources/tutorials/views/...
  to: /guide/topics/ui/declaring-layout.html#CommonLayouts

- from: /guide/topics/ui/layout-objects.html
  to: /guide/topics/ui/declaring-layout.html#CommonLayouts

- from: /resources/tutorials/localization/...
  to: /training/basics/supporting-devices/languages.html

- from: /resources/samples/...
  to: /tools/samples/index.html

- from: /guide/
  to: /guide/components/index.html
  # comment: this redirects guide/ and guide/index.html only

# ------------------- TRAINING -------------------

- from: /training/cloudsync/aesync.html
  to: /google/gcm/index.html

# -------------------- MISC ----------------------

- from: /shareables/...
  to: http://commondatastorage.googleapis.com/androiddevelopers/shareables/...

- from: /downloads/...
  to: http://commondatastorage.googleapis.com/androiddevelopers/...

- from: /search.html
  to: /index.html

- from: /videos/index.html
  to: /develop/index.html

- from: /live/index.html
  to: https://developers.google.com/live/

# ---------- PLATFORM VERSIONS ----------------

- from: /4.2
  to: /about/versions/android-4.2.html

- from: /4.1
  to: /about/versions/android-4.1.html

- from: /4.0
  to: /about/versions/android-4.0.html

- from: /(j|jb|jellybean)/?$
  to: /about/versions/jelly-bean.html
  pattern: True

- from: /(i|ics|icecreamsandwich)/?$
  to: /about/versions/android-4.0-highlights.html
  pattern: True

- from: /(h|hc|honeycomb)/?$
  to: /about/versions/android-3.0-highlights.html
  pattern: True

- from: /(g|gb|gingerbread)/?$
  to: /about/versions/android-2.3-highlights.html
  pattern: True

# ---------- MISC -----------------

- from: /\+/?$
  to: https://plus.google.com/108967384991768947849/posts
  pattern: True

- from: /blog
  to: http://android-developers.blogspot.com

- from: /stats
  to: /about/dashboards/index.html

- from: /youtube
  to: http://www.youtube.com/user/androiddevelopers

- from: /playbadge
  to: http://developer.android.com/distribute/googleplay/promote/badges.html

- from: /deviceart
  to: http://developer.android.com/distribute/promote/device-art.html

docs/html/guide/index.jd

deleted100644 → 0
+0 −56
Original line number Original line Diff line number Diff line
page.title=App Components
page.landing=true
page.landing.intro=Android's application framework lets you create extremely rich and innovative apps using a set of reusable components. This section explains how Android apps work and how you use components to build them. 
page.landing.image=images/ui/ui_index.png

@jd:body

<div class="landing-docs">

  <div class="col-6">
    <h3>Blog Articles</h3>
    
    <a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
      <h4>Using DialogFragments</h4>
      <p>In this post, I’ll show how to use DialogFragments with the v4 support library (for backward compatibility on pre-Honeycomb devices) to show a simple edit dialog and return a result to the calling Activity using an interface.</p>
    </a>

    <a href="http://android-developers.blogspot.com/2011/03/fragments-for-all.html">
      <h4>Fragments For All</h4>
      <p>Today we’ve released a static library that exposes the same Fragments API (as well as the new LoaderManager and a few other classes) so that applications compatible with Android 1.6 or later can use fragments to create tablet-compatible user interfaces. </p>
    </a>
    
    <a
href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
      <h4>Multithreading for Performance</h4>
      <p>A good practice in creating responsive applications is to make sure your main UI thread
does the minimum amount of work. Any potentially long task that may hang your application should be
handled in a different thread.</p>
    </a>
  </div>

  <div class="col-6">
    <h3>Training</h3>
    
    <a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
      <h4>Managing the Activity Lifecycle</h4>
      <p>This class explains important lifecycle callback methods that each Activity
      instance receives and how you can use them so your activity does what the user expects and does not consume system
      resources when your activity doesn't need them.</p>
    </a>

    <a href="http://developer.android.com/training/basics/fragments/index.html">
      <h4>Building a Dynamic UI with Fragments</h4>
      <p>This class shows you how to create a dynamic user experience with fragments and optimize
your app's user experience for devices with different screen sizes, all while continuing to support
devices running versions as old as Android 1.6.</p>
    </a>

    <a href="http://developer.android.com/training/sharing/index.html">
      <h4>Sharing Content</h4>
      <p>This class covers some common ways you can send and receive content between
      applications using Intent APIs and the ActionProvider object.</p>
    </a>
  </div>

</div>
 No newline at end of file
+0 −10
Original line number Original line Diff line number Diff line
<html>
<head>
<meta http-equiv="refresh" content="0;url=http://developer.android.com/guide/topics/renderscript/index.html">
<title>Redirecting...</title>
</head>
<body>
<p>You should be redirected. Please <a
href="http://developer.android.com/guide/topics/renderscript/index.html">click here</a>.</p>
</body>
</html>
 No newline at end of file

docs/html/live/index.jd

deleted100644 → 0
+0 −65
Original line number Original line Diff line number Diff line
page.title=Live
fullpage=1
@jd:body

<div class="wrap" style="width:940px;">
  
<h1>Android Developers Live</h1>
  
<p>Meet the developers behind successful apps and games on Android. Check back for upcoming
livecasts on YouTube and videos of past sessions or follow us on 
<a href="https://plus.google.com/108967384991768947849/posts">+Android Developers</a> for updates.</p>
  
  <div id="interviewBlock" id="pocketgems" style="border-top:1px solid #ddd;margin-top:2em;padding-top:1em;clear:both;">

    <div id="mainBodyLeft" class="videoPlayer">

          <h3>Developer Interview: Pocket Gems</h3>
          
          <p>19 April 2012<br />2PM PST</p>       
          <p><span itemprop="description">Pocket Gems, a top game developer on Android, joins
          <a href="https://plus.google.com/108967384991768947849/posts">+Android Developers</a>
          to give a short talk on "Defragging Your Android Development." The talk highlights some
          of the techniques they've used to ensure quality while distributing their apps to hundreds
          of devices worldwide. </p>

          <p>After the talk, they'll take a few questions from developers in the hangout or from
          developers joining on air via the moderator queue. </p>
          
          <div id="objectWrapper">
            <iframe width="560" height="315" src="//www.youtube.com/embed/-wkXan-xNqA" frameborder="0" allowfullscreen></iframe>
          </div>

    </div><!-- end mainBodyLeft -->

    <div id="mainBodyRight" class="videoPlayer">

      <div style="padding-left:1.5em;font-size:12px;">
        <div style="padding-bottom:1em;"><img itemprop="image" src="//pocketgems.com/images/pocket-gems-logo-blue.png"></div>

        <h3 style="color:#000;font-size:12px;">About Pocket Gems</h3>
          <p>
            Web: <a style="text-decoration:none" href="http://www.pocketgems.com">www.pocketgems.com</a><br />
            Google+: <a style="text-decoration:none" href="https://plus.google.com/b/102436156807338888308/">+Pocket Gems</a><br />
            Twitter: <a style="text-decoration:none" href="https://twitter.com/#!/PocketGems">@PocketGems</a><br />
          </p>
     
        <h3 style="color:#000;font-size:12px;">Published on Google Play</h3>
          <p style="line-height:1.5em;">
            <a style="text-decoration:none" href="https://play.google.com/store/apps/developer?id=Pocket+Gems">Apps by Pocket Gems</a>
          </p>

        <h3 style="color:#000;font-size:12px;">Join</h3>
          <p style="line-height:1.5em;">
            <a style="text-decoration:none" href="http://youtu.be/-wkXan-xNqA">Watch on YouTube</a><br />
            <a style="text-decoration:none" href="http://www.google.com/moderator/#15/e=1fd27e&t=1fd27e.40">Submit a question</a><br />
            <a style="text-decoration:none" href="https://www.google.com/calendar/ical/g2ilcr0iki4olp10aluid7gl70%40group.calendar.google.com/public/basic.ics">Add to calendar</a> (iCal)
          </p>

      </li></ul>
      
</div>
    </div><!-- end mainBodyRight -->
</div><!-- interviewBlock -->

</div><!-- end mainBodyFixed -->