summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-02-19 13:27:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-19 13:27:24 -0800
commitbf31ed256a058310df657b072c685d60f48923d0 (patch)
treee0429a4a5bf4b538408530aecea3fde6641c0f61
parentea25183196970412482e4dfc3a36e756880fe5b9 (diff)
parentc2cb25d49534cc05d114332b09dbeb36480348a3 (diff)
downloadframeworks_base-bf31ed256a058310df657b072c685d60f48923d0.zip
frameworks_base-bf31ed256a058310df657b072c685d60f48923d0.tar.gz
frameworks_base-bf31ed256a058310df657b072c685d60f48923d0.tar.bz2
Merge "Add test pattern icon to Fountain."
-rw-r--r--libs/rs/java/Fountain/AndroidManifest.xml4
-rw-r--r--libs/rs/java/Fountain/res/drawable/test_pattern.pngbin0 -> 307 bytes
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/rs/java/Fountain/AndroidManifest.xml b/libs/rs/java/Fountain/AndroidManifest.xml
index 1185930..951c451 100644
--- a/libs/rs/java/Fountain/AndroidManifest.xml
+++ b/libs/rs/java/Fountain/AndroidManifest.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.fountain">
- <application android:label="Fountain">
+ <application
+ android:label="Fountain"
+ android:icon="@drawable/test_pattern">
<activity android:name="Fountain">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/libs/rs/java/Fountain/res/drawable/test_pattern.png b/libs/rs/java/Fountain/res/drawable/test_pattern.png
new file mode 100644
index 0000000..e7d1455
--- /dev/null
+++ b/libs/rs/java/Fountain/res/drawable/test_pattern.png
Binary files differ