auto import from //branches/cupcake/...@131421

11 files changed, 13 insertions, 90 deletions

diff --git a/res/drawable/bubble.xml b/res/drawable/bubble.xml
index 4c9fe13..38cff25 100644
--- a/res/drawable/bubble.xml
+++ b/res/drawable/bubble.xml
@@ -18,8 +18,8 @@
 */
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/list_item_im_bubble_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/list_item_im_bubble_selected" />
-    <item android:state_enabled="false" android:drawable="@drawable/list_item_im_bubble_default" />
-    <item android:drawable="@drawable/list_item_im_bubble_default" />
+    <item android:state_pressed="true" android:drawable="@drawable/im_bubble_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/im_bubble_highlight" />
+    <item android:state_enabled="false" android:drawable="@drawable/im_bubble_normal" />
+    <item android:drawable="@drawable/im_bubble_normal" />
 </selector>
diff --git a/res/drawable/im_bubble_highlight.9.png b/res/drawable/im_bubble_highlight.9.png
new file mode 100644
index 0000000..9b5588a
--- /dev/null
+++ b/res/drawable/im_bubble_highlight.9.png
diff --git a/res/drawable/im_bubble_normal.9.png b/res/drawable/im_bubble_normal.9.png
new file mode 100644
index 0000000..a9b327c
--- /dev/null
+++ b/res/drawable/im_bubble_normal.9.png
diff --git a/res/drawable/im_bubble_pressed.9.png b/res/drawable/im_bubble_pressed.9.png
new file mode 100644
index 0000000..3933268
--- /dev/null
+++ b/res/drawable/im_bubble_pressed.9.png
diff --git a/res/drawable/list_item_im_bubble_default.9.png b/res/drawable/list_item_im_bubble_default.9.png
deleted file mode 100644
index f04412c..0000000
--- a/res/drawable/list_item_im_bubble_default.9.png
+++ /dev/null
diff --git a/res/drawable/list_item_im_bubble_pressed.9.png b/res/drawable/list_item_im_bubble_pressed.9.png
deleted file mode 100644
index 669cae9..0000000
--- a/res/drawable/list_item_im_bubble_pressed.9.png
+++ /dev/null
diff --git a/res/drawable/list_item_im_bubble_selected.9.png b/res/drawable/list_item_im_bubble_selected.9.png
deleted file mode 100644
index cf2244b..0000000
--- a/res/drawable/list_item_im_bubble_selected.9.png
+++ /dev/null
diff --git a/res/layout/account_view.xml b/res/layout/account_view.xml
index 9a2ef70..057cb32 100644
--- a/res/layout/account_view.xml
+++ b/res/layout/account_view.xml
@@ -46,7 +46,8 @@
         android:layout_width="0dip"
         android:layout_height="fill_parent">    
 
-        <LinearLayout android:orientation="horizontal"
+        <LinearLayout 
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="0dip"
             android:gravity="center_vertical"
@@ -67,7 +68,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-        <LinearLayout android:orientation="horizontal"
+        <LinearLayout android:id="@+id/loginNameSection"
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="0dip"
             android:gravity="center_vertical"
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
deleted file mode 100644
index 30d0b75..0000000
--- a/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ro_perm_label">"Sofortnachrichten lesen"</string>
-    <string name="ro_perm_desc">"Ermöglicht einer Anwendung, Daten vom IM-Inhalteanbieter zu lesen."</string>
-    <string name="wo_perm_label">"Sofortnachrichten schreiben"</string>
-    <string name="wo_perm_desc">"Ermöglicht einer Anwendung, Daten zum IM-Inhalteanbieter zu schreiben."</string>
-    <!-- no translation found for im_label (2383771185743116130) -->
-    <skip />
-    <!-- no translation found for landing_page_title (3308840398526636367) -->
-    <skip />
-    <!-- no translation found for menu_add_account (7882883530162530640) -->
-    <skip />
-    <!-- no translation found for menu_edit_account (5158375995425359089) -->
-    <skip />
-    <!-- no translation found for menu_remove_account (6253792104452023333) -->
-    <skip />
-    <!-- no translation found for sign_in (3583291954308481049) -->
-    <skip />
-    <!-- no translation found for menu_sign_out (1696541713836583492) -->
-    <skip />
-    <!-- no translation found for menu_settings (4358480535175505390) -->
-    <skip />
-    <!-- no translation found for menu_sign_out_all (6694688381587929540) -->
-    <skip />
-    <!-- no translation found for choose_account_title (5360746033151159813) -->
-    <skip />
-    <!-- no translation found for account_title (2948323540348040321) -->
-    <skip />
-    <!-- no translation found for one_conversation (1260066318945302007) -->
-    <skip />
-    <!-- no translation found for conversations (5217709916951150225) -->
-    <skip />
-    <!-- no translation found for add_account (3075763239147529213) -->
-    <skip />
-    <!-- no translation found for menu_view_contact_list (7606776483433251078) -->
-    <skip />
-    <!-- no translation found for signing_in_wait (7601184703940729109) -->
-    <skip />
-</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index 1b9ac84..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ro_perm_label">"read instant messages"</string>
-    <string name="ro_perm_desc">"Allows applications to read data from the IM content provider."</string>
-    <string name="wo_perm_label">"write instant messages"</string>
-    <string name="wo_perm_desc">"Allows applications to write data to the IM content provider."</string>
-    <!-- no translation found for im_label (2383771185743116130) -->
-    <skip />
-    <!-- no translation found for landing_page_title (3308840398526636367) -->
-    <skip />
-    <!-- no translation found for menu_add_account (7882883530162530640) -->
-    <skip />
-    <!-- no translation found for menu_edit_account (5158375995425359089) -->
-    <skip />
-    <!-- no translation found for menu_remove_account (6253792104452023333) -->
-    <skip />
-    <!-- no translation found for sign_in (3583291954308481049) -->
-    <skip />
-    <!-- no translation found for menu_sign_out (1696541713836583492) -->
-    <skip />
-    <!-- no translation found for menu_settings (4358480535175505390) -->
-    <skip />
-    <!-- no translation found for menu_sign_out_all (6694688381587929540) -->
-    <skip />
-    <!-- no translation found for choose_account_title (5360746033151159813) -->
-    <skip />
-    <!-- no translation found for account_title (2948323540348040321) -->
-    <skip />
-    <!-- no translation found for one_conversation (1260066318945302007) -->
-    <skip />
-    <!-- no translation found for conversations (5217709916951150225) -->
-    <skip />
-    <!-- no translation found for add_account (3075763239147529213) -->
-    <skip />
-    <!-- no translation found for menu_view_contact_list (7606776483433251078) -->
-    <skip />
-    <!-- no translation found for signing_in_wait (7601184703940729109) -->
-    <skip />
-</resources>
diff --git a/src/com/android/providers/im/ProviderListItem.java b/src/com/android/providers/im/ProviderListItem.java
index 29f5514..958e067 100644
--- a/src/com/android/providers/im/ProviderListItem.java
+++ b/src/com/android/providers/im/ProviderListItem.java
@@ -42,6 +42,7 @@ public class ProviderListItem extends LinearLayout {
     private TextView mChatView;
     private View mUnderBubble;
     private Drawable mBubbleDrawable, mDefaultBackground;
+    private View mLoginNameSection;
     
     private int mProviderIdColumn;
     private int mProviderFullnameColumn;
@@ -62,6 +63,7 @@ public class ProviderListItem extends LinearLayout {
         mLoginName = (TextView) findViewById(R.id.loginName);
         mChatView = (TextView) findViewById(R.id.conversations);
         mUnderBubble = (View) findViewById(R.id.underBubble);
+        mLoginNameSection = (View) findViewById(R.id.loginNameSection);
         mBubbleDrawable = getResources().getDrawable(R.drawable.bubble);
         mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
         
@@ -94,6 +96,7 @@ public class ProviderListItem extends LinearLayout {
 
         mUnderBubble.setBackgroundDrawable(mDefaultBackground);
         if (!cursor.isNull(mActiveAccountIdColumn)) {
+            mLoginNameSection.setVisibility(View.VISIBLE);
             providerName.setVisibility(View.VISIBLE);
             providerName.setText(providerDisplayName);
             loginName.setText(cursor.getString(mActiveAccountUserNameColumn));
@@ -136,11 +139,9 @@ public class ProviderListItem extends LinearLayout {
             }
         } else {
             // No active account, show add account
-            providerName.setVisibility(View.GONE);
-            statusIcon.setVisibility(View.GONE);
-            chatView.setVisibility(View.GONE);
+            mLoginNameSection.setVisibility(View.GONE);
 
-            loginName.setText(providerDisplayName);
+            mProviderName.setText(providerDisplayName);
         }
     }