summaryrefslogtreecommitdiffstats
path: root/samples/browseable/DisplayingBitmaps
diff options
context:
space:
mode:
Diffstat (limited to 'samples/browseable/DisplayingBitmaps')
-rw-r--r--samples/browseable/DisplayingBitmaps/AndroidManifest.xml2
-rw-r--r--samples/browseable/DisplayingBitmaps/_index.jd26
-rw-r--r--samples/browseable/DisplayingBitmaps/res/values-v21/template-styles.xml22
-rw-r--r--samples/browseable/DisplayingBitmaps/res/values/base-strings.xml3
4 files changed, 33 insertions, 20 deletions
diff --git a/samples/browseable/DisplayingBitmaps/AndroidManifest.xml b/samples/browseable/DisplayingBitmaps/AndroidManifest.xml
index 23db308a3..a58027743 100644
--- a/samples/browseable/DisplayingBitmaps/AndroidManifest.xml
+++ b/samples/browseable/DisplayingBitmaps/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
+ <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/samples/browseable/DisplayingBitmaps/_index.jd b/samples/browseable/DisplayingBitmaps/_index.jd
index eb880978f..e4b4f1570 100644
--- a/samples/browseable/DisplayingBitmaps/_index.jd
+++ b/samples/browseable/DisplayingBitmaps/_index.jd
@@ -1,21 +1,15 @@
-
-
-
page.tags="DisplayingBitmaps"
sample.group=UI
@jd:body
-<p>This is a sample application for the
-<a href="{@docRoot}training/displaying-bitmaps/index.html">Displaying
-Bitmaps Efficiently</a> Android Training class.</p>
-
<p>
-The sample demonstrates:
-</p>
-<ul>
-<li>Loading large bitmaps efficiently outside the main UI thread.</li>
-<li>Caching bitmaps (both in memory and on disk).</li>
-<li>Managing bitmap memory.</li>
-<li>Displaying bitmaps in UI elements (such as {@link android.support.v4.view.ViewPager ViewPager},
-{@link android.widget.ListView ListView}, and {@link android.widget.GridView GridView}).</li>
-</ul> \ No newline at end of file
+
+ This is a sample application for the Android Training class
+ &quot;Displaying Bitmaps Efficiently&quot;
+ (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.
+
+ </p>
diff --git a/samples/browseable/DisplayingBitmaps/res/values-v21/template-styles.xml b/samples/browseable/DisplayingBitmaps/res/values-v21/template-styles.xml
new file mode 100644
index 000000000..134fcd9d3
--- /dev/null
+++ b/samples/browseable/DisplayingBitmaps/res/values-v21/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+ Copyright 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.
+ -->
+
+<resources>
+
+ <!-- Activity themes -->
+ <style name="Theme.Base" parent="android:Theme.Material.Light" />
+
+</resources>
diff --git a/samples/browseable/DisplayingBitmaps/res/values/base-strings.xml b/samples/browseable/DisplayingBitmaps/res/values/base-strings.xml
index a6a8390a6..440137171 100644
--- a/samples/browseable/DisplayingBitmaps/res/values/base-strings.xml
+++ b/samples/browseable/DisplayingBitmaps/res/values/base-strings.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<resources>
<string name="app_name">DisplayingBitmaps</string>
<string name="intro_message">