am f1e80834: am 9725fac3: Merge change I9cdaba5e into eclair

Merge commit 'f1e80834961948f18dd07ea26ac385b521454682'

* commit 'f1e80834961948f18dd07ea26ac385b521454682':
  New assets for settings

16 files changed, 6 insertions, 6 deletions

diff --git a/res/drawable-hdpi/ic_list_data_large.png b/res/drawable-hdpi/ic_list_data_large.png
new file mode 100644
index 0000000..aaa035d
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_large.png
diff --git a/res/drawable-hdpi/ic_list_data_off.png b/res/drawable-hdpi/ic_list_data_off.png
new file mode 100644
index 0000000..f7eb6af
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_off.png
diff --git a/res/drawable-hdpi/ic_list_data_small.png b/res/drawable-hdpi/ic_list_data_small.png
new file mode 100644
index 0000000..eb90a6b
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_small.png
diff --git a/res/drawable-hdpi/ic_list_gps_off.png b/res/drawable-hdpi/ic_list_gps_off.png
new file mode 100644
index 0000000..b6bc3ba
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_gps_off.png
diff --git a/res/drawable-hdpi/ic_list_gps_on.png b/res/drawable-hdpi/ic_list_gps_on.png
new file mode 100644
index 0000000..2c02e58
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_gps_on.png
diff --git a/res/drawable-mdpi/ic_list_data_large.png b/res/drawable-mdpi/ic_list_data_large.png
new file mode 100644
index 0000000..58f7c2f
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_large.png
diff --git a/res/drawable-mdpi/ic_list_data_off.png b/res/drawable-mdpi/ic_list_data_off.png
new file mode 100644
index 0000000..69d4eae
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_off.png
diff --git a/res/drawable-mdpi/ic_list_data_small.png b/res/drawable-mdpi/ic_list_data_small.png
new file mode 100644
index 0000000..3d40655
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_small.png
diff --git a/res/drawable-mdpi/ic_list_gps_off.png b/res/drawable-mdpi/ic_list_gps_off.png
new file mode 100644
index 0000000..ed73bce
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_gps_off.png
diff --git a/res/drawable-mdpi/ic_list_gps_on.png b/res/drawable-mdpi/ic_list_gps_on.png
new file mode 100644
index 0000000..15ff6ee
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_gps_on.png
diff --git a/res/drawable/location.png b/res/drawable/location.png
deleted file mode 100644
index c7eb1dc..0000000
--- a/res/drawable/location.png
+++ /dev/null
diff --git a/res/drawable/usage_empty.png b/res/drawable/usage_empty.png
deleted file mode 100644
index 6a7e2db..0000000
--- a/res/drawable/usage_empty.png
+++ /dev/null
diff --git a/res/drawable/usage_high.png b/res/drawable/usage_high.png
deleted file mode 100644
index 006e1ac..0000000
--- a/res/drawable/usage_high.png
+++ /dev/null
diff --git a/res/drawable/usage_low.png b/res/drawable/usage_low.png
deleted file mode 100644
index 828ffb2..0000000
--- a/res/drawable/usage_low.png
+++ /dev/null
diff --git a/res/drawable/usage_medium.png b/res/drawable/usage_medium.png
deleted file mode 100644
index dc37363..0000000
--- a/res/drawable/usage_medium.png
+++ /dev/null
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 911e1d6..4901ff1 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -22,8 +22,8 @@
   android:padding="0dip">
 
   <ImageView android:id="@+id/icon"
-    android:layout_width="32px"
-    android:layout_height="32px"
+    android:layout_width="32dip"
+    android:layout_height="32dip"
     android:layout_alignParentTop="true"
     android:layout_alignParentLeft="true"
     android:layout_alignParentBottom="true"
@@ -40,13 +40,13 @@
     android:layout_marginRight="2dip">
 
     <ImageView android:id="@+id/location_icon"
-      android:layout_width="32px"
-      android:layout_height="32px"
+      android:layout_width="32dip"
+      android:layout_height="32dip"
       android:padding="2dip" />
 
     <ImageView android:id="@+id/usage_icon"
-      android:layout_width="32px"
-      android:layout_height="32px"
+      android:layout_width="32dip"
+      android:layout_height="32dip"
       android:padding="2dip" />
 
   </LinearLayout>