Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread

14 files changed, 43 insertions, 34 deletions

diff --git a/api/current.xml b/api/current.xml
index 53319e4..3acd21f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -13112,187 +13112,187 @@
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad80"
+<field name="kraken_resource_pad9"
  type="int"
  transient="false"
  volatile="false"
- value="17301681"
+ value="17301752"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad81"
+<field name="list_selector_background"
  type="int"
  transient="false"
  volatile="false"
- value="17301680"
+ value="17301602"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad82"
+<field name="menu_frame"
  type="int"
  transient="false"
  volatile="false"
- value="17301679"
+ value="17301603"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad83"
+<field name="menu_full_frame"
  type="int"
  transient="false"
  volatile="false"
- value="17301678"
+ value="17301604"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad84"
+<field name="menuitem_background"
  type="int"
  transient="false"
  volatile="false"
- value="17301677"
+ value="17301605"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad85"
+<field name="picture_frame"
  type="int"
  transient="false"
  volatile="false"
- value="17301676"
+ value="17301606"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="kraken_resource_pad9"
+<field name="presence_audio_away"
  type="int"
  transient="false"
  volatile="false"
- value="17301752"
+ value="17301679"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="list_selector_background"
+<field name="presence_audio_busy"
  type="int"
  transient="false"
  volatile="false"
- value="17301602"
+ value="17301680"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="menu_frame"
+<field name="presence_audio_online"
  type="int"
  transient="false"
  volatile="false"
- value="17301603"
+ value="17301681"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="menu_full_frame"
+<field name="presence_away"
  type="int"
  transient="false"
  volatile="false"
- value="17301604"
+ value="17301607"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="menuitem_background"
+<field name="presence_busy"
  type="int"
  transient="false"
  volatile="false"
- value="17301605"
+ value="17301608"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="picture_frame"
+<field name="presence_invisible"
  type="int"
  transient="false"
  volatile="false"
- value="17301606"
+ value="17301609"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="presence_away"
+<field name="presence_offline"
  type="int"
  transient="false"
  volatile="false"
- value="17301607"
+ value="17301610"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="presence_busy"
+<field name="presence_online"
  type="int"
  transient="false"
  volatile="false"
- value="17301608"
+ value="17301611"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="presence_invisible"
+<field name="presence_video_away"
  type="int"
  transient="false"
  volatile="false"
- value="17301609"
+ value="17301676"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="presence_offline"
+<field name="presence_video_busy"
  type="int"
  transient="false"
  volatile="false"
- value="17301610"
+ value="17301677"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="presence_online"
+<field name="presence_video_online"
  type="int"
  transient="false"
  volatile="false"
- value="17301611"
+ value="17301678"
  static="true"
  final="true"
  deprecated="not deprecated"
diff --git a/core/res/res/drawable-hdpi/presence_audio_away.png b/core/res/res/drawable-hdpi/presence_audio_away.png
new file mode 100644
index 0000000..f18b6c9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_audio_away.png
diff --git a/core/res/res/drawable-hdpi/presence_audio_busy.png b/core/res/res/drawable-hdpi/presence_audio_busy.png
new file mode 100644
index 0000000..ae7b983
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_audio_busy.png
diff --git a/core/res/res/drawable-hdpi/presence_audio_online.png b/core/res/res/drawable-hdpi/presence_audio_online.png
new file mode 100644
index 0000000..15e4513
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_audio_online.png
diff --git a/core/res/res/drawable-hdpi/presence_video_away.png b/core/res/res/drawable-hdpi/presence_video_away.png
new file mode 100644
index 0000000..f18b6c9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_video_away.png
diff --git a/core/res/res/drawable-hdpi/presence_video_busy.png b/core/res/res/drawable-hdpi/presence_video_busy.png
new file mode 100644
index 0000000..ae7b983
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_video_busy.png
diff --git a/core/res/res/drawable-hdpi/presence_video_online.png b/core/res/res/drawable-hdpi/presence_video_online.png
new file mode 100644
index 0000000..15e4513
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_video_online.png
diff --git a/core/res/res/drawable-mdpi/presence_audio_away.png b/core/res/res/drawable-mdpi/presence_audio_away.png
new file mode 100644
index 0000000..f67e64e
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_audio_away.png
diff --git a/core/res/res/drawable-mdpi/presence_audio_busy.png b/core/res/res/drawable-mdpi/presence_audio_busy.png
new file mode 100644
index 0000000..0ad991b
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_audio_busy.png
diff --git a/core/res/res/drawable-mdpi/presence_audio_online.png b/core/res/res/drawable-mdpi/presence_audio_online.png
new file mode 100644
index 0000000..6cc3d1a
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_audio_online.png
diff --git a/core/res/res/drawable-mdpi/presence_video_away.png b/core/res/res/drawable-mdpi/presence_video_away.png
new file mode 100644
index 0000000..f67e64e
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_video_away.png
diff --git a/core/res/res/drawable-mdpi/presence_video_busy.png b/core/res/res/drawable-mdpi/presence_video_busy.png
new file mode 100644
index 0000000..0ad991b
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_video_busy.png
diff --git a/core/res/res/drawable-mdpi/presence_video_online.png b/core/res/res/drawable-mdpi/presence_video_online.png
new file mode 100644
index 0000000..6cc3d1a
--- /dev/null
+++ b/core/res/res/drawable-mdpi/presence_video_online.png
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 1932771..27cb763 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1250,7 +1250,16 @@
   
   <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />
   <public-padding type="anim" name="kraken_resource_pad" end="0x010a0020" />
+
+  <!-- presence drawables for videochat or audiochat capable contacts -->
+  <public type="drawable" name="presence_video_away" id="0x010800ac" />
+  <public type="drawable" name="presence_video_busy" id="0x010800ad" />
+  <public type="drawable" name="presence_video_online" id="0x010800ae" />
+  <public type="drawable" name="presence_audio_away" id="0x010800af" />
+  <public type="drawable" name="presence_audio_busy" id="0x010800b0" />
+  <public type="drawable" name="presence_audio_online" id="0x010800b1" />  
   <public-padding type="drawable" name="kraken_resource_pad" end="0x01080100" />
+  
   <public-padding type="style" name="kraken_resource_pad" end="0x01030090" />
   <public-padding type="string" name="kraken_resource_pad" end="0x01040020" />
   <public-padding type="integer" name="kraken_resource_pad" end="0x010e0010" />