summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-01-09 17:51:25 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-01-09 17:51:25 -0800
commitf0d90e9e5a360a627f8ca5652fb6052e0d1c123a (patch)
tree283fec12026e2ed39618fa0668792759332d3779 /res
parenteef1589d1f658de1b50a5617c4f5edae0daa0769 (diff)
downloadImProvider-f0d90e9e5a360a627f8ca5652fb6052e0d1c123a.tar.gz
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'res')
-rw-r--r--res/drawable/ic_menu_login.pngbin2466 -> 0 bytes
-rw-r--r--res/layout/account_view.xml46
-rw-r--r--res/values/strings.xml2
3 files changed, 21 insertions, 27 deletions
diff --git a/res/drawable/ic_menu_login.png b/res/drawable/ic_menu_login.png
deleted file mode 100644
index 2b856bc..0000000
--- a/res/drawable/ic_menu_login.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/account_view.xml b/res/layout/account_view.xml
index 4955e6c..faa938e 100644
--- a/res/layout/account_view.xml
+++ b/res/layout/account_view.xml
@@ -23,26 +23,11 @@
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
- <RelativeLayout
- android:layout_width="48dip"
- android:layout_height="38dip"
- android:paddingLeft="6dip"
- android:layout_gravity="center_vertical">
- <ImageView
- android:id="@+id/providerIcon"
- android:scaleType="centerCrop"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentLeft="true"
- android:layout_alignParentBottom="true" />
- <ImageView
- android:id="@+id/statusIcon"
- android:scaleType="fitXY"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true" />
- </RelativeLayout>
+ <ImageView
+ android:id="@+id/providerIcon"
+ android:scaleType="centerCrop"
+ android:layout_width="32dip"
+ android:layout_height="32dip"/>
<LinearLayout android:orientation="vertical"
android:paddingLeft="4dip"
@@ -58,11 +43,22 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
- <TextView android:id="@+id/line2"
- android:textSize="16sp"
- android:maxLines="1"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <ImageView
+ android:id="@+id/statusIcon"
+ android:scaleType="fitXY"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="6dip"
+ />
+ <TextView android:id="@+id/line2"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
</LinearLayout>
<LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 65c0441..c2b75a1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,8 +53,6 @@
<!-- These strings displayed on the landing page. -->
<!-- The title of the landing page.-->
<string name="choose_account_title">Chat - Select an account</string>
- <!-- The account label on the landing page e.g. "AIM account:", if there is an account.-->
- <string name="account_title"><xliff:g id="account">%1$s</xliff:g> account:</string>
<!-- Displays if there is only one ongoing chat on the landing page.-->
<string name="one_conversation">1 chat</string>
<!-- Displays the number of ongoing chats on the landing page.-->