Merge change 3994 into donut
* changes:
Shrink power widget to 3 cells wide.
diff --git a/res/drawable/widget_btn_default.9.png b/res/drawable/widget_btn_default.9.png
index febf222..3908327 100644
--- a/res/drawable/widget_btn_default.9.png
+++ b/res/drawable/widget_btn_default.9.png
Binary files differ
diff --git a/res/drawable/widget_btn_pressed.9.png b/res/drawable/widget_btn_pressed.9.png
index 70a200b..112a8eb 100644
--- a/res/drawable/widget_btn_pressed.9.png
+++ b/res/drawable/widget_btn_pressed.9.png
Binary files differ
diff --git a/res/drawable/widget_btn_selected.9.png b/res/drawable/widget_btn_selected.9.png
index 6f2989f..fb25235 100644
--- a/res/drawable/widget_btn_selected.9.png
+++ b/res/drawable/widget_btn_selected.9.png
Binary files differ
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 63ce5a5..c409e68 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -19,8 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="12dip"
- android:paddingRight="12dip"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
android:paddingTop="7dip"
android:paddingBottom="13dip"
android:background="@drawable/widget_bg" >
@@ -29,7 +29,8 @@
android:id="@+id/btn_wifi"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:layout_marginLeft="8dip"
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="3dip"
android:background="@drawable/widget_btn"
android:layout_gravity="center_horizontal"
/>
@@ -38,7 +39,8 @@
android:id="@+id/btn_brightness"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:layout_marginLeft="8dip"
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="3dip"
android:background="@drawable/widget_btn"
android:layout_gravity="center_horizontal"
@@ -48,7 +50,8 @@
android:id="@+id/btn_sync"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:layout_marginLeft="8dip"
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="3dip"
android:background="@drawable/widget_btn"
android:layout_gravity="center_horizontal"
@@ -58,7 +61,8 @@
android:id="@+id/btn_gps"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:layout_marginLeft="8dip"
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="3dip"
android:background="@drawable/widget_btn"
android:layout_gravity="center_horizontal"
@@ -68,7 +72,8 @@
android:id="@+id/btn_bluetooth"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:layout_marginLeft="8dip"
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="3dip"
android:background="@drawable/widget_btn"
android:layout_gravity="center_horizontal"
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 2186dab..02a1dfd 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,7 +15,7 @@
-->
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="294dip"
+ android:minWidth="219dip"
android:minHeight="72dip"
android:initialLayout="@layout/widget"
>