diff options
| author | Adam Koch <akoch@google.com> | 2014-03-20 16:38:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 16:38:15 +0000 |
| commit | 1f839d92100c5f05cbd52b8f5d0671d984a48334 (patch) | |
| tree | 04ed8b938e5cf525bd14f69da95ece594c13e1a0 | |
| parent | d79cc81fa8860a844ea6510c3c6424b09fbaab39 (diff) | |
| parent | 5a510a2c3e0ec5f2e60577c7a57e60c2101ee354 (diff) | |
| download | frameworks_base-1f839d92100c5f05cbd52b8f5d0671d984a48334.zip frameworks_base-1f839d92100c5f05cbd52b8f5d0671d984a48334.tar.gz frameworks_base-1f839d92100c5f05cbd52b8f5d0671d984a48334.tar.bz2 | |
am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
Point bitmaps training class to new samples directory.
| -rw-r--r-- | docs/downloads/training/BitmapFun.zip | bin | 104008 -> 0 bytes | |||
| -rw-r--r-- | docs/html/_redirects.yaml | 3 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/cache-bitmap.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/display-bitmap.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/index.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/load-bitmap.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/manage-memory.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/process-bitmap.jd | 4 |
8 files changed, 15 insertions, 12 deletions
diff --git a/docs/downloads/training/BitmapFun.zip b/docs/downloads/training/BitmapFun.zip Binary files differdeleted file mode 100644 index d3dd02a..0000000 --- a/docs/downloads/training/BitmapFun.zip +++ /dev/null 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 @@ redirects: # -------------------- 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 @@ trainingnavtop=true <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 @@ trainingnavtop=true <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 fba9fc5..8c11e52 100644 --- a/docs/html/training/displaying-bitmaps/index.jd +++ b/docs/html/training/displaying-bitmaps/index.jd @@ -18,8 +18,8 @@ startpage=true <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 @@ trainingnavtop=true <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 @@ trainingnavtop=true <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 @@ trainingnavtop=true <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> |