Merge "Use new assets/layout for dialpad" into ics-factoryrom
diff --git a/res/layout/social_widget.xml b/res/layout/social_widget.xml
index 34ebfc1..3668e8d 100644
--- a/res/layout/social_widget.xml
+++ b/res/layout/social_widget.xml
@@ -17,21 +17,17 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="96dip"
- android:background="#00000000"
- android:paddingTop="1dip"
- android:paddingBottom="20dip">
+ android:layout_height="match_parent"
+ android:background="#00000000">
<LinearLayout
android:id="@+id/widget_container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
- android:layout_width="70dip"
- android:layout_height="70dip"
- android:layout_marginTop="1dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="4dip">
+ android:layout_width="70dp"
+ android:layout_height="70dp"
+ android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
@@ -44,19 +40,14 @@
</FrameLayout>
<RelativeLayout
android:id="@+id/name_and_snippet_container"
- android:layout_width="0dip"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/bg_status_contact_widget"
- android:layout_marginTop="@dimen/widget_snippet_top_margin"
- android:layout_marginRight="16dip"
- android:layout_marginBottom="@dimen/widget_snippet_bottom_margin"
- android:layout_marginLeft="0dip"
- android:paddingLeft="47dip"
- android:paddingRight="8dip"
- android:paddingTop="@dimen/widget_snippet_top_padding"
- android:paddingBottom="@dimen/widget_snippet_bottom_padding">
-
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingLeft="43dp"
+ android:background="@drawable/bg_status_contact_widget">
<TextView
android:id="@+id/name_and_snippet"
android:layout_width="match_parent"
@@ -67,7 +58,6 @@
android:lineSpacingExtra="2sp"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/widget_text_size_snippet" />
-
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
@@ -77,4 +67,4 @@
android:textSize="@dimen/widget_text_size_name" />
</RelativeLayout>
</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1945dfc..5a94324 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -110,11 +110,6 @@
<!-- Font size used for the social status in the widget -->
<dimen name="widget_text_size_snippet">13sp</dimen>
- <!-- Margins and padding for text in widget -->
- <dimen name="widget_snippet_top_margin">4dip</dimen>
- <dimen name="widget_snippet_bottom_margin">7dip</dimen>
- <dimen name="widget_snippet_top_padding">3dip</dimen>
- <dimen name="widget_snippet_bottom_padding">6dip</dimen>
<!-- Size of the shortcut icon. 0dip means: use the system default -->
<dimen name="shortcut_icon_size">0dip</dimen>