AI 143296: Merge from donut Change 143147

Automated import of CL 143296

diff --git a/samples/PluginDemo/res/drawable/emo_im_angel.png b/samples/PluginDemo/res/drawable/emo_im_angel.png
new file mode 100644 (file)
index 0000000..c34dfa6
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_angel.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_cool.png b/samples/PluginDemo/res/drawable/emo_im_cool.png
new file mode 100644 (file)
index 0000000..d8eeb34
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_cool.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_crying.png b/samples/PluginDemo/res/drawable/emo_im_crying.png
new file mode 100644 (file)
index 0000000..1cafdb3
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_crying.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_embarrassed.png b/samples/PluginDemo/res/drawable/emo_im_embarrassed.png
new file mode 100644 (file)
index 0000000..e4db963
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_embarrassed.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_foot_in_mouth.png b/samples/PluginDemo/res/drawable/emo_im_foot_in_mouth.png
new file mode 100644 (file)
index 0000000..09d1fba
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_foot_in_mouth.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_happy.png b/samples/PluginDemo/res/drawable/emo_im_happy.png
new file mode 100644 (file)
index 0000000..b86602a
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_happy.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_kissing.png b/samples/PluginDemo/res/drawable/emo_im_kissing.png
new file mode 100644 (file)
index 0000000..56378f6
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_kissing.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_laughing.png b/samples/PluginDemo/res/drawable/emo_im_laughing.png
new file mode 100644 (file)
index 0000000..980bf28
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_laughing.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_lips_are_sealed.png b/samples/PluginDemo/res/drawable/emo_im_lips_are_sealed.png
new file mode 100644 (file)
index 0000000..f2de993
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_lips_are_sealed.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_money_mouth.png b/samples/PluginDemo/res/drawable/emo_im_money_mouth.png
new file mode 100644 (file)
index 0000000..08c53fd
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_money_mouth.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_sad.png b/samples/PluginDemo/res/drawable/emo_im_sad.png
new file mode 100644 (file)
index 0000000..31c08d0
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_sad.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_surprised.png b/samples/PluginDemo/res/drawable/emo_im_surprised.png
new file mode 100644 (file)
index 0000000..abe8c7a
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_surprised.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_tongue_sticking_out.png b/samples/PluginDemo/res/drawable/emo_im_tongue_sticking_out.png
new file mode 100644 (file)
index 0000000..6f0f47b
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_tongue_sticking_out.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_undecided.png b/samples/PluginDemo/res/drawable/emo_im_undecided.png
new file mode 100644 (file)
index 0000000..eb4f8c5
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_undecided.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_winking.png b/samples/PluginDemo/res/drawable/emo_im_winking.png
new file mode 100644 (file)
index 0000000..568562a
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_winking.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_wtf.png b/samples/PluginDemo/res/drawable/emo_im_wtf.png
new file mode 100644 (file)
index 0000000..41dd47f
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_wtf.png differ

diff --git a/samples/PluginDemo/res/drawable/emo_im_yelling.png b/samples/PluginDemo/res/drawable/emo_im_yelling.png
new file mode 100644 (file)
index 0000000..c3c8612
Binary files /dev/null and b/samples/PluginDemo/res/drawable/emo_im_yelling.png differ

diff --git a/samples/PluginDemo/src/com/android/im/plugin/demo/DemoImPlugin.java b/samples/PluginDemo/src/com/android/im/plugin/demo/DemoImPlugin.java
index 9975d38..eb7d0c9 100644 (file)
--- a/samples/PluginDemo/src/com/android/im/plugin/demo/DemoImPlugin.java
+++ b/samples/PluginDemo/src/com/android/im/plugin/demo/DemoImPlugin.java
@@ -136,23 +136,23 @@ public class DemoImPlugin extends Service {
      * match the smiley texts and smiley names defined in strings.xml.
      */
     static final int[] SMILEY_RES_IDS = {
-        android.R.drawable.emo_im_happy,
-        android.R.drawable.emo_im_sad,
-        android.R.drawable.emo_im_winking,
-        android.R.drawable.emo_im_tongue_sticking_out,
-        android.R.drawable.emo_im_surprised,
-        android.R.drawable.emo_im_kissing,
-        android.R.drawable.emo_im_yelling,
-        android.R.drawable.emo_im_cool,
-        android.R.drawable.emo_im_money_mouth,
-        android.R.drawable.emo_im_foot_in_mouth,
-        android.R.drawable.emo_im_embarrassed,
-        android.R.drawable.emo_im_angel,
-        android.R.drawable.emo_im_undecided,
-        android.R.drawable.emo_im_crying,
-        android.R.drawable.emo_im_lips_are_sealed,
-        android.R.drawable.emo_im_laughing,
-        android.R.drawable.emo_im_wtf
+        R.drawable.emo_im_happy,
+        R.drawable.emo_im_sad,
+        R.drawable.emo_im_winking,
+        R.drawable.emo_im_tongue_sticking_out,
+        R.drawable.emo_im_surprised,
+        R.drawable.emo_im_kissing,
+        R.drawable.emo_im_yelling,
+        R.drawable.emo_im_cool,
+        R.drawable.emo_im_money_mouth,
+        R.drawable.emo_im_foot_in_mouth,
+        R.drawable.emo_im_embarrassed,
+        R.drawable.emo_im_angel,
+        R.drawable.emo_im_undecided,
+        R.drawable.emo_im_crying,
+        R.drawable.emo_im_lips_are_sealed,
+        R.drawable.emo_im_laughing,
+        R.drawable.emo_im_wtf
     };
 
 }