diff --git a/gen/com/google/android/gms/R.java b/gen/com/google/android/gms/R.java index e036d83..e69718a 100644 --- a/gen/com/google/android/gms/R.java +++ b/gen/com/google/android/gms/R.java @@ -107,6 +107,7 @@ public final class R { public static final int common_google_play_services_update_title = 0x7f060007; public static final int common_signin_button_text = 0x7f060012; public static final int common_signin_button_text_long = 0x7f060013; + public static final int location_client_powered_by_google = 0x7f06001a; } public static final class styleable { public static final int[] AdsAttrs = { 0x7f010000, 0x7f010001, 0x7f010002 }; diff --git a/gen/mangavalk/tetris/R.java b/gen/mangavalk/tetris/R.java index 1160a0e..075f6de 100644 --- a/gen/mangavalk/tetris/R.java +++ b/gen/mangavalk/tetris/R.java @@ -267,8 +267,8 @@ containing a value of this type. public static final int tetris_a=0x7f030000; } public static final class string { - public static final int action_settings=0x7f06001b; - public static final int app_name=0x7f06001a; + public static final int action_settings=0x7f06001c; + public static final int app_name=0x7f06001b; /** Title for notification shown when GooglePlayServices needs to be enabled for a application to work. [CHAR LIMIT=70] */ @@ -363,7 +363,10 @@ containing a value of this type. /** Long form sign-in button text [CHAR LIMIT=30] */ public static final int common_signin_button_text_long=0x7f060013; - public static final int hello_world=0x7f06001c; + public static final int hello_world=0x7f06001d; + /** Location client code resources (prefix with location_client) + */ + public static final int location_client_powered_by_google=0x7f06001a; } public static final class style { /** diff --git a/project.properties b/project.properties index 3a09501..475f523 100644 --- a/project.properties +++ b/project.properties @@ -13,3 +13,4 @@ # Project target. target=android-19 android.library.reference.1=../../../../Desktop/adt-bundle-windows-x86_64-20131030/adt-bundle-windows-x86_64-20131030/sdk/extras/google/google_play_services/libproject/google-play-services_lib +android.library=false diff --git a/src/mangavalk/tetris/MainActivity.java b/src/mangavalk/tetris/MainActivity.java index 8300e54..16977f0 100644 --- a/src/mangavalk/tetris/MainActivity.java +++ b/src/mangavalk/tetris/MainActivity.java @@ -32,8 +32,9 @@ public class MainActivity extends Activity // Initiate a generic request. AdRequest adRequest = new AdRequest.Builder() // Add S5 - .addTestDevice("D23CD70B20EE4AF169D112010B8DC97E") // Htc One X + //.addTestDevice("D23CD70B20EE4AF169D112010B8DC97E") // Htc One X .addTestDevice("029011F06A23EB6FFF862E44CC792EF2") // Nexus 7 tablet + .addTestDevice("2CA96A8B6B805B3323F65A934FB31DC7") // Samsung Galaxy S5 .build(); canvasClass = new CanvasView(this); @@ -42,11 +43,11 @@ public class MainActivity extends Activity canvasClass.startLevel = 0; - if (!canvasClass.PayedVersion) - { - // Load the adView with the ad request. - adView.loadAd(adRequest); - } + //if (!canvasClass.PayedVersion) + //{ + // Load the adView with the ad request. + adView.loadAd(adRequest); + //} ll.addView(canvasClass);