commit f7dd6967d6be03358e6172ebd3f814dcce9e4467
author Adam Koch <akoch@google.com> Tue Mar 04 00:49:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 04 00:49:50 2014 +0000
tree 02633af6af4b8eb20960364effb3e1e8a1f7be60
parent f1d25c6e94f3cedd696524335335255f5af86870
parent 3be671f7c4688c4e4cd436972e5cb85621e74785

Merge "Add ABOUT.txt for Displaying Bitmaps sample." into klp-docs

ui/graphics/DisplayingBitmaps/ABOUT.txt

diff --git a/ui/graphics/DisplayingBitmaps/ABOUT.txt b/ui/graphics/DisplayingBitmaps/ABOUT.txt
new file mode 100644
index 0000000..2cf2fa5
--- /dev/null
+++ b/ui/graphics/DisplayingBitmaps/ABOUT.txt
@@ -0,0 +1,22 @@
+Copyright (C) 2014 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+---------------------------------------
+
+This is a sample application for the Android Training class "Displaying Bitmaps
+Efficiently" (http://developer.android.com/training/displaying-bitmaps/).
+
+It demonstrates how to load large bitmaps efficiently off the main UI thread,
+caching bitmaps (both in memory and on disk), managing bitmap memory and
+displaying bitmaps in UI elements such as ViewPager and ListView/GridView.
\ No newline at end of file

ui/graphics/DisplayingBitmaps/template-params.xml

diff --git a/ui/graphics/DisplayingBitmaps/template-params.xml b/ui/graphics/DisplayingBitmaps/template-params.xml
index d09c839..b849f97 100644
--- a/ui/graphics/DisplayingBitmaps/template-params.xml
+++ b/ui/graphics/DisplayingBitmaps/template-params.xml
@@ -27,7 +27,8 @@
             <![CDATA[
             This is a sample application for the Android Training class
             &quot;Displaying Bitmaps Efficiently&quot;
-            (http://developer.android.com/training/displaying-bitmaps/).
+            (http://developer.android.com/training/displaying-bitmaps/).\n\n
+
             It demonstrates how to load large bitmaps efficiently off the main UI thread, caching
             bitmaps (both in memory and on disk), managing bitmap memory and displaying bitmaps
             in UI elements such as ViewPager and ListView/GridView.