Merge "Fix phone number comparison in Phone Favorites."
diff --git a/res/drawable-hdpi/dial_background_texture.png b/res/drawable-hdpi/dial_background_texture.png
index 9df3b1e..95bec9f 100644
--- a/res/drawable-hdpi/dial_background_texture.png
+++ b/res/drawable-hdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_background_texture.png b/res/drawable-mdpi/dial_background_texture.png
index 90cd07c..a6d666c 100644
--- a/res/drawable-mdpi/dial_background_texture.png
+++ b/res/drawable-mdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-nodpi/background_dial_holo_dark.png b/res/drawable-nodpi/background_dial_holo_dark.png
new file mode 100644
index 0000000..3dba50c
--- /dev/null
+++ b/res/drawable-nodpi/background_dial_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_background_texture.png b/res/drawable-xhdpi/dial_background_texture.png
index 02aacc8..184049f 100644
--- a/res/drawable-xhdpi/dial_background_texture.png
+++ b/res/drawable-xhdpi/dial_background_texture.png
Binary files differ
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
index ae37fd5..2d42ad0 100644
--- a/res/layout/dialpad_additional_buttons.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -21,7 +21,6 @@
android:layout_height="0px"
android:layout_weight="0.150"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/dialpad_vertical_margin"
android:background="@drawable/dialpad_background"
android:orientation="horizontal">
@@ -37,6 +36,12 @@
android:contentDescription="@string/description_search_button"
android:src="@drawable/ic_see_contacts_holo_dark"/>
+ <View
+ android:layout_width="1dip"
+ android:layout_height="24dip"
+ android:layout_gravity="center_vertical"
+ android:background="?android:attr/dividerVertical" />
+
<!-- Onscreen "Dial" button, diused on all platforms by
default. Its usage can be disabled using resources (see
config.xml.) -->
@@ -50,6 +55,12 @@
android:contentDescription="@string/description_dial_button"
android:src="@drawable/ic_dial_action_call" />
+ <View
+ android:layout_width="1dip"
+ android:layout_height="24dip"
+ android:layout_gravity="center_vertical"
+ android:background="?android:attr/dividerVertical" />
+
<!-- Onscreen "Backspace/Delete" button -->
<ImageButton android:id="@+id/deleteButton"
android:layout_width="0px"
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 96cf543..ed16caf 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -59,6 +59,11 @@
<!-- Keypad section -->
<include layout="@layout/dialpad" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dialpad_vertical_margin"
+ android:background="#66000000"/>
+
<!-- Horizontal row of buttons (Search + DialButton + Delete.) -->
<include layout="@layout/dialpad_additional_buttons" />
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 defd229..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>
@@ -141,7 +136,7 @@
<dimen name="group_detail_border_padding">32dip</dimen>
<!-- Height of edit text in dialpad fragment -->
- <dimen name="dialpad_horizontal_margin">4dip</dimen>
+ <dimen name="dialpad_horizontal_margin">0dip</dimen>
<dimen name="dialpad_vertical_margin">2dip</dimen>
<dimen name="dialpad_digits_text_size">35sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0b47d5a..24822c0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
<item name="android:windowActionBarOverlay">true</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
- <item name="android:windowBackground">@android:color/black</item>
+ <item name="android:windowBackground">@drawable/background_dial_holo_dark</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">32dip</item>
