am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit 'c5640ea55aebf86ab652f5a2f8e00e130c479291':
Point bitmaps training class to new samples directory.
diff --git a/docs/downloads/training/BitmapFun.zip b/docs/downloads/training/BitmapFun.zip
deleted file mode 100644
index d3dd02a..0000000
--- a/docs/downloads/training/BitmapFun.zip
+++ /dev/null
Binary files differ
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 5f0779c..fc60e1f 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -313,6 +313,9 @@
# -------------------- MISC ----------------------
+- from: /shareables/training/BitmapFun.zip
+ to: /downloads/samples/DisplayingBitmaps.zip
+
- from: /shareables/...
to: http://commondatastorage.googleapis.com/androiddevelopers/shareables/...
diff --git a/docs/html/training/displaying-bitmaps/cache-bitmap.jd b/docs/html/training/displaying-bitmaps/cache-bitmap.jd
index ff9c3a0..7b9216e 100644
--- a/docs/html/training/displaying-bitmaps/cache-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/cache-bitmap.jd
@@ -24,8 +24,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>
diff --git a/docs/html/training/displaying-bitmaps/display-bitmap.jd b/docs/html/training/displaying-bitmaps/display-bitmap.jd
index ed1836c..4147f83 100644
--- a/docs/html/training/displaying-bitmaps/display-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/display-bitmap.jd
@@ -24,8 +24,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>
diff --git a/docs/html/training/displaying-bitmaps/index.jd b/docs/html/training/displaying-bitmaps/index.jd
index 7003585..831c64d 100644
--- a/docs/html/training/displaying-bitmaps/index.jd
+++ b/docs/html/training/displaying-bitmaps/index.jd
@@ -18,8 +18,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>
diff --git a/docs/html/training/displaying-bitmaps/load-bitmap.jd b/docs/html/training/displaying-bitmaps/load-bitmap.jd
index 938901f..f963baa 100644
--- a/docs/html/training/displaying-bitmaps/load-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/load-bitmap.jd
@@ -18,8 +18,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>
diff --git a/docs/html/training/displaying-bitmaps/manage-memory.jd b/docs/html/training/displaying-bitmaps/manage-memory.jd
index 7f2b4c5..5a5c2cd 100644
--- a/docs/html/training/displaying-bitmaps/manage-memory.jd
+++ b/docs/html/training/displaying-bitmaps/manage-memory.jd
@@ -26,8 +26,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>
diff --git a/docs/html/training/displaying-bitmaps/process-bitmap.jd b/docs/html/training/displaying-bitmaps/process-bitmap.jd
index ed0b368..a557619 100644
--- a/docs/html/training/displaying-bitmaps/process-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/process-bitmap.jd
@@ -26,8 +26,8 @@
<h2>Try it out</h2>
<div class="download-box">
- <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a>
- <p class="filename">BitmapFun.zip</p>
+ <a href="{@docRoot}downloads/samples/DisplayingBitmaps.zip" class="button">Download the sample</a>
+ <p class="filename">DisplayingBitmaps.zip</p>
</div>
</div>