From 4648acffb219791e45fb72594fd5c0fb275a2f87 Mon Sep 17 00:00:00 2001 From: Nicholas Ventimiglia Date: Tue, 12 Dec 2023 10:17:09 -0800 Subject: [PATCH] Fixed build warnings and imports. PiperOrigin-RevId: 590249446 --- .../gms/example/appopendemo/MainActivity.java | 2 +- .../example/appopendemo/MyApplication.java | 13 ++++++------- .../example/appopendemo/SplashActivity.java | 17 ++++++++--------- .../gms/example/bannerexample/MyActivity.java | 2 +- .../interstitialexample/MyActivity.java | 7 +++++-- .../gms/nativeadsexample/MainActivity.java | 2 +- .../AdDialogFragment.java | 4 ++-- .../rewardedvideoexample/MainActivity.java | 2 +- .../example/appopenexample/MainActivity.java | 2 +- .../appopenexample/SplashActivity.java | 5 ++++- .../gms/example/bannerexample/MyActivity.java | 2 +- .../FullScreenNativeExample/app/build.gradle | 10 ++++++---- .../app/src/main/AndroidManifest.xml | 1 - .../ContentViewHolder.java | 19 +++++++++++-------- .../fullscreennativeexample/FeedAdapter.java | 2 +- .../FeedViewHolder.java | 2 +- .../RecyclerViewFragment.java | 9 +++++---- .../app/src/main/res/layout/ad_unified.xml | 4 ---- .../interstitialexample/MyActivity.java | 7 +++++-- .../nativeadvancedexample/MainActivity.java | 2 +- .../rewardedvideoexample/MainActivity.java | 2 +- .../AdManagerCustomControlsFragment.java | 2 +- .../apidemo/AdMobAdListenerFragment.java | 5 ++++- .../AdMobCustomMuteThisAdFragment.java | 4 ++-- .../example/apidemo/CustomControlsView.java | 7 +++++++ .../apidemo/NavigationDrawerFragment.java | 8 ++++---- .../src/main/res/layout/fragment_gam_ppid.xml | 3 ++- .../MainActivity.java | 7 +++++-- .../RecyclerViewAdapter.java | 4 +--- 29 files changed, 88 insertions(+), 68 deletions(-) diff --git a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MainActivity.java b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MainActivity.java index 57ea42a1b..03c2e2dff 100644 --- a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MainActivity.java +++ b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MainActivity.java @@ -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 { diff --git a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MyApplication.java b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MyApplication.java index 19a796692..beefa28e9 100644 --- a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MyApplication.java +++ b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/MyApplication.java @@ -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; @@ -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; @@ -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); } diff --git a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/SplashActivity.java b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/SplashActivity.java index 3a1ea4e7f..47c66ac33 100644 --- a/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/SplashActivity.java +++ b/java/admanager/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopendemo/SplashActivity.java @@ -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; @@ -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()); @@ -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; diff --git a/java/admanager/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java b/java/admanager/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java index 08a540934..176b36e01 100644 --- a/java/admanager/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java +++ b/java/admanager/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java @@ -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; @@ -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; diff --git a/java/admanager/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java b/java/admanager/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java index 6c54eb63a..de22daad3 100644 --- a/java/admanager/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java +++ b/java/admanager/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java @@ -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; @@ -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; @@ -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(); diff --git a/java/admanager/NativeAdsExample/app/src/main/java/com/google/example/gms/nativeadsexample/MainActivity.java b/java/admanager/NativeAdsExample/app/src/main/java/com/google/example/gms/nativeadsexample/MainActivity.java index d3cb63576..a8f81eeab 100644 --- a/java/admanager/NativeAdsExample/app/src/main/java/com/google/example/gms/nativeadsexample/MainActivity.java +++ b/java/admanager/NativeAdsExample/app/src/main/java/com/google/example/gms/nativeadsexample/MainActivity.java @@ -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; @@ -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; diff --git a/java/admanager/RewardedInterstitialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/AdDialogFragment.java b/java/admanager/RewardedInterstitialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/AdDialogFragment.java index 3209faf53..33dedc9c9 100644 --- a/java/admanager/RewardedInterstitialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/AdDialogFragment.java +++ b/java/admanager/RewardedInterstitialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/AdDialogFragment.java @@ -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 diff --git a/java/admanager/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java b/java/admanager/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java index 7616e163d..1504fbe76 100644 --- a/java/admanager/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java +++ b/java/admanager/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java @@ -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; @@ -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; diff --git a/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/MainActivity.java b/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/MainActivity.java index 0975b4c41..c1047a769 100644 --- a/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/MainActivity.java +++ b/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/MainActivity.java @@ -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 { diff --git a/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/SplashActivity.java b/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/SplashActivity.java index d8d09a79c..ada90b007 100644 --- a/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/SplashActivity.java +++ b/java/admob/AppOpenExample/app/src/main/java/com/google/android/gms/example/appopenexample/SplashActivity.java @@ -15,13 +15,14 @@ */ package com.google.android.gms.example.appopenexample; +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.appopenexample.MyApplication.OnShowAdCompleteListener; import java.util.concurrent.TimeUnit; @@ -87,12 +88,14 @@ private void createTimer(long time) { CountDownTimer countDownTimer = new CountDownTimer(time, 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; diff --git a/java/admob/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java b/java/admob/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java index c95e26a0d..90f09d744 100644 --- a/java/admob/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java +++ b/java/admob/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java @@ -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; @@ -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; diff --git a/java/admob/FullScreenNativeExample/app/build.gradle b/java/admob/FullScreenNativeExample/app/build.gradle index 3b8537b88..df10288b8 100644 --- a/java/admob/FullScreenNativeExample/app/build.gradle +++ b/java/admob/FullScreenNativeExample/app/build.gradle @@ -2,11 +2,10 @@ apply plugin: "com.android.application" android { namespace "com.google.example.gms.fullscreennativeexample" - compileSdkVersion 34 + compileSdk 34 defaultConfig { applicationId "com.google.android.gms.example.fullscreennativeexample" minSdkVersion 19 - multiDexEnabled = true targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -24,6 +23,9 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.recyclerview:recyclerview:1.3.0' - implementation 'com.google.android.exoplayer:exoplayer:2.18.6' - implementation 'com.google.android.gms:play-services-ads:22.6.0' + implementation 'androidx.media3:media3-exoplayer:1.2.0' + implementation 'androidx.media3:media3-exoplayer-dash:1.2.0' + implementation 'androidx.media3:media3-ui:1.2.0' + implementation "androidx.media3:media3-session:1.2.0" + implementation 'com.google.android.gms:play-services-ads:22.5.0' } diff --git a/java/admob/FullScreenNativeExample/app/src/main/AndroidManifest.xml b/java/admob/FullScreenNativeExample/app/src/main/AndroidManifest.xml index 251403ca0..83ea39e85 100644 --- a/java/admob/FullScreenNativeExample/app/src/main/AndroidManifest.xml +++ b/java/admob/FullScreenNativeExample/app/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ feedAdapter.add(new AdFeedItem(nativeAdsPool.pop()))); - nativeAdsPool.refresh(/* numOfAds= */ 5); + // numOfAds= + nativeAdsPool.refresh(5); return rootView; } } diff --git a/java/admob/FullScreenNativeExample/app/src/main/res/layout/ad_unified.xml b/java/admob/FullScreenNativeExample/app/src/main/res/layout/ad_unified.xml index 816078ffb..6815e1d67 100644 --- a/java/admob/FullScreenNativeExample/app/src/main/res/layout/ad_unified.xml +++ b/java/admob/FullScreenNativeExample/app/src/main/res/layout/ad_unified.xml @@ -51,10 +51,8 @@ android:layout_width="@dimen/headline_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/headline_margin_start" - android:background="@color/browser_actions_bg_grey" android:ellipsize="end" android:singleLine="true" - android:textColor="@color/browser_actions_text_color" android:textSize="@dimen/headline_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/ad_badge" @@ -64,10 +62,8 @@ android:id="@+id/ad_body" android:layout_width="@dimen/body_width" android:layout_height="wrap_content" - android:background="@color/browser_actions_bg_grey" android:ellipsize="end" android:singleLine="true" - android:textColor="@color/browser_actions_text_color" android:textSize="@dimen/body_text_size" app:layout_constraintStart_toStartOf="@id/ad_headline" app:layout_constraintTop_toBottomOf="@id/ad_headline" /> diff --git a/java/admob/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java b/java/admob/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java index c19f58a3f..f48b1844a 100644 --- a/java/admob/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java +++ b/java/admob/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java @@ -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; @@ -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; @@ -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(); diff --git a/java/admob/NativeAdvancedExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java b/java/admob/NativeAdvancedExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java index 25101690a..23a6e3dad 100644 --- a/java/admob/NativeAdvancedExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java +++ b/java/admob/NativeAdvancedExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java @@ -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; @@ -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; diff --git a/java/admob/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java b/java/admob/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java index b05f9555f..c2ed923e8 100644 --- a/java/admob/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java +++ b/java/admob/RewardedVideoExample/app/src/main/java/com/google/ads/rewardedvideoexample/MainActivity.java @@ -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; @@ -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; diff --git a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdManagerCustomControlsFragment.java b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdManagerCustomControlsFragment.java index 4ebb9736a..e221b5892 100644 --- a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdManagerCustomControlsFragment.java +++ b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdManagerCustomControlsFragment.java @@ -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; @@ -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; diff --git a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobAdListenerFragment.java b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobAdListenerFragment.java index 2e4846092..988256d2c 100644 --- a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobAdListenerFragment.java +++ b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobAdListenerFragment.java @@ -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)); } diff --git a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobCustomMuteThisAdFragment.java b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobCustomMuteThisAdFragment.java index 9936e6dfd..0234afaa6 100644 --- a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobCustomMuteThisAdFragment.java +++ b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/AdMobCustomMuteThisAdFragment.java @@ -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; @@ -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; diff --git a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/CustomControlsView.java b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/CustomControlsView.java index 934dabd62..22410ca0c 100644 --- a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/CustomControlsView.java +++ b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/CustomControlsView.java @@ -1,5 +1,6 @@ package com.google.android.gms.example.apidemo; +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -60,6 +61,7 @@ public void reset() { /* * Sets up the custom controls view with the provided VideoController. */ + @SuppressLint("SetTextI18n") public void setMediaContent(MediaContent mediaContent) { controlsView.setVisibility(View.GONE); if (mediaContent.hasVideoContent()) { @@ -104,6 +106,7 @@ public void onClick(View unusedView) { videoController.setVideoLifecycleCallbacks( new VideoController.VideoLifecycleCallbacks() { + @SuppressLint("SetTextI18n") @Override public void onVideoMute(final boolean muted) { videoStatusText.setText( @@ -112,6 +115,7 @@ public void onVideoMute(final boolean muted) { super.onVideoMute(muted); } + @SuppressLint("SetTextI18n") @Override public void onVideoPause() { videoStatusText.setText("Video status: Video did pause."); @@ -120,6 +124,7 @@ public void onVideoPause() { super.onVideoPause(); } + @SuppressLint("SetTextI18n") @Override public void onVideoPlay() { videoStatusText.setText("Video status: Video did play."); @@ -128,6 +133,7 @@ public void onVideoPlay() { super.onVideoPlay(); } + @SuppressLint("SetTextI18n") @Override public void onVideoStart() { videoStatusText.setText("Video status: Video did start."); @@ -136,6 +142,7 @@ public void onVideoStart() { super.onVideoStart(); } + @SuppressLint("SetTextI18n") @Override public void onVideoEnd() { videoStatusText.setText("Video status: Video playback has ended."); diff --git a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/NavigationDrawerFragment.java b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/NavigationDrawerFragment.java index f5e6522b0..560eeaf28 100644 --- a/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/NavigationDrawerFragment.java +++ b/java/advanced/APIDemo/app/src/main/java/com/google/android/gms/example/apidemo/NavigationDrawerFragment.java @@ -20,10 +20,6 @@ import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceManager; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -33,8 +29,12 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; /** * The {@link NavigationDrawerFragment} contains a horizontal {@link android.widget.ListView} diff --git a/java/advanced/APIDemo/app/src/main/res/layout/fragment_gam_ppid.xml b/java/advanced/APIDemo/app/src/main/res/layout/fragment_gam_ppid.xml index 6e7decf14..3d907941f 100644 --- a/java/advanced/APIDemo/app/src/main/res/layout/fragment_gam_ppid.xml +++ b/java/advanced/APIDemo/app/src/main/res/layout/fragment_gam_ppid.xml @@ -40,7 +40,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:hint="@string/ppid_username_hint" /> + android:hint="@string/ppid_username_hint" + android:inputType="text" />