more admob sdk updates

.classpath

@@ -3,9 +3,9 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/GoogleAdMobAdsSdk-4.0.4.jar"/>
 	<classpathentry kind="src" path="libwave_src"/>
 	<classpathentry kind="src" path="libautotalent_src"/>
 	<classpathentry kind="src" path="libresample_src"/>
-	<classpathentry kind="lib" path="libs/GoogleAdMobAdsSdk-4.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

AndroidManifest.xml

@@ -4,6 +4,7 @@
 	android:versionName="0.44" android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -35,18 +36,8 @@
 			android:name=".InstrumentalLibrary" />
 
 		<!-- AdMobActivity definition -->
-		<activity android:name="com.admob.android.ads.AdMobActivity"
-			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+		<activity android:name="com.google.ads.AdActivity"
 			android:configChanges="orientation|keyboard|keyboardHidden" />
 
-		<!-- Track Market Installs -->
-		<receiver android:name="com.admob.android.ads.analytics.InstallReceiver" android:exported="true">
-			<intent-filter>
-				<action android:name="com.android.vending.INSTALL_REFERRER" />
-			</intent-filter>
-		</receiver>
-
-		<meta-data android:value="a14cbf73c14c77d" android:name="ADMOB_PUBLISHER_ID" />
-
 	</application>
 </manifest>

res/layout/instrumental_library.xml

@@ -2,14 +2,14 @@
 
 <LinearLayout android:id="@+id/recording_library_layout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:admobsdk="http://schemas.android.com/apk/res/com.intervigil.micdroid"
+	xmlns:ads="http://schemas.android.com/apk/res/com.intervigil.micdroid"
 	android:orientation="vertical" android:gravity="center"
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
 
-	<com.admob.android.ads.AdView android:id="@+id/instrumental_ad"
+	<com.google.ads.AdView android:id="@+id/instrumental_ad"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		admobsdk:backgroundColor="#000000" admobsdk:primaryTextColor="#FFFFFF"
-		admobsdk:keywords="android music t-pain autotune" />
+		ads:adUnitId="a14cbf73c14c77d"
+		ads:adSize="BANNER" />
 
     <TextView android:id="@+id/instrumental_current_label" android:text="@string/instrumental_current_label"
         android:layout_width="fill_parent" android:layout_height="wrap_content" />

res/layout/recording_library.xml

@@ -2,13 +2,14 @@
 
 <LinearLayout android:id="@+id/recording_library_layout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:admobsdk="http://schemas.android.com/apk/res/com.intervigil.micdroid"
+	xmlns:ads="http://schemas.android.com/apk/res/com.intervigil.micdroid"
 	android:orientation="vertical" android:gravity="center"
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
 
-	<com.admob.android.ads.AdView android:id="@+id/recording_ad"
+	<com.google.ads.AdView android:id="@+id/recording_ad"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		admobsdk:backgroundColor="#000000" admobsdk:primaryTextColor="#FFFFFF" />
+		ads:adUnitId="a14cbf73c14c77d"
+		ads:adSize="BANNER" />
 
 	<TextView android:id="@+id/recording_library_title"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"

res/values/attrs.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<declare-styleable name="com.admob.android.ads.AdView">
-		<attr name="backgroundColor" format="color" />
-		<attr name="primaryTextColor" format="color" />
-		<attr name="secondaryTextColor" format="color" />
-		<attr name="keywords" format="string" />
-		<attr name="refreshInterval" format="integer" />
-	</declare-styleable>
+  <declare-styleable name="com.google.ads.AdView">
+      <attr name="adSize">
+          <enum name="BANNER" value="1"/>
+          <enum name="IAB_MRECT" value="2"/>
+          <enum name="IAB_BANNER" value="3"/>
+          <enum name="IAB_LEADERBOARD" value="4"/>
+      </attr>
+      <attr name="adUnitId" format="string"/>
+  </declare-styleable>
 </resources>

src/com/intervigil/micdroid/InstrumentalLibrary.java

@@ -37,6 +37,7 @@
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.google.ads.AdRequest;
 import com.google.ads.AdView;
 import com.intervigil.micdroid.helper.DialogHelper;
 import com.intervigil.micdroid.helper.PreferenceHelper;
@@ -66,6 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mAdView = (AdView) findViewById(R.id.instrumental_ad);
         mAdView.setEnabled(mShowAds);
+        mAdView.loadAd(new AdRequest());
 
         mCurrentTrack = (EditText) findViewById(R.id.instrumental_current);
         mInputFilename = (EditText) findViewById(R.id.instrumental_selected);

src/com/intervigil/micdroid/RecordingLibrary.java

@@ -48,6 +48,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 
+import com.google.ads.AdRequest;
 import com.google.ads.AdView;
 import com.intervigil.micdroid.helper.ApplicationHelper;
 import com.intervigil.micdroid.helper.DialogHelper;
@@ -87,6 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ad = (AdView) findViewById(R.id.recording_ad);
         ad.setEnabled(showAds);
+        ad.loadAd(new AdRequest());
 
         library = (ListView) findViewById(R.id.recording_library_list);
         library.setOnItemClickListener(this);