summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-10-01 19:49:27 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 2009-10-01 19:49:27 -0400
commitd14cfc27627107c2973eeacc3bcbb2830a3fd620 (patch)
tree65f94c443518ce04a1fd06054439c43e938bc3c9
parent99510681e9f1c76f82719e724990f744cfdbcefd (diff)
parent9e384dddb8800c9f84f36bf26ec8df298b1d38bd (diff)
Merge change I9e384ddd into eclair
* changes: Add a test pattern as rollo's icon
-rw-r--r--libs/rs/java/Rollo/AndroidManifest.xml7
-rw-r--r--libs/rs/java/Rollo/res/drawable/test_pattern.pngbin0 -> 307 bytes
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/rs/java/Rollo/AndroidManifest.xml b/libs/rs/java/Rollo/AndroidManifest.xml
index 127a140d2397..12cb28f976d9 100644
--- a/libs/rs/java/Rollo/AndroidManifest.xml
+++ b/libs/rs/java/Rollo/AndroidManifest.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.rollo">
- <application android:label="Rollo">
+ <application
+ android:label="Rollo"
+ android:icon="@drawable/test_pattern">
<activity android:name="Rollo"
- android:theme="@android:style/Theme.Translucent">
+ android:theme="@android:style/Theme.Translucent"
+ android:icon="@drawable/test_pattern">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/libs/rs/java/Rollo/res/drawable/test_pattern.png b/libs/rs/java/Rollo/res/drawable/test_pattern.png
new file mode 100644
index 000000000000..e7d145554c00
--- /dev/null
+++ b/libs/rs/java/Rollo/res/drawable/test_pattern.png
Binary files differ