Skip to content

Commit

Permalink
Internal migration.
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 580529319
  • Loading branch information
@JillSong @maddevrelgithubbot
JillSong authored and maddevrelgithubbot committed Nov 22, 2023
1 parent 5a002c9 commit cda6b21
Show file tree
Hide file tree
Showing 25 changed files with 66 additions and 50 deletions.
2 changes: 1 addition & 1 deletion ...penExample/app/src/main/java/com/google/android/gms/example/appopendemo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
package com.google.android.gms.example.appopendemo;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.PopupMenu;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;

/** Main activity in the app. */
public class MainActivity extends AppCompatActivity {
Expand Down
13 changes: 6 additions & 7 deletions ...enExample/app/src/main/java/com/google/android/gms/example/appopendemo/MyApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ProcessLifecycleOwner;
import com.google.android.gms.ads.AdError;
import com.google.android.gms.ads.FullScreenContentCallback;
Expand All @@ -38,7 +37,7 @@

/** Application class that initializes, loads and show ads when activities change states. */
public class MyApplication extends Application
implements ActivityLifecycleCallbacks, LifecycleObserver {
implements ActivityLifecycleCallbacks, DefaultLifecycleObserver {

private AppOpenAdManager appOpenAdManager;
private Activity currentActivity;
Expand All @@ -54,9 +53,9 @@ public void onCreate() {
}

/** LifecycleObserver method that shows the app open ad when the app moves to foreground. */
@OnLifecycleEvent(Event.ON_START)
protected void onMoveToForeground() {
// Show the ad (if available) when the app moves to foreground.
@Override
public void onStart(@NonNull LifecycleOwner owner) {
DefaultLifecycleObserver.super.onStart(owner);
appOpenAdManager.showAdIfAvailable(currentActivity);
}

Expand Down
17 changes: 8 additions & 9 deletions ...nExample/app/src/main/java/com/google/android/gms/example/appopendemo/SplashActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
*/
package com.google.android.gms.example.appopendemo;

import android.annotation.SuppressLint;
import android.app.Application;
import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.MobileAds;
import com.google.android.gms.example.appopendemo.MyApplication.OnShowAdCompleteListener;
import java.util.concurrent.TimeUnit;
Expand All @@ -47,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_splash);

// Create a timer so the SplashActivity will be displayed for a fixed amount of time.
createTimer(COUNTER_TIME_MILLISECONDS);
createTimer();

googleMobileAdsConsentManager =
GoogleMobileAdsConsentManager.getInstance(getApplicationContext());
Expand Down Expand Up @@ -77,22 +78,20 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

/**
* Create the countdown timer, which counts down to zero and show the app open ad.
*
* @param time the number of milliseconds that the timer counts down from
*/
private void createTimer(long time) {
/** Create the countdown timer, which counts down to zero and show the app open ad. */
private void createTimer() {
final TextView counterTextView = findViewById(R.id.timer);

CountDownTimer countDownTimer =
new CountDownTimer(time, 1000) {
new CountDownTimer(SplashActivity.COUNTER_TIME_MILLISECONDS, 1000) {
@SuppressLint("SetTextI18n")
@Override
public void onTick(long millisUntilFinished) {
secondsRemaining = TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) + 1;
counterTextView.setText("App is done loading in: " + secondsRemaining);
}

@SuppressLint("SetTextI18n")
@Override
public void onFinish() {
secondsRemaining = 0;
Expand Down
2 changes: 1 addition & 1 deletion ...nerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.google.android.gms.example.bannerexample;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
Expand All @@ -27,6 +26,7 @@
import android.widget.FrameLayout;
import android.widget.PopupMenu;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.MobileAds;
import com.google.android.gms.ads.RequestConfiguration;
Expand Down
7 changes: 5 additions & 2 deletions ...mple/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -28,6 +27,7 @@
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdError;
import com.google.android.gms.ads.FullScreenContentCallback;
import com.google.android.gms.ads.LoadAdError;
Expand Down Expand Up @@ -244,8 +244,11 @@ public void onAdFailedToLoad(@NonNull LoadAdError loadAdError) {
adIsLoading = false;
String error =
String.format(
java.util.Locale.US,
"domain: %s, code: %d, message: %s",
loadAdError.getDomain(), loadAdError.getCode(), loadAdError.getMessage());
loadAdError.getDomain(),
loadAdError.getCode(),
loadAdError.getMessage());
Toast.makeText(
MyActivity.this, "onAdFailedToLoad() with error: " + error, Toast.LENGTH_SHORT)
.show();
Expand Down
2 changes: 1 addition & 1 deletion ...iveAdsExample/app/src/main/java/com/google/example/gms/nativeadsexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.annotation.SuppressLint;
import android.os.Build;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -32,6 +31,7 @@
import android.widget.RatingBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.LoadAdError;
Expand Down
4 changes: 2 additions & 2 deletions ...xample/app/src/main/java/com/google/ads/rewardedinterstitialexample/AdDialogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;

/**
* A dialog fragment to inform the users about an upcoming interstitial video ad and let the user
Expand Down
2 changes: 1 addition & 1 deletion ...ardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -14,6 +13,7 @@
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdError;
import com.google.android.gms.ads.FullScreenContentCallback;
import com.google.android.gms.ads.LoadAdError;
Expand Down
2 changes: 1 addition & 1 deletion ...Example/app/src/main/java/com/google/android/gms/example/appopenexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
package com.google.android.gms.example.appopenexample;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.PopupMenu;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;

/** Main activity in the app. */
public class MainActivity extends AppCompatActivity {
Expand Down
2 changes: 1 addition & 1 deletion ...ample/app/src/main/java/com/google/android/gms/example/appopenexample/SplashActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.MobileAds;
import com.google.android.gms.example.appopenexample.MyApplication.OnShowAdCompleteListener;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion ...nerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.google.android.gms.example.bannerexample;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
Expand All @@ -27,6 +26,7 @@
import android.widget.FrameLayout;
import android.widget.PopupMenu;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.AdView;
Expand Down
2 changes: 1 addition & 1 deletion ...Example/app/src/main/java/com/google/example/gms/fullscreennativeexample/FeedAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.google.example.gms.fullscreennativeexample;

import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.gms.ads.nativead.NativeAd;
import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion ...mple/app/src/main/java/com/google/example/gms/fullscreennativeexample/FeedViewHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.google.example.gms.fullscreennativeexample;

import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import androidx.recyclerview.widget.RecyclerView;

/** ViewHolder instance which holds the actual feed. */
public abstract class FeedViewHolder extends RecyclerView.ViewHolder {
Expand Down
6 changes: 3 additions & 3 deletions ...pp/src/main/java/com/google/example/gms/fullscreennativeexample/RecyclerViewFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
package com.google.example.gms.fullscreennativeexample;

import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.PagerSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.google.example.gms.fullscreennativeexample.FeedAdapter.AdFeedItem;
import com.google.example.gms.fullscreennativeexample.NativeAdsPool.OnPoolRefreshedListener;

Expand Down
7 changes: 5 additions & 2 deletions ...mple/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -28,6 +27,7 @@
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdError;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.FullScreenContentCallback;
Expand Down Expand Up @@ -173,8 +173,11 @@ public void onAdFailedToLoad(@NonNull LoadAdError loadAdError) {

String error =
String.format(
java.util.Locale.US,
"domain: %s, code: %d, message: %s",
loadAdError.getDomain(), loadAdError.getCode(), loadAdError.getMessage());
loadAdError.getDomain(),
loadAdError.getCode(),
loadAdError.getMessage());
Toast.makeText(
MyActivity.this, "onAdFailedToLoad() with error: " + error, Toast.LENGTH_SHORT)
.show();
Expand Down
2 changes: 1 addition & 1 deletion ...dExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.annotation.SuppressLint;
import android.os.Build;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -32,6 +31,7 @@
import android.widget.RatingBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.AdRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...ardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.CountDownTimer;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -14,6 +13,7 @@
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.gms.ads.AdError;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.FullScreenContentCallback;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/google/android/gms/example/apidemo/AdManagerCustomControlsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import android.content.res.Resources;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -28,6 +27,7 @@
import android.widget.RatingBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.fragment.app.Fragment;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.LoadAdError;
Expand Down
5 changes: 4 additions & 1 deletion ...emo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobAdListenerFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,11 @@ public void onAdLoaded() {
public void onAdFailedToLoad(LoadAdError loadAdError) {
String error =
String.format(
java.util.Locale.US,
"domain: %s, code: %d, message: %s",
loadAdError.getDomain(), loadAdError.getCode(), loadAdError.getMessage());
loadAdError.getDomain(),
loadAdError.getCode(),
loadAdError.getMessage());
showToast(String.format("Ad failed to load with error %s", error));
}

Expand Down
4 changes: 2 additions & 2 deletions ...p/src/main/java/com/google/android/gms/example/apidemo/AdMobCustomMuteThisAdFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import android.content.DialogInterface;
import android.content.res.Resources;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -30,6 +28,8 @@
import android.widget.RatingBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.AdRequest;
Expand Down
Loading

0 comments on commit cda6b21

Please sign in to comment.