Merge "Add new APN for MTS UA and set it by default." into gingerbread
diff --git a/get-google-files b/get-google-files
index e5e6817..009e169 100755
--- a/get-google-files
+++ b/get-google-files
@@ -2,7 +2,7 @@
 import sys, random, urllib2, zipfile, StringIO, os
 from optparse import OptionParser
 
-FILENAME=["gapps-gb-20110307-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110501-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
+FILENAME=["gapps-gb-20110613-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110501-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
 VERSIONS=["gb","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
 MIRRORS=["http://goo-inside.me/gapps/","http://android.d3xt3r01.tk/cyanogen/gapps/"]
 
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
index 646fa79..cfa3233 100644
--- a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
@@ -63,13 +63,20 @@
         android:layout_height="48dip"
         android:orientation="horizontal"
         android:layout_marginTop="4dip"
-        android:paddingLeft="14dip"
-        android:paddingRight="13dip"
+        android:paddingLeft="0dip"
+        android:paddingRight="0dip"
         >
+        <ImageButton android:id="@+id/btn_seekdown"
+            android:src="@drawable/btn_arrow_left"
+            android:background="@null"
+            android:layout_marginLeft="1dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
         <ImageButton android:id="@+id/btn_speaker"
             android:src="@drawable/button_loudspeaker_off"
             android:background="@null"
-            android:layout_marginLeft="5dip"
+            android:layout_marginLeft="0dip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             />
@@ -78,7 +85,7 @@
             android:background="@drawable/station_freq_bg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="28dip"
+            android:layout_marginLeft="1dip"
             >
             <TextView android:id="@+id/prog_frequency_tv"
                 android:layout_width="match_parent"
@@ -94,7 +101,15 @@
         <ImageButton android:id="@+id/btn_onoff"
             android:src="@drawable/button_power_off"
             android:background="@null"
-            android:layout_marginLeft="28dip"
+            android:layout_marginLeft="1dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+        <ImageButton android:id="@+id/btn_seekup"
+            android:src="@drawable/btn_arrow_right"
+            android:background="@null"
+            android:layout_marginLeft="0dip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             />
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
new file mode 100644
index 0000000..f6c7c99
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
Binary files differ
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
index 634fcbf..74577a3 100644
--- a/products/cyanogen_blade.mk
+++ b/products/cyanogen_blade.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := blade
 PRODUCT_MODEL := Blade
 PRODUCT_MANUFACTURER := ZTE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cyanogen_blade BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
 
 #
 # Set ro.modversion
diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk
index 8a86b5a..ed7591b 100644
--- a/products/cyanogen_u8220.mk
+++ b/products/cyanogen_u8220.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := u8220
 PRODUCT_MODEL := U8220/U8230
 PRODUCT_MANUFACTURER := Huawei
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8220 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
 
 #
 # Set ro.modversion