commit b315980367699d2c071007e682805f66773f191d
author Ken Shirriff <kens@google.com> Thu Jun 11 17:03:35 2009 -0700
committer Ken Shirriff <kens@google.com> Fri Jun 12 15:04:25 2009 -0700
tree bc042a705373b2589fd55f3ee9dac6bf8b83e47d
parent 0422a3bf61c17851abd87a67a0de30e412459b5c

Improve power control widget GUI.

Shrink power widget to 3 cells wide.  Reorder buttons to group wireless
and other.  Add color bar to indicate on/off.

res/drawable/widget_btn_bluetooth.png

diff --git a/res/drawable/widget_btn_bluetooth.png b/res/drawable/widget_btn_bluetooth.png
index 5de9d78..f32d0b2 100644
--- a/res/drawable/widget_btn_bluetooth.png
+++ b/res/drawable/widget_btn_bluetooth.png
Binary files differ

res/drawable/widget_btn_bluetooth_gray.png

diff --git a/res/drawable/widget_btn_bluetooth_gray.png b/res/drawable/widget_btn_bluetooth_gray.png
index 843dcce..a633554 100644
--- a/res/drawable/widget_btn_bluetooth_gray.png
+++ b/res/drawable/widget_btn_bluetooth_gray.png
Binary files differ

res/drawable/widget_btn_bluetooth_off.png

diff --git a/res/drawable/widget_btn_bluetooth_off.png b/res/drawable/widget_btn_bluetooth_off.png
index b831a46..c0ef641 100644
--- a/res/drawable/widget_btn_bluetooth_off.png
+++ b/res/drawable/widget_btn_bluetooth_off.png
Binary files differ

res/drawable/widget_btn_brightness.png

diff --git a/res/drawable/widget_btn_brightness.png b/res/drawable/widget_btn_brightness.png
index a162899..9a7c7b9 100644
--- a/res/drawable/widget_btn_brightness.png
+++ b/res/drawable/widget_btn_brightness.png
Binary files differ

res/drawable/widget_btn_brightness_off.png

diff --git a/res/drawable/widget_btn_brightness_off.png b/res/drawable/widget_btn_brightness_off.png
index 0f42f2d..46dc508 100644
--- a/res/drawable/widget_btn_brightness_off.png
+++ b/res/drawable/widget_btn_brightness_off.png
Binary files differ

res/drawable/widget_btn_gps.png

diff --git a/res/drawable/widget_btn_gps.png b/res/drawable/widget_btn_gps.png
index 3394cb4..b21e8c8 100644
--- a/res/drawable/widget_btn_gps.png
+++ b/res/drawable/widget_btn_gps.png
Binary files differ

res/drawable/widget_btn_gps_off.png

diff --git a/res/drawable/widget_btn_gps_off.png b/res/drawable/widget_btn_gps_off.png
index 7f481d8..042fefb 100644
--- a/res/drawable/widget_btn_gps_off.png
+++ b/res/drawable/widget_btn_gps_off.png
Binary files differ

res/drawable/widget_btn_sync.png

diff --git a/res/drawable/widget_btn_sync.png b/res/drawable/widget_btn_sync.png
index 9682879..6133233 100644
--- a/res/drawable/widget_btn_sync.png
+++ b/res/drawable/widget_btn_sync.png
Binary files differ

res/drawable/widget_btn_sync_off.png

diff --git a/res/drawable/widget_btn_sync_off.png b/res/drawable/widget_btn_sync_off.png
index 0f48a1d..192cad8 100644
--- a/res/drawable/widget_btn_sync_off.png
+++ b/res/drawable/widget_btn_sync_off.png
Binary files differ

res/drawable/widget_btn_wifi.png

diff --git a/res/drawable/widget_btn_wifi.png b/res/drawable/widget_btn_wifi.png
index ff7d2ef..2d39681 100644
--- a/res/drawable/widget_btn_wifi.png
+++ b/res/drawable/widget_btn_wifi.png
Binary files differ

res/drawable/widget_btn_wifi_gray.png

diff --git a/res/drawable/widget_btn_wifi_gray.png b/res/drawable/widget_btn_wifi_gray.png
index 8a3cc49..76f36e8 100644
--- a/res/drawable/widget_btn_wifi_gray.png
+++ b/res/drawable/widget_btn_wifi_gray.png
Binary files differ

res/drawable/widget_btn_wifi_off.png

diff --git a/res/drawable/widget_btn_wifi_off.png b/res/drawable/widget_btn_wifi_off.png
index 8f15b4f..9b70cf1 100644
--- a/res/drawable/widget_btn_wifi_off.png
+++ b/res/drawable/widget_btn_wifi_off.png
Binary files differ

res/layout/widget.xml

diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index c409e68..dea290e 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -36,25 +36,13 @@
         />
 
         <ImageButton
-            android:id="@+id/btn_brightness"
+            android:id="@+id/btn_bluetooth"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:layout_marginLeft="3dip"
             android:layout_marginRight="3dip"
             android:background="@drawable/widget_btn"
             android:layout_gravity="center_horizontal"
-
-        />
-
-        <ImageButton
-            android:id="@+id/btn_sync"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_marginLeft="3dip"
-            android:layout_marginRight="3dip"
-            android:background="@drawable/widget_btn"
-            android:layout_gravity="center_horizontal"
-
         />
 
         <ImageButton
@@ -65,17 +53,26 @@
             android:layout_marginRight="3dip"
             android:background="@drawable/widget_btn"
             android:layout_gravity="center_horizontal"
-
         />
 
-            <ImageButton
-            android:id="@+id/btn_bluetooth"
+        <ImageButton
+            android:id="@+id/btn_sync"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:layout_marginLeft="3dip"
             android:layout_marginRight="3dip"
             android:background="@drawable/widget_btn"
             android:layout_gravity="center_horizontal"
-
         />
+
+        <ImageButton
+            android:id="@+id/btn_brightness"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="3dip"
+            android:layout_marginRight="3dip"
+            android:background="@drawable/widget_btn"
+            android:layout_gravity="center_horizontal"
+        />
+
     </LinearLayout>