Merge "Making contact widget 4x1, updating some assets"
diff --git a/res/drawable-hdpi/bg_status_contact_widget.9.png b/res/drawable-hdpi/bg_status_contact_widget.9.png
new file mode 100644
index 0000000..5615057
--- /dev/null
+++ b/res/drawable-hdpi/bg_status_contact_widget.9.png
Binary files differ
diff --git a/res/drawable-hdpi/frame_thumbnail_contact_widget_focused_holo.png b/res/drawable-hdpi/frame_thumbnail_contact_widget_focused_holo.png
new file mode 100644
index 0000000..e2a9fe0
--- /dev/null
+++ b/res/drawable-hdpi/frame_thumbnail_contact_widget_focused_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/frame_thumbnail_contact_widget_normal_holo.png b/res/drawable-hdpi/frame_thumbnail_contact_widget_normal_holo.png
new file mode 100644
index 0000000..21566bc
--- /dev/null
+++ b/res/drawable-hdpi/frame_thumbnail_contact_widget_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/frame_thumbnail_contact_widget_pressed_holo.png b/res/drawable-hdpi/frame_thumbnail_contact_widget_pressed_holo.png
new file mode 100644
index 0000000..1f5b5f9
--- /dev/null
+++ b/res/drawable-hdpi/frame_thumbnail_contact_widget_pressed_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/photo_frame_widget_focused_holo_light.9.png b/res/drawable-hdpi/photo_frame_widget_focused_holo_light.9.png
deleted file mode 100644
index 2dd0b71..0000000
--- a/res/drawable-hdpi/photo_frame_widget_focused_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/photo_frame_widget_normal_holo_light.9.png b/res/drawable-hdpi/photo_frame_widget_normal_holo_light.9.png
deleted file mode 100644
index c4435b3..0000000
--- a/res/drawable-hdpi/photo_frame_widget_normal_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/photo_frame_widget_pressed_holo_light.9.png b/res/drawable-hdpi/photo_frame_widget_pressed_holo_light.9.png
deleted file mode 100644
index d4021cc..0000000
--- a/res/drawable-hdpi/photo_frame_widget_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_status_contact_widget.9.png b/res/drawable-mdpi/bg_status_contact_widget.9.png
new file mode 100644
index 0000000..e3eccc2
--- /dev/null
+++ b/res/drawable-mdpi/bg_status_contact_widget.9.png
Binary files differ
diff --git a/res/drawable-mdpi/frame_thumbnail_contact_widget_focused_holo.png b/res/drawable-mdpi/frame_thumbnail_contact_widget_focused_holo.png
new file mode 100644
index 0000000..ce60a60
--- /dev/null
+++ b/res/drawable-mdpi/frame_thumbnail_contact_widget_focused_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/frame_thumbnail_contact_widget_normal_holo.png b/res/drawable-mdpi/frame_thumbnail_contact_widget_normal_holo.png
new file mode 100644
index 0000000..a62834c
--- /dev/null
+++ b/res/drawable-mdpi/frame_thumbnail_contact_widget_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/frame_thumbnail_contact_widget_pressed_holo.png b/res/drawable-mdpi/frame_thumbnail_contact_widget_pressed_holo.png
new file mode 100644
index 0000000..bba0d2c
--- /dev/null
+++ b/res/drawable-mdpi/frame_thumbnail_contact_widget_pressed_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/photo_frame_widget_focused_holo_light.9.png b/res/drawable-mdpi/photo_frame_widget_focused_holo_light.9.png
deleted file mode 100644
index ea5c0a0..0000000
--- a/res/drawable-mdpi/photo_frame_widget_focused_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/photo_frame_widget_normal_holo_light.9.png b/res/drawable-mdpi/photo_frame_widget_normal_holo_light.9.png
deleted file mode 100644
index 3c58bd2..0000000
--- a/res/drawable-mdpi/photo_frame_widget_normal_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/photo_frame_widget_pressed_holo_light.9.png b/res/drawable-mdpi/photo_frame_widget_pressed_holo_light.9.png
deleted file mode 100644
index d8f139c..0000000
--- a/res/drawable-mdpi/photo_frame_widget_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/photo_frame_widget_holo_light.xml b/res/drawable/frame_thumbnail_contact_widget_holo.xml
similarity index 76%
rename from res/drawable/photo_frame_widget_holo_light.xml
rename to res/drawable/frame_thumbnail_contact_widget_holo.xml
index a320e9e..1858f9d 100644
--- a/res/drawable/photo_frame_widget_holo_light.xml
+++ b/res/drawable/frame_thumbnail_contact_widget_holo.xml
@@ -16,9 +16,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/photo_frame_widget_pressed_holo_light" />
+ android:drawable="@drawable/frame_thumbnail_contact_widget_pressed_holo" />
<item android:state_focused="true"
- android:drawable="@drawable/photo_frame_widget_focused_holo_light" />
+ android:drawable="@drawable/frame_thumbnail_contact_widget_focused_holo" />
<item
- android:drawable="@drawable/photo_frame_widget_normal_holo_light" />
+ android:drawable="@drawable/frame_thumbnail_contact_widget_normal_holo" />
</selector>
diff --git a/res/layout/social_widget.xml b/res/layout/social_widget.xml
index 841b479..0aec180 100644
--- a/res/layout/social_widget.xml
+++ b/res/layout/social_widget.xml
@@ -30,7 +30,7 @@
android:layout_height="match_parent" />
<ImageButton
android:id="@+id/border"
- android:background="@drawable/photo_frame_widget_holo_light"
+ android:background="@drawable/frame_thumbnail_contact_widget_holo"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
@@ -38,10 +38,10 @@
android:layout_width="0dip"
android:layout_height="90dip"
android:layout_weight="1"
- android:background="@drawable/statusbox_widget_holo_light"
+ android:background="@drawable/bg_status_contact_widget"
android:layout_gravity="center_vertical"
android:layout_marginLeft="-8dip"
- android:paddingLeft="24dip">
+ android:paddingLeft="44dip">
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/xml/social_widget_info.xml b/res/xml/social_widget_info.xml
index 4fb849c..19366ff 100644
--- a/res/xml/social_widget_info.xml
+++ b/res/xml/social_widget_info.xml
@@ -17,7 +17,7 @@
<!-- It is enough to update once per day, as the widget watches the database for changes -->
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="220dip"
+ android:minWidth="294dip"
android:minHeight="72dip"
android:updatePeriodMillis="86400000"
android:initialLayout="@layout/social_widget"
