summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2012-04-23 15:52:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-23 15:52:48 -0700
commita11d0eb32e2a1b1acd5495764979cfe01d63039d (patch)
tree7578b218a369b975c369862a2db727699bd2c5dc
parent9642d03bda7534e353dbdb50662565daa7242d15 (diff)
parent968c2e4918246ef2c9530fd024f3e40932283cac (diff)
downloadandroid_development-a11d0eb32e2a1b1acd5495764979cfe01d63039d.tar.gz
android_development-a11d0eb32e2a1b1acd5495764979cfe01d63039d.tar.bz2
android_development-a11d0eb32e2a1b1acd5495764979cfe01d63039d.zip
Merge "Fixed the XMLAdapters example"
-rw-r--r--samples/XmlAdapters/AndroidManifest.xml3
-rw-r--r--samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java2
-rw-r--r--samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/samples/XmlAdapters/AndroidManifest.xml b/samples/XmlAdapters/AndroidManifest.xml
index e4ac4d89d..7a48fb396 100644
--- a/samples/XmlAdapters/AndroidManifest.xml
+++ b/samples/XmlAdapters/AndroidManifest.xml
@@ -47,8 +47,7 @@
</intent-filter>
</activity>
- <provider android:name="android.content.XmlDocumentProvider"
- android:authorities="xmldocument" />
+ <provider android:name="XmlDocumentProvider" android:authorities="xmldocument" />
</application>
diff --git a/samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java b/samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java
index e0143bda1..6e408cca8 100644
--- a/samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java
+++ b/samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java
@@ -59,7 +59,7 @@ public class ImageDownloader {
private static final int DELAY_BEFORE_PURGE = 30 * 1000; // in milliseconds
// Hard cache, with a fixed maximum capacity and a life duration
- private final HashMap<String, Bitmap> sHardBitmapCache =
+ private final static HashMap<String, Bitmap> sHardBitmapCache =
new LinkedHashMap<String, Bitmap>(HARD_CACHE_CAPACITY / 2, 0.75f, true) {
private static final long serialVersionUID = -7190622541619388252L;
@Override
diff --git a/samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java b/samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java
index d0ab0cfe7..bf3b7eac4 100644
--- a/samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java
+++ b/samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java
@@ -59,7 +59,7 @@ import java.util.regex.Pattern;
* <p>To add this provider in your application, you should add its declaration to your application
* manifest:
* <pre class="prettyprint">
- * &lt;provider android:name="android.content.XmlDocumentProvider" android:authorities="xmldocument" /&gt;
+ * &lt;provider android:name="XmlDocumentProvider" android:authorities="xmldocument" /&gt;
* </pre>
* </p>
*