From ff39e38f11e45057c0c72b175657f367bea3fc48 Mon Sep 17 00:00:00 2001
From: Laura Nechita <nechita@google.com>
Date: Thu, 3 Sep 2020 16:19:22 +0100
Subject: [PATCH 1/5] fix nits

---
 ButtonClicker/build.gradle                    |   2 +-
 ButtonClicker/src/main/res/values/styles.xml  |   9 +-
 .../example/games/tanc/FriendsFragment.java   | 286 +++++++++---------
 3 files changed, 149 insertions(+), 148 deletions(-)

diff --git a/ButtonClicker/build.gradle b/ButtonClicker/build.gradle
index 821f9b9f..849ba361 100644
--- a/ButtonClicker/build.gradle
+++ b/ButtonClicker/build.gradle
@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.google.android.gms:play-services-games:20.0.0"
+    implementation "com.google.android.gms:play-services-games:20.0.1"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
diff --git a/ButtonClicker/src/main/res/values/styles.xml b/ButtonClicker/src/main/res/values/styles.xml
index 5cd486cf..3b711af7 100644
--- a/ButtonClicker/src/main/res/values/styles.xml
+++ b/ButtonClicker/src/main/res/values/styles.xml
@@ -48,7 +48,7 @@
 
 
     <style name="InvPopup" parent="@style/LLScreen">
-        <item name="background">@color/PopupColor</item>
+        <item name="android:background">@color/PopupColor</item>
         <item name="android:padding">10dp</item>
         <item name="android:layout_gravity">top|right</item>
         <item name="android:layout_width">match_parent</item>
@@ -86,7 +86,7 @@
     <style name="GameButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="background">@color/AccentColor</item>
+        <item name="android:background">@color/AccentColor</item>
         <item name="android:textColor">@color/ButtonTextColor</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingRight">10dp</item>
@@ -110,12 +110,12 @@
     </style>
 
     <style name="InvPopupButton" parent="@style/GameButton">
-        <item name="background">@color/ButtonTextColor</item>
+        <item name="android:background">@color/ButtonTextColor</item>
         <item name="android:textColor">@color/AccentColor</item>
     </style>
 
     <style name="SignOutButton" parent="@style/GameButton">
-        <item name="background">@color/SignOutButtonBackground</item>
+        <item name="android:background">@color/SignOutButtonBackground</item>
         <item name="android:textColor">@color/SignOutButtonTextColor</item>
     </style>
 
@@ -142,6 +142,7 @@
     <style name="ScoresBox">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">#f0f0f0</item>
         <item name="android:orientation">vertical</item>
         <item name="android:layout_marginTop">30dp</item>
         <item name="android:padding">20dp</item>
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
index 1f4e3609..5cd5b601 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
@@ -33,156 +33,156 @@
 
 /** Fragment that shows the list of friends. */
 public class FriendsFragment extends Fragment {
-    private static final String TAG = "FriendsFragment";
-    private static final int PAGE_SIZE = 200;
+  private static final String TAG = "FriendsFragment";
+  private static final int PAGE_SIZE = 200;
 
-    interface Listener {
-        // called when the user presses the `Back` button
-        void onBackButtonClicked();
-    }
+  interface Listener {
+    // called when the user presses the `Back` button
+    void onBackButtonClicked();
+  }
+
+  private View mView;
+  private ListView mListView;
+  private View mSpinner;
+  private ArrayAdapter<Player> mAdapter;
+  private MainActivity mActivity;
+  private ActivityResultLauncher<IntentSenderRequest> resolveLauncherFriendsConsent;
+  private ActivityResultLauncher<Intent> resolveLauncherCompareProfile;
 
-    private View mView;
-    private ListView mListView;
-    private View mSpinner;
-    private ArrayAdapter<Player> mAdapter;
-    private MainActivity mActivity;
-    private ActivityResultLauncher<IntentSenderRequest> resolveLauncherFriendsConsent;
-    private ActivityResultLauncher<Intent> resolveLauncherCompareProfile;
+  private Listener mListener = null;
+  private OnCompleteListener<AnnotatedData<PlayerBuffer>> onCompleteListener =
+      new OnCompleteListener<AnnotatedData<PlayerBuffer>>() {
+        @Override
+        public void onComplete(@NonNull Task<AnnotatedData<PlayerBuffer>> task) {
+          if (task.isSuccessful()) {
+            if (task.getResult() == null) {
+              mListener.onBackButtonClicked();
+            }
+            PlayerBuffer playerBuffer = task.getResult().get();
+            try {
+              if (DataBufferUtils.hasNextPage(playerBuffer)) {
+                mActivity
+                    .getPlayersClient()
+                    .loadMoreFriends(PAGE_SIZE)
+                    .addOnCompleteListener(mActivity, onCompleteListener);
+              } else {
+                LayoutInflater inflater = LayoutInflater.from(getContext());
+                mAdapter = getAdapter(playerBuffer, inflater);
+                mListView.setAdapter(mAdapter);
+                mSpinner.setVisibility(View.GONE);
+                mListView.setVisibility(View.VISIBLE);
+              }
+            } finally {
+              playerBuffer.release();
+            }
+          } else {
+            Log.e(TAG, "Getting friends failed with exception: " + task.getException());
+            try {
+              if (task.getException() instanceof ResolvableApiException) {
+                PendingIntent pendingIntent =
+                    ((ResolvableApiException) task.getException()).getResolution();
+                resolveLauncherFriendsConsent.launch(
+                    new IntentSenderRequest.Builder(pendingIntent).build());
+              }
+            } catch (Exception e) {
+              Log.e(TAG, "Getting consent failed with exception: " + e);
+              mListener.onBackButtonClicked();
+            }
+          }
+        }
+      };
 
-    private Listener mListener = null;
-    private OnCompleteListener<AnnotatedData<PlayerBuffer>> onCompleteListener =
-            new OnCompleteListener<AnnotatedData<PlayerBuffer>>() {
-                @Override
-                public void onComplete(@NonNull Task<AnnotatedData<PlayerBuffer>> task) {
-                    if (task.isSuccessful()) {
-                        if (task.getResult() == null) {
-                            mListener.onBackButtonClicked();
-                        }
-                        PlayerBuffer playerBuffer = task.getResult().get();
-                        try {
-                            if (DataBufferUtils.hasNextPage(playerBuffer)) {
-                                mActivity
-                                        .getPlayersClient()
-                                        .loadMoreFriends(PAGE_SIZE)
-                                        .addOnCompleteListener(mActivity, onCompleteListener);
-                            } else {
-                                LayoutInflater inflater = LayoutInflater.from(getContext());
-                                mAdapter = getAdapter(playerBuffer, inflater);
-                                mListView.setAdapter(mAdapter);
-                                mSpinner.setVisibility(View.GONE);
-                                mListView.setVisibility(View.VISIBLE);
-                            }
-                        } finally {
-                            playerBuffer.release();
-                        }
-                    } else {
-                        Log.e(TAG, "Getting friends failed with exception: " + task.getException());
-                        try {
-                            if (task.getException() instanceof ResolvableApiException) {
-                                PendingIntent pendingIntent =
-                                        ((ResolvableApiException) task.getException()).getResolution();
-                                resolveLauncherFriendsConsent.launch(
-                                        new IntentSenderRequest.Builder(pendingIntent).build());
-                            }
-                        } catch (Exception e) {
-                            Log.e(TAG, "Getting consent failed with exception: " + e);
-                            mListener.onBackButtonClicked();
-                        }
-                    }
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+    mView = inflater.inflate(R.layout.friends_screen, container, /* attachToRoot= */ false);
+    mListView = mView.findViewById(R.id.load_friends_game_list);
+    mSpinner = mView.findViewById(R.id.progress_bar);
+    mActivity = (MainActivity) getActivity();
+    mView
+        .findViewById(R.id.back_button)
+        .setOnClickListener(
+            new View.OnClickListener() {
+              @Override
+              public void onClick(View view) {
+                mListener.onBackButtonClicked();
+             }
+            });
+     resolveLauncherFriendsConsent =
+        registerForActivityResult(
+            new ActivityResultContracts.StartIntentSenderForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+              @Override
+              public void onActivityResult(ActivityResult result) {
+                if (result.getResultCode() == Activity.RESULT_OK) {
+                  refreshFriends();
+                } else {
+                  mListener.onBackButtonClicked();
                 }
-            };
+             }
+             });
+    resolveLauncherCompareProfile =
+        registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+              @Override
+              public void onActivityResult(ActivityResult result) {
+                if (result.getResultCode() == Activity.RESULT_OK) {
+                  refreshFriends();
+                }
+              }
+            });
+    refreshFriends();
+    return mView;
+  }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-        mView = inflater.inflate(R.layout.friends_screen, container, /* attachToRoot= */ false);
-        mListView = mView.findViewById(R.id.load_friends_game_list);
-        mSpinner = mView.findViewById(R.id.progress_bar);
-        mActivity = (MainActivity) getActivity();
-        mView
-                .findViewById(R.id.back_button)
-                .setOnClickListener(
-                        new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                mListener.onBackButtonClicked();
-                            }
-                        });
-        resolveLauncherFriendsConsent =
-                registerForActivityResult(
-                        new ActivityResultContracts.StartIntentSenderForResult(),
-                        new ActivityResultCallback<ActivityResult>() {
-                            @Override
-                            public void onActivityResult(ActivityResult result) {
-                                if (result.getResultCode() == Activity.RESULT_OK) {
-                                    refreshFriends();
-                                } else {
-                                    mListener.onBackButtonClicked();
-                                }
-                            }
-                        });
-        resolveLauncherCompareProfile =
-                registerForActivityResult(
-                        new ActivityResultContracts.StartActivityForResult(),
-                        new ActivityResultCallback<ActivityResult>() {
-                            @Override
-                            public void onActivityResult(ActivityResult result) {
-                                if (result.getResultCode() == Activity.RESULT_OK) {
-                                    refreshFriends();
-                                }
-                            }
-                        });
-        refreshFriends();
-        return mView;
-    }
+  void setListener(Listener listener) {
+    mListener = listener;
+  }
 
-    void setListener(Listener listener) {
-        mListener = listener;
+  @NonNull
+  private ArrayAdapter<Player> getAdapter(
+      PlayerBuffer playerBuffer, final LayoutInflater inflater) {
+    ArrayList<Player> players = new ArrayList<>();
+    for (int i = 0; i < playerBuffer.getCount(); i++) {
+      players.add(playerBuffer.get(i).freeze());
     }
-
-    @NonNull
-    private ArrayAdapter<Player> getAdapter(
-            PlayerBuffer playerBuffer, final LayoutInflater inflater) {
-        ArrayList<Player> players = new ArrayList<>();
-        for (int i = 0; i < playerBuffer.getCount(); i++) {
-            players.add(playerBuffer.get(i).freeze());
-        }
-        return new ArrayAdapter<Player>(mActivity, R.layout.friends_row, players) {
-            @Override
-            public View getView(int position, View convertView, ViewGroup viewGroup) {
-                View rowView = inflater.inflate(R.layout.friends_row, viewGroup, /* attachToRoot= */ false);
-                final Player player = getItem(position);
-                TextView textView = rowView.findViewById(R.id.friend_name);
-                textView.setText(player.getDisplayName());
-                ImageButton showProfileButton = rowView.findViewById(R.id.show_profile);
-                showProfileButton.setOnClickListener(
-                        new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                mActivity
-                                        .getPlayersClient()
-                                        .getCompareProfileIntentWithAlternativeNameHints(
-                                                player.getPlayerId(), player.getDisplayName(), mActivity.getDisplayName())
-                                        .addOnSuccessListener(
-                                                mActivity,
-                                                new OnSuccessListener<Intent>() {
-                                                    @Override
-                                                    public void onSuccess(Intent intent) {
-                                                        resolveLauncherCompareProfile.launch(intent);
-                                                    }
-                                                });
-                            }
+    return new ArrayAdapter<Player>(mActivity, R.layout.friends_row, players) {
+      @Override
+      public View getView(int position, View convertView, ViewGroup viewGroup) {
+        View rowView = inflater.inflate(R.layout.friends_row, viewGroup, /* attachToRoot= */ false);
+        final Player player = getItem(position);
+        TextView textView = rowView.findViewById(R.id.friend_name);
+        textView.setText(player.getDisplayName());
+        ImageButton showProfileButton = rowView.findViewById(R.id.show_profile);
+        showProfileButton.setOnClickListener(
+            new View.OnClickListener() {
+              @Override
+              public void onClick(View v) {
+                mActivity
+                    .getPlayersClient()
+                    .getCompareProfileIntentWithAlternativeNameHints(
+                        player.getPlayerId(), player.getDisplayName(), mActivity.getDisplayName())
+                    .addOnSuccessListener(
+                        mActivity,
+                        new OnSuccessListener<Intent>() {
+                          @Override
+                          public void onSuccess(Intent intent) {
+                            resolveLauncherCompareProfile.launch(intent);
+                         }
                         });
-                return rowView;
-            }
-        };
-    }
+              }
+             });
+        return rowView;
+      }
+    };
+  }
 
-    void refreshFriends() {
-        mListView.setAdapter(null);
-        mSpinner.setVisibility(View.VISIBLE);
-        mActivity
-                .getPlayersClient()
-                .loadFriends(PAGE_SIZE, /* forceReload= */ false)
-                .addOnCompleteListener(mActivity, onCompleteListener);
-    }
+  void refreshFriends() {
+    mListView.setAdapter(null);
+    mSpinner.setVisibility(View.VISIBLE);
+    mActivity
+        .getPlayersClient()
+        .loadFriends(PAGE_SIZE, /* forceReload= */ false)
+        .addOnCompleteListener(mActivity, onCompleteListener);
+  }
 }
\ No newline at end of file

From 53c052579f6048586c1e8c2d25d6ad84c0c06231 Mon Sep 17 00:00:00 2001
From: Laura Nechita <nechita@google.com>
Date: Thu, 3 Sep 2020 16:51:22 +0100
Subject: [PATCH 2/5] fix nits

---
 SkeletonTbmp/src/main/res/values-v16/styles.xml | 14 +++++++-------
 SkeletonTbmp/src/main/res/values/styles.xml     |  4 ++--
 TypeANumber/src/main/res/values/ids.xml         |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/SkeletonTbmp/src/main/res/values-v16/styles.xml b/SkeletonTbmp/src/main/res/values-v16/styles.xml
index 36cb556b..458c7dab 100644
--- a/SkeletonTbmp/src/main/res/values-v16/styles.xml
+++ b/SkeletonTbmp/src/main/res/values-v16/styles.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="DefaultText" parent="@android:style/TextAppearance">
-        <item name="fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:textSize">15sp</item>
     </style>
     <style name="GuessWordText" parent="@android:style/TextAppearance">
-        <item name="fontFamily">sans-serif-bold</item>
+        <item name="android:fontFamily">sans-serif-bold</item>
         <item name="android:textSize">20sp</item>
     </style>
     <style name="Heading" parent="@android:style/TextAppearance.Large">
-        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">30sp</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:textStyle">italic</item>
     </style>
     <style name="SubHeading" parent="@android:style/TextAppearance.Medium">
-        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
     </style>
     <style name="HelpText.Heading">
         <item name="android:textStyle">bold</item>
-        <item name="fontFamily">sans-serif-condensed</item>
+        <item name="android:fontFamily">sans-serif-condensed</item>
         <item name="android:textSize">@dimen/font_size_large</item>
         <item name="android:lineSpacingMultiplier">1.0</item>
     </style>
     <style name="Button" parent="@android:style/Widget.Button">
-        <item name="background">@drawable/button</item>
+        <item name="android:background">@drawable/button</item>
         <item name="android:gravity">center_vertical|center_horizontal</item>
         <item name="android:textColor">#FF000000</item>
         <item name="android:focusable">true</item>
         <item name="android:clickable">true</item>
         <item name="android:textSize">24sp</item>
         <item name="android:padding">12dp</item>
-        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/SkeletonTbmp/src/main/res/values/styles.xml b/SkeletonTbmp/src/main/res/values/styles.xml
index 433a3931..e73adc4e 100644
--- a/SkeletonTbmp/src/main/res/values/styles.xml
+++ b/SkeletonTbmp/src/main/res/values/styles.xml
@@ -20,7 +20,7 @@
     <style name="Theme.App" parent="@android:style/Theme.Light">
         <item
             name="android:windowBackground">@drawable/grey_background_pattern</item>
-        <item name="buttonStyle">@style/Button</item>
+        <item name="android:buttonStyle">@style/Button</item>
         <item name="android:textAppearance">@style/DefaultText</item>
         <item name="android:textAppearanceLarge">@style/Heading</item>
         <item name="android:textAppearanceMedium">@style/SubHeading</item>
@@ -59,7 +59,7 @@
     </style>
 
     <style name="Button" parent="@android:style/Widget.Button">
-        <item name="background">@drawable/button</item>
+        <item name="android:background">@drawable/button</item>
         <item name="android:gravity">center_vertical|center_horizontal</item>
         <item name="android:textColor">#FF000000</item>
         <item name="android:focusable">true</item>
diff --git a/TypeANumber/src/main/res/values/ids.xml b/TypeANumber/src/main/res/values/ids.xml
index d62a16a8..5766e26e 100644
--- a/TypeANumber/src/main/res/values/ids.xml
+++ b/TypeANumber/src/main/res/values/ids.xml
@@ -18,7 +18,6 @@
          NOTE: You can find this file by clicking the `Get Resources` link in
          the Events, Achievements, or Leaderboards menu of the Google Play Console. -->
     <string name="app_id">916066287455</string>
-<!--    <string name="app_id">291438769980</string>-->
 
     <string name="achievement_prime">YOUR_ACHIEVEMENT_PRIME_ID</string>
     <string name="achievement_really_bored">YOUR_ACHIEVEMENT_REALLY_BORED_ID</string>

From 0129c984c914f36a5b4c9ddf397f554e23c0fc96 Mon Sep 17 00:00:00 2001
From: Laura Nechita <nechita@google.com>
Date: Thu, 3 Sep 2020 17:02:23 +0100
Subject: [PATCH 3/5] fix nits

---
 TypeANumber/src/main/res/values/ids.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TypeANumber/src/main/res/values/ids.xml b/TypeANumber/src/main/res/values/ids.xml
index 5766e26e..31bda8fd 100644
--- a/TypeANumber/src/main/res/values/ids.xml
+++ b/TypeANumber/src/main/res/values/ids.xml
@@ -17,7 +17,7 @@
     <!-- TODO: Replace this entire file with the ids.xml provided from the Google Play Console.
          NOTE: You can find this file by clicking the `Get Resources` link in
          the Events, Achievements, or Leaderboards menu of the Google Play Console. -->
-    <string name="app_id">916066287455</string>
+    <string name="app_id">YOUR_APP_ID</string>
 
     <string name="achievement_prime">YOUR_ACHIEVEMENT_PRIME_ID</string>
     <string name="achievement_really_bored">YOUR_ACHIEVEMENT_REALLY_BORED_ID</string>

From 99a302a698cc5b5f13f05560d3b5e5bce1f1b943 Mon Sep 17 00:00:00 2001
From: Laura Nechita <nechita@google.com>
Date: Mon, 7 Sep 2020 16:27:57 +0300
Subject: [PATCH 4/5] fix nits

---
 .../example/games/tanc/MainActivity.java      | 290 ++++++++----------
 1 file changed, 131 insertions(+), 159 deletions(-)

diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java b/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
index d97d3399..7cb31d14 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
@@ -116,10 +116,8 @@ public void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_main);
 
     // Create the client used to sign in to Google services.
-    mGoogleSignInClient =
-            GoogleSignIn.getClient(
-                    this,
-                    new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN).build());
+    mGoogleSignInClient = GoogleSignIn.getClient(this,
+        new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN).build());
 
     // Create the fragments used by the UI.
     mMainMenuFragment = new MainMenuFragment();
@@ -139,10 +137,8 @@ public void onCreate(Bundle savedInstanceState) {
     // already be there after rotation and trying to add it again would
     // result in overlapping fragments. But since we don't support rotation,
     // we don't deal with that for code simplicity.
-    getSupportFragmentManager()
-            .beginTransaction()
-            .add(R.id.fragment_container, mMainMenuFragment)
-            .commit();
+    getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, mMainMenuFragment)
+        .commit();
 
     checkPlaceholderIds();
   }
@@ -157,22 +153,21 @@ private void checkPlaceholderIds() {
       problems.append("- Package name start with com.google.*\n");
     }
 
-    for (Integer id :
-            new Integer[] {
-                    R.string.app_id,
-                    R.string.achievement_prime,
-                    R.string.achievement_really_bored,
-                    R.string.achievement_bored,
-                    R.string.achievement_humble,
-                    R.string.achievement_arrogant,
-                    R.string.achievement_leet,
-                    R.string.leaderboard_easy,
-                    R.string.leaderboard_hard,
-                    R.string.event_start,
-                    R.string.event_number_chosen,
-            }) {
+    for (Integer id : new Integer[]{
+        R.string.app_id,
+        R.string.achievement_prime,
+        R.string.achievement_really_bored,
+        R.string.achievement_bored,
+        R.string.achievement_humble,
+        R.string.achievement_arrogant,
+        R.string.achievement_leet,
+        R.string.leaderboard_easy,
+        R.string.leaderboard_hard,
+        R.string.event_start,
+        R.string.event_number_chosen,}) {
 
       String value = getString(id);
+
       if (value.startsWith("YOUR_")) {
         // needs replacing
         problems.append("- Placeholders(YOUR_*) in ids.xml need updating\n");
@@ -185,11 +180,8 @@ private void checkPlaceholderIds() {
 
       problems.append("\nThese problems may prevent the app from working properly.");
       problems.append("\n\nSee the TODO window in Android Studio for more information");
-      (new AlertDialog.Builder(this))
-              .setMessage(problems.toString())
-              .setNeutralButton(android.R.string.ok, null)
-              .create()
-              .show();
+      (new AlertDialog.Builder(this)).setMessage(problems.toString())
+        .setNeutralButton(android.R.string.ok, null).create().show();
     }
   }
 
@@ -197,34 +189,31 @@ private void loadAndPrintEvents() {
 
     final MainActivity mainActivity = this;
 
-    mEventsClient
-            .load(true)
-            .addOnSuccessListener(
-                    new OnSuccessListener<AnnotatedData<EventBuffer>>() {
-                      @Override
-                      public void onSuccess(AnnotatedData<EventBuffer> eventBufferAnnotatedData) {
-                        EventBuffer eventBuffer = eventBufferAnnotatedData.get();
-
-                        int count = 0;
-                        if (eventBuffer != null) {
-                          count = eventBuffer.getCount();
-                        }
-
-                        Log.i(TAG, "number of events: " + count);
-
-                        for (int i = 0; i < count; i++) {
-                          Event event = eventBuffer.get(i);
-                          Log.i(TAG, "event: " + event.getName() + " -> " + event.getValue());
-                        }
-                      }
-                    })
-            .addOnFailureListener(
-                    new OnFailureListener() {
-                      @Override
-                      public void onFailure(@NonNull Exception e) {
-                        handleException(e, getString(R.string.achievements_exception));
-                      }
-                    });
+    mEventsClient.load(true)
+        .addOnSuccessListener(new OnSuccessListener<AnnotatedData<EventBuffer>>() {
+          @Override
+          public void onSuccess(AnnotatedData<EventBuffer> eventBufferAnnotatedData) {
+            EventBuffer eventBuffer = eventBufferAnnotatedData.get();
+
+            int count = 0;
+            if (eventBuffer != null) {
+              count = eventBuffer.getCount();
+            }
+
+            Log.i(TAG, "number of events: " + count);
+
+            for (int i = 0; i < count; i++) {
+              Event event = eventBuffer.get(i);
+              Log.i(TAG, "event: " + event.getName() + " -> " + event.getValue());
+            }
+          }
+        })
+        .addOnFailureListener(new OnFailureListener() {
+          @Override
+          public void onFailure(@NonNull Exception e) {
+            handleException(e, getString(R.string.achievements_exception));
+          }
+        });
   }
 
   // Switch UI to the given fragment
@@ -242,22 +231,19 @@ private boolean isSignedIn() {
   private void signInSilently() {
     Log.d(TAG, "signInSilently()");
 
-    mGoogleSignInClient
-            .silentSignIn()
-            .addOnCompleteListener(
-                    this,
-                    new OnCompleteListener<GoogleSignInAccount>() {
-                      @Override
-                      public void onComplete(@NonNull Task<GoogleSignInAccount> task) {
-                        if (task.isSuccessful()) {
-                          Log.d(TAG, "signInSilently(): success");
-                          onConnected(task.getResult());
-                        } else {
-                          Log.d(TAG, "signInSilently(): failure", task.getException());
-                          onDisconnected();
-                        }
-                      }
-                    });
+    mGoogleSignInClient.silentSignIn().addOnCompleteListener(this,
+        new OnCompleteListener<GoogleSignInAccount>() {
+          @Override
+          public void onComplete(@NonNull Task<GoogleSignInAccount> task) {
+            if (task.isSuccessful()) {
+              Log.d(TAG, "signInSilently(): success");
+              onConnected(task.getResult());
+            } else {
+              Log.d(TAG, "signInSilently(): failure", task.getException());
+              onDisconnected();
+            }
+          }
+    });
   }
 
   private void startSignInIntent() {
@@ -282,19 +268,16 @@ private void signOut() {
       return;
     }
 
-    mGoogleSignInClient
-            .signOut()
-            .addOnCompleteListener(
-                    this,
-                    new OnCompleteListener<Void>() {
-                      @Override
-                      public void onComplete(@NonNull Task<Void> task) {
-                        boolean successful = task.isSuccessful();
-                        Log.d(TAG, "signOut(): " + (successful ? "success" : "failed"));
-
-                        onDisconnected();
-                      }
-                    });
+    mGoogleSignInClient.signOut().addOnCompleteListener(this,
+        new OnCompleteListener<Void>() {
+          @Override
+          public void onComplete(@NonNull Task<Void> task) {
+            boolean successful = task.isSuccessful();
+            Log.d(TAG, "signOut(): " + (successful ? "success" : "failed"));
+
+            onDisconnected();
+          }
+    });
   }
 
   @Override
@@ -304,42 +287,36 @@ public void onStartGameRequested(boolean hardMode) {
 
   @Override
   public void onShowAchievementsRequested() {
-    mAchievementsClient
-            .getAchievementsIntent()
-            .addOnSuccessListener(
-                    new OnSuccessListener<Intent>() {
-                      @Override
-                      public void onSuccess(Intent intent) {
-                        startActivityForResult(intent, RC_UNUSED);
-                      }
-                    })
-            .addOnFailureListener(
-                    new OnFailureListener() {
-                      @Override
-                      public void onFailure(@NonNull Exception e) {
-                        handleException(e, getString(R.string.achievements_exception));
-                      }
-                    });
+    mAchievementsClient.getAchievementsIntent()
+        .addOnSuccessListener(new OnSuccessListener<Intent>() {
+          @Override
+          public void onSuccess(Intent intent) {
+            startActivityForResult(intent, RC_UNUSED);
+          }
+        })
+        .addOnFailureListener(new OnFailureListener() {
+           @Override
+           public void onFailure(@NonNull Exception e) {
+             handleException(e, getString(R.string.achievements_exception));
+           }
+        });
   }
 
   @Override
   public void onShowLeaderboardsRequested() {
-    mLeaderboardsClient
-            .getAllLeaderboardsIntent()
-            .addOnSuccessListener(
-                    new OnSuccessListener<Intent>() {
-                      @Override
-                      public void onSuccess(Intent intent) {
-                        startActivityForResult(intent, RC_UNUSED);
-                      }
-                    })
-            .addOnFailureListener(
-                    new OnFailureListener() {
-                      @Override
-                      public void onFailure(@NonNull Exception e) {
-                        handleException(e, getString(R.string.leaderboards_exception));
-                      }
-                    });
+    mLeaderboardsClient.getAllLeaderboardsIntent()
+        .addOnSuccessListener(new OnSuccessListener<Intent>() {
+          @Override
+          public void onSuccess(Intent intent) {
+            startActivityForResult(intent, RC_UNUSED);
+          }
+        })
+        .addOnFailureListener(new OnFailureListener() {
+          @Override
+          public void onFailure(@NonNull Exception e) {
+            handleException(e, getString(R.string.leaderboards_exception));
+          }
+        });
   }
 
   private void handleException(Exception e, String details) {
@@ -353,9 +330,9 @@ private void handleException(Exception e, String details) {
     String message = getString(R.string.status_exception_error, details, status, e);
 
     new AlertDialog.Builder(MainActivity.this)
-            .setMessage(message)
-            .setNeutralButton(android.R.string.ok, null)
-            .show();
+        .setMessage(message)
+        .setNeutralButton(android.R.string.ok, null)
+        .show();
   }
 
   /**
@@ -376,10 +353,8 @@ public void onEnteredScore(int requestedScore) {
     int finalScore = mHardMode ? requestedScore / 2 : requestedScore;
 
     mWinFragment.setScore(finalScore);
-    mWinFragment.setExplanation(
-            mHardMode
-                    ? getString(R.string.hard_mode_explanation)
-                    : getString(R.string.easy_mode_explanation));
+    mWinFragment.setExplanation(mHardMode ? getString(R.string.hard_mode_explanation) :
+        getString(R.string.easy_mode_explanation));
 
     // check for achievements
     checkForAchievements(requestedScore, finalScore);
@@ -443,8 +418,8 @@ private void achievementToast(String achievement) {
     // Only show toast if not signed in. If signed in, the standard Google Play
     // toasts will appear, so we don't need to show our own.
     if (!isSignedIn()) {
-      Toast.makeText(this, getString(R.string.achievement) + ": " + achievement, Toast.LENGTH_LONG)
-              .show();
+      Toast.makeText(this, getString(R.string.achievement) + ": " + achievement,
+          Toast.LENGTH_LONG).show();
     }
   }
 
@@ -470,9 +445,11 @@ private void pushAccomplishments() {
       mOutbox.mLeetAchievement = false;
     }
     if (mOutbox.mBoredSteps > 0) {
-      mAchievementsClient.increment(
-              getString(R.string.achievement_really_bored), mOutbox.mBoredSteps);
-      mAchievementsClient.increment(getString(R.string.achievement_bored), mOutbox.mBoredSteps);
+      mAchievementsClient.increment(getString(R.string.achievement_really_bored),
+          mOutbox.mBoredSteps);
+
+      mAchievementsClient.increment(getString(R.string.achievement_bored),
+          mOutbox.mBoredSteps);
       mOutbox.mBoredSteps = 0;
     }
     if (mOutbox.mEasyModeScore >= 0) {
@@ -481,7 +458,8 @@ private void pushAccomplishments() {
       mOutbox.mEasyModeScore = -1;
     }
     if (mOutbox.mHardModeScore >= 0) {
-      mLeaderboardsClient.submitScore(getString(R.string.leaderboard_hard), mOutbox.mHardModeScore);
+      mLeaderboardsClient.submitScore(getString(R.string.leaderboard_hard),
+          mOutbox.mHardModeScore);
       mOutbox.mHardModeScore = -1;
     }
   }
@@ -530,9 +508,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
         onDisconnected();
 
         new AlertDialog.Builder(this)
-                .setMessage(message)
-                .setNeutralButton(android.R.string.ok, null)
-                .show();
+            .setMessage(message)
+            .setNeutralButton(android.R.string.ok, null)
+            .show();
       }
     }
   }
@@ -552,30 +530,28 @@ private void onConnected(GoogleSignInAccount googleSignInAccount) {
     mWinFragment.setShowSignInButton(false);
 
     // Set the greeting appropriately on main menu
-    mPlayersClient
-            .getCurrentPlayer()
-            .addOnCompleteListener(
-                    new OnCompleteListener<Player>() {
-                      @Override
-                      public void onComplete(@NonNull Task<Player> task) {
-                        String displayName;
-                        if (task.isSuccessful()) {
-                          displayName = task.getResult().getDisplayName();
-                        } else {
-                          Exception e = task.getException();
-                          handleException(e, getString(R.string.players_exception));
-                          displayName = "???";
-                        }
-                        mDisplayName = displayName;
-                        mMainMenuFragment.setGreeting("Hello, " + displayName);
-                      }
-                    });
+    mPlayersClient.getCurrentPlayer()
+        .addOnCompleteListener(new OnCompleteListener<Player>() {
+          @Override
+          public void onComplete(@NonNull Task<Player> task) {
+            String displayName;
+            if (task.isSuccessful()) {
+              displayName = task.getResult().getDisplayName();
+            } else {
+              Exception e = task.getException();
+              handleException(e, getString(R.string.players_exception));
+              displayName = "???";
+            }
+            mDisplayName = displayName;
+            mMainMenuFragment.setGreeting("Hello, " + displayName);
+          }
+        });
 
     // if we have accomplishments to push, push them
     if (!mOutbox.isEmpty()) {
       pushAccomplishments();
-      Toast.makeText(this, getString(R.string.your_progress_will_be_uploaded), Toast.LENGTH_LONG)
-              .show();
+      Toast.makeText(this,
+          getString(R.string.your_progress_will_be_uploaded), Toast.LENGTH_LONG).show();
     }
 
     loadAndPrintEvents();
@@ -627,13 +603,9 @@ private class AccomplishmentsOutbox {
     int mHardModeScore = -1;
 
     boolean isEmpty() {
-      return !mPrimeAchievement
-              && !mHumbleAchievement
-              && !mLeetAchievement
-              && !mArrogantAchievement
-              && mBoredSteps == 0
-              && mEasyModeScore < 0
-              && mHardModeScore < 0;
+      return !mPrimeAchievement && !mHumbleAchievement && !mLeetAchievement
+          && !mArrogantAchievement && mBoredSteps == 0 && mEasyModeScore < 0
+          && mHardModeScore < 0;
     }
 
   }

From f04fb18478cb3c5dd825005dbc8225140ff6485a Mon Sep 17 00:00:00 2001
From: olehkuznetsov <44271635+olehkuznetsov@users.noreply.github.com>
Date: Mon, 7 Sep 2020 15:20:45 +0100
Subject: [PATCH 5/5] Revert "Add Friends Functionality"

---
 ButtonClicker/build.gradle                    |  12 +-
 .../google/example/games/bc/MainActivity.java |   2 +-
 .../src/main/res/values-v13/styles.xml        |   2 +-
 CollectAllTheStars2/build.gradle              |   4 +-
 .../example/games/catt2/MainActivity.java     |  11 +-
 .../games/catt2/SelectSnapshotActivity.java   |   7 +-
 .../games/catt2/SnapshotCoordinator.java      |   2 +-
 .../src/main/res/values-v11/styles.xml        |   2 +-
 .../src/main/res/values-v14/styles.xml        |   2 +-
 SkeletonTbmp/build.gradle                     |   4 +-
 .../games/tbmpskeleton/SkeletonActivity.java  |   8 +-
 .../src/main/res/values-v11/styles.xml        |   2 +-
 .../src/main/res/values-v14/styles.xml        |   2 +-
 TypeANumber/build.gradle                      |   9 +-
 .../example/games/tanc/FriendsFragment.java   | 188 ------------------
 .../example/games/tanc/GameplayFragment.java  |   3 +-
 .../example/games/tanc/MainActivity.java      | 118 ++++-------
 .../example/games/tanc/MainMenuFragment.java  |  14 +-
 .../example/games/tanc/WinFragment.java       |   4 +-
 .../drawable-hdpi/pgs_signed_in_friend.png    | Bin 4528 -> 0 bytes
 .../drawable-ldpi/pgs_signed_in_friend.png    | Bin 2020 -> 0 bytes
 .../drawable-mdpi/pgs_signed_in_friend.png    | Bin 2792 -> 0 bytes
 .../drawable-xhdpi/pgs_signed_in_friend.png   | Bin 6016 -> 0 bytes
 .../src/main/res/layout/fragment_mainmenu.xml |   6 -
 .../src/main/res/layout/friends_row.xml       |  37 ----
 .../src/main/res/layout/friends_screen.xml    |  67 -------
 .../src/main/res/values-v13/styles.xml        |   2 +-
 TypeANumber/src/main/res/values/strings.xml   |   3 -
 build.gradle                                  |   6 +-
 gradle.properties                             |   2 -
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 31 files changed, 82 insertions(+), 441 deletions(-)
 delete mode 100644 TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
 delete mode 100644 TypeANumber/src/main/res/drawable-hdpi/pgs_signed_in_friend.png
 delete mode 100644 TypeANumber/src/main/res/drawable-ldpi/pgs_signed_in_friend.png
 delete mode 100644 TypeANumber/src/main/res/drawable-mdpi/pgs_signed_in_friend.png
 delete mode 100644 TypeANumber/src/main/res/drawable-xhdpi/pgs_signed_in_friend.png
 delete mode 100644 TypeANumber/src/main/res/layout/friends_row.xml
 delete mode 100644 TypeANumber/src/main/res/layout/friends_screen.xml
 delete mode 100644 gradle.properties

diff --git a/ButtonClicker/build.gradle b/ButtonClicker/build.gradle
index 849ba361..cfbc3a59 100644
--- a/ButtonClicker/build.gradle
+++ b/ButtonClicker/build.gradle
@@ -22,17 +22,13 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.google.android.gms:play-services-games:20.0.1"
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
@@ -40,4 +36,4 @@ buildscript {
     repositories {
         jcenter()
     }
-}
\ No newline at end of file
+}
diff --git a/ButtonClicker/src/main/java/com/google/example/games/bc/MainActivity.java b/ButtonClicker/src/main/java/com/google/example/games/bc/MainActivity.java
index 593b3ff3..2c872be9 100644
--- a/ButtonClicker/src/main/java/com/google/example/games/bc/MainActivity.java
+++ b/ButtonClicker/src/main/java/com/google/example/games/bc/MainActivity.java
@@ -20,7 +20,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
diff --git a/ButtonClicker/src/main/res/values-v13/styles.xml b/ButtonClicker/src/main/res/values-v13/styles.xml
index 03b93037..997965b5 100644
--- a/ButtonClicker/src/main/res/values-v13/styles.xml
+++ b/ButtonClicker/src/main/res/values-v13/styles.xml
@@ -16,5 +16,5 @@
 -->
 
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
+    <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar" />
 </resources>
diff --git a/CollectAllTheStars2/build.gradle b/CollectAllTheStars2/build.gradle
index ac588625..cfbc3a59 100644
--- a/CollectAllTheStars2/build.gradle
+++ b/CollectAllTheStars2/build.gradle
@@ -26,8 +26,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
     implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
diff --git a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java
index c9c49d93..e9e44a29 100644
--- a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java
+++ b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java
@@ -15,10 +15,13 @@
 
 package com.google.example.games.catt2;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,10 +32,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -73,7 +72,7 @@
  *
  * @author Bruno Oliveira (Google)
  */
-public class MainActivity extends AppCompatActivity implements
+public class MainActivity extends Activity implements
     View.OnClickListener,
     OnRatingBarChangeListener {
 
@@ -394,7 +393,7 @@ protected void onStart() {
     checkPlaceholderIds();
   }
 
-  public static boolean verifySampleSetup(AppCompatActivity activity, int... resIds) {
+  public static boolean verifySampleSetup(Activity activity, int... resIds) {
     StringBuilder problems = new StringBuilder();
     boolean problemFound = false;
     problems.append("The following set up problems were found:\n\n");
diff --git a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java
index 736621b7..316b7b76 100644
--- a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java
+++ b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java
@@ -14,6 +14,7 @@
  */
 package com.google.example.games.catt2;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -27,8 +28,6 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.games.snapshot.Snapshot;
 import com.google.android.gms.games.snapshot.SnapshotMetadata;
@@ -45,7 +44,7 @@
  *
  * @author Clayton Wilkinson (Google)
  */
-public class SelectSnapshotActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public class SelectSnapshotActivity extends Activity implements AdapterView.OnItemClickListener {
 
   private static final String TAG = "SelSnapshotActivity";
   // intent data which is a snapshot metadata
@@ -117,7 +116,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
   static class SnapshotListAdapter<T> extends ArrayAdapter<T> {
 
 
-    public SnapshotListAdapter(AppCompatActivity activity, ArrayList<T> data) {
+    public SnapshotListAdapter(Activity activity, ArrayList<T> data) {
       super(activity, R.layout.snapshotlayout, data);
     }
 
diff --git a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SnapshotCoordinator.java b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SnapshotCoordinator.java
index 48ad50b5..aad2073c 100644
--- a/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SnapshotCoordinator.java
+++ b/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SnapshotCoordinator.java
@@ -16,7 +16,7 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.common.api.CommonStatusCodes;
diff --git a/CollectAllTheStars2/src/main/res/values-v11/styles.xml b/CollectAllTheStars2/src/main/res/values-v11/styles.xml
index 65e85ac7..3d45cb70 100644
--- a/CollectAllTheStars2/src/main/res/values-v11/styles.xml
+++ b/CollectAllTheStars2/src/main/res/values-v11/styles.xml
@@ -21,7 +21,7 @@
         Base application theme for API 11+. This theme completely replaces
         AppBaseTheme from res/values/styles.xml on API 11+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
         <!-- API 11 theme customizations can go here. -->
     </style>
 
diff --git a/CollectAllTheStars2/src/main/res/values-v14/styles.xml b/CollectAllTheStars2/src/main/res/values-v14/styles.xml
index 54a8dc22..9e1013d7 100644
--- a/CollectAllTheStars2/src/main/res/values-v14/styles.xml
+++ b/CollectAllTheStars2/src/main/res/values-v14/styles.xml
@@ -22,7 +22,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
 
diff --git a/SkeletonTbmp/build.gradle b/SkeletonTbmp/build.gradle
index 261419c4..82ad2eba 100644
--- a/SkeletonTbmp/build.gradle
+++ b/SkeletonTbmp/build.gradle
@@ -25,8 +25,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
     implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
diff --git a/SkeletonTbmp/src/main/java/com/google/example/games/tbmpskeleton/SkeletonActivity.java b/SkeletonTbmp/src/main/java/com/google/example/games/tbmpskeleton/SkeletonActivity.java
index 40edb29e..307af0af 100644
--- a/SkeletonTbmp/src/main/java/com/google/example/games/tbmpskeleton/SkeletonActivity.java
+++ b/SkeletonTbmp/src/main/java/com/google/example/games/tbmpskeleton/SkeletonActivity.java
@@ -17,18 +17,16 @@
 package com.google.example.games.tbmpskeleton;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -73,7 +71,7 @@
  *
  * @author Wolff (wolff@google.com), 2013
  */
-public class SkeletonActivity extends AppCompatActivity implements
+public class SkeletonActivity extends Activity implements
     View.OnClickListener {
 
   public static final String TAG = "SkeletonActivity";
diff --git a/SkeletonTbmp/src/main/res/values-v11/styles.xml b/SkeletonTbmp/src/main/res/values-v11/styles.xml
index a4a95bc4..3c02242a 100644
--- a/SkeletonTbmp/src/main/res/values-v11/styles.xml
+++ b/SkeletonTbmp/src/main/res/values-v11/styles.xml
@@ -4,7 +4,7 @@
         Base application theme for API 11+. This theme completely replaces
         AppBaseTheme from res/values/styles.xml on API 11+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
         <!-- API 11 theme customizations can go here. -->
     </style>
 
diff --git a/SkeletonTbmp/src/main/res/values-v14/styles.xml b/SkeletonTbmp/src/main/res/values-v14/styles.xml
index 664f4f16..a91fd037 100644
--- a/SkeletonTbmp/src/main/res/values-v14/styles.xml
+++ b/SkeletonTbmp/src/main/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
 
diff --git a/TypeANumber/build.gradle b/TypeANumber/build.gradle
index 0f516a0b..cfbc3a59 100644
--- a/TypeANumber/build.gradle
+++ b/TypeANumber/build.gradle
@@ -26,12 +26,9 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.activity:activity:1.2.0-alpha08"
-    implementation "androidx.activity:activity-ktx:1.2.0-alpha03"
-    implementation "androidx.fragment:fragment:1.3.0-alpha08"
-    implementation "com.google.android.gms:play-services-games:20.0.1"
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
deleted file mode 100644
index 5cd5b601..00000000
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/FriendsFragment.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.google.example.games.tanc;
-
-import static com.google.example.games.tanc.MainActivity.RC_FRIEND_PROFILE;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.TextView;
-import androidx.activity.result.ActivityResult;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.IntentSenderRequest;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import com.google.android.gms.common.api.ResolvableApiException;
-import com.google.android.gms.common.data.DataBufferUtils;
-import com.google.android.gms.games.AnnotatedData;
-import com.google.android.gms.games.Player;
-import com.google.android.gms.games.PlayerBuffer;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.android.gms.tasks.Task;
-import java.util.ArrayList;
-
-/** Fragment that shows the list of friends. */
-public class FriendsFragment extends Fragment {
-  private static final String TAG = "FriendsFragment";
-  private static final int PAGE_SIZE = 200;
-
-  interface Listener {
-    // called when the user presses the `Back` button
-    void onBackButtonClicked();
-  }
-
-  private View mView;
-  private ListView mListView;
-  private View mSpinner;
-  private ArrayAdapter<Player> mAdapter;
-  private MainActivity mActivity;
-  private ActivityResultLauncher<IntentSenderRequest> resolveLauncherFriendsConsent;
-  private ActivityResultLauncher<Intent> resolveLauncherCompareProfile;
-
-  private Listener mListener = null;
-  private OnCompleteListener<AnnotatedData<PlayerBuffer>> onCompleteListener =
-      new OnCompleteListener<AnnotatedData<PlayerBuffer>>() {
-        @Override
-        public void onComplete(@NonNull Task<AnnotatedData<PlayerBuffer>> task) {
-          if (task.isSuccessful()) {
-            if (task.getResult() == null) {
-              mListener.onBackButtonClicked();
-            }
-            PlayerBuffer playerBuffer = task.getResult().get();
-            try {
-              if (DataBufferUtils.hasNextPage(playerBuffer)) {
-                mActivity
-                    .getPlayersClient()
-                    .loadMoreFriends(PAGE_SIZE)
-                    .addOnCompleteListener(mActivity, onCompleteListener);
-              } else {
-                LayoutInflater inflater = LayoutInflater.from(getContext());
-                mAdapter = getAdapter(playerBuffer, inflater);
-                mListView.setAdapter(mAdapter);
-                mSpinner.setVisibility(View.GONE);
-                mListView.setVisibility(View.VISIBLE);
-              }
-            } finally {
-              playerBuffer.release();
-            }
-          } else {
-            Log.e(TAG, "Getting friends failed with exception: " + task.getException());
-            try {
-              if (task.getException() instanceof ResolvableApiException) {
-                PendingIntent pendingIntent =
-                    ((ResolvableApiException) task.getException()).getResolution();
-                resolveLauncherFriendsConsent.launch(
-                    new IntentSenderRequest.Builder(pendingIntent).build());
-              }
-            } catch (Exception e) {
-              Log.e(TAG, "Getting consent failed with exception: " + e);
-              mListener.onBackButtonClicked();
-            }
-          }
-        }
-      };
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-    mView = inflater.inflate(R.layout.friends_screen, container, /* attachToRoot= */ false);
-    mListView = mView.findViewById(R.id.load_friends_game_list);
-    mSpinner = mView.findViewById(R.id.progress_bar);
-    mActivity = (MainActivity) getActivity();
-    mView
-        .findViewById(R.id.back_button)
-        .setOnClickListener(
-            new View.OnClickListener() {
-              @Override
-              public void onClick(View view) {
-                mListener.onBackButtonClicked();
-             }
-            });
-     resolveLauncherFriendsConsent =
-        registerForActivityResult(
-            new ActivityResultContracts.StartIntentSenderForResult(),
-            new ActivityResultCallback<ActivityResult>() {
-              @Override
-              public void onActivityResult(ActivityResult result) {
-                if (result.getResultCode() == Activity.RESULT_OK) {
-                  refreshFriends();
-                } else {
-                  mListener.onBackButtonClicked();
-                }
-             }
-             });
-    resolveLauncherCompareProfile =
-        registerForActivityResult(
-            new ActivityResultContracts.StartActivityForResult(),
-            new ActivityResultCallback<ActivityResult>() {
-              @Override
-              public void onActivityResult(ActivityResult result) {
-                if (result.getResultCode() == Activity.RESULT_OK) {
-                  refreshFriends();
-                }
-              }
-            });
-    refreshFriends();
-    return mView;
-  }
-
-  void setListener(Listener listener) {
-    mListener = listener;
-  }
-
-  @NonNull
-  private ArrayAdapter<Player> getAdapter(
-      PlayerBuffer playerBuffer, final LayoutInflater inflater) {
-    ArrayList<Player> players = new ArrayList<>();
-    for (int i = 0; i < playerBuffer.getCount(); i++) {
-      players.add(playerBuffer.get(i).freeze());
-    }
-    return new ArrayAdapter<Player>(mActivity, R.layout.friends_row, players) {
-      @Override
-      public View getView(int position, View convertView, ViewGroup viewGroup) {
-        View rowView = inflater.inflate(R.layout.friends_row, viewGroup, /* attachToRoot= */ false);
-        final Player player = getItem(position);
-        TextView textView = rowView.findViewById(R.id.friend_name);
-        textView.setText(player.getDisplayName());
-        ImageButton showProfileButton = rowView.findViewById(R.id.show_profile);
-        showProfileButton.setOnClickListener(
-            new View.OnClickListener() {
-              @Override
-              public void onClick(View v) {
-                mActivity
-                    .getPlayersClient()
-                    .getCompareProfileIntentWithAlternativeNameHints(
-                        player.getPlayerId(), player.getDisplayName(), mActivity.getDisplayName())
-                    .addOnSuccessListener(
-                        mActivity,
-                        new OnSuccessListener<Intent>() {
-                          @Override
-                          public void onSuccess(Intent intent) {
-                            resolveLauncherCompareProfile.launch(intent);
-                         }
-                        });
-              }
-             });
-        return rowView;
-      }
-    };
-  }
-
-  void refreshFriends() {
-    mListView.setAdapter(null);
-    mSpinner.setVisibility(View.VISIBLE);
-    mActivity
-        .getPlayersClient()
-        .loadFriends(PAGE_SIZE, /* forceReload= */ false)
-        .addOnCompleteListener(mActivity, onCompleteListener);
-  }
-}
\ No newline at end of file
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
index 6102f582..2c58b734 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
@@ -17,13 +17,14 @@
 package com.google.example.games.tanc;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import androidx.fragment.app.Fragment;
+
 import java.util.Locale;
 
 /**
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java b/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
index 7cb31d14..75b94023 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/MainActivity.java
@@ -16,27 +16,20 @@
 
 package com.google.example.games.tanc;
 
-import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.activity.result.ActivityResult;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.IntentSenderRequest;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.api.ApiException;
-import com.google.android.gms.common.api.ResolvableApiException;
 import com.google.android.gms.games.AchievementsClient;
 import com.google.android.gms.games.AnnotatedData;
 import com.google.android.gms.games.EventsClient;
@@ -46,39 +39,35 @@
 import com.google.android.gms.games.PlayersClient;
 import com.google.android.gms.games.event.Event;
 import com.google.android.gms.games.event.EventBuffer;
-import com.google.android.gms.games.leaderboard.LeaderboardScore;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 
-import static com.google.android.gms.games.leaderboard.LeaderboardVariant.COLLECTION_FRIENDS;
-import static com.google.android.gms.games.leaderboard.LeaderboardVariant.COLLECTION_PUBLIC;
-
 /**
  * Our main activity for the game.
- *
- * <p>IMPORTANT: Before attempting to run this sample, please change the package name to your own
- * package name (not com.android.*) and replace the IDs on res/values/ids.xml by your own IDs (you
- * must create a game in the developer console to get those IDs).
- *
- * <p>This is a very simple game where the user selects "easy mode" or "hard mode" and then the
- * "gameplay" consists of inputting the desired score (0 to 9999). In easy mode, you get the score
- * you request; in hard mode, you get half.
+ * <p>
+ * IMPORTANT: Before attempting to run this sample, please change
+ * the package name to your own package name (not com.android.*) and
+ * replace the IDs on res/values/ids.xml by your own IDs (you must
+ * create a game in the developer console to get those IDs).
+ * <p>
+ * This is a very simple game where the user selects "easy mode" or
+ * "hard mode" and then the "gameplay" consists of inputting the
+ * desired score (0 to 9999). In easy mode, you get the score you
+ * request; in hard mode, you get half.
  *
  * @author Bruno Oliveira
  */
-public class MainActivity extends FragmentActivity
-        implements MainMenuFragment.Listener,
-        GameplayFragment.Callback,
-        WinFragment.Listener,
-        FriendsFragment.Listener {
+public class MainActivity extends FragmentActivity implements
+    MainMenuFragment.Listener,
+    GameplayFragment.Callback,
+    WinFragment.Listener {
 
   // Fragments
   private MainMenuFragment mMainMenuFragment;
   private GameplayFragment mGameplayFragment;
   private WinFragment mWinFragment;
-  public FriendsFragment mFriendsFragment;
 
   // Client used to sign in with Google APIs
   private GoogleSignInClient mGoogleSignInClient;
@@ -93,18 +82,12 @@ public class MainActivity extends FragmentActivity
   private static final int RC_UNUSED = 5001;
   private static final int RC_SIGN_IN = 9001;
 
-  static final int RC_FRIEND_PROFILE = 9002;
-  static final int RC_RESOLUTION = 9003;
-
   // tag for debug logging
   private static final String TAG = "TanC";
 
   // playing on hard mode?
   private boolean mHardMode = false;
 
-  // The diplay name of the signed in user.
-  private String mDisplayName = "";
-
   // achievements and scores we're pending to push to the cloud
   // (waiting for the user to sign in, for instance)
   private final AccomplishmentsOutbox mOutbox = new AccomplishmentsOutbox();
@@ -123,13 +106,11 @@ public void onCreate(Bundle savedInstanceState) {
     mMainMenuFragment = new MainMenuFragment();
     mGameplayFragment = new GameplayFragment();
     mWinFragment = new WinFragment();
-    mFriendsFragment = new FriendsFragment();
 
     // Set the listeners and callbacks of fragment events.
     mMainMenuFragment.setListener(this);
     mGameplayFragment.setCallback(this);
     mWinFragment.setListener(this);
-    mFriendsFragment.setListener(this);
 
     // Add initial Main Menu fragment.
     // IMPORTANT: if this Activity supported rotation, we'd have to be
@@ -137,8 +118,8 @@ public void onCreate(Bundle savedInstanceState) {
     // already be there after rotation and trying to add it again would
     // result in overlapping fragments. But since we don't support rotation,
     // we don't deal with that for code simplicity.
-    getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, mMainMenuFragment)
-        .commit();
+    getSupportFragmentManager().beginTransaction().add(R.id.fragment_container,
+        mMainMenuFragment).commit();
 
     checkPlaceholderIds();
   }
@@ -181,7 +162,7 @@ private void checkPlaceholderIds() {
       problems.append("\nThese problems may prevent the app from working properly.");
       problems.append("\n\nSee the TODO window in Android Studio for more information");
       (new AlertDialog.Builder(this)).setMessage(problems.toString())
-        .setNeutralButton(android.R.string.ok, null).create().show();
+          .setNeutralButton(android.R.string.ok, null).create().show();
     }
   }
 
@@ -204,7 +185,10 @@ public void onSuccess(AnnotatedData<EventBuffer> eventBufferAnnotatedData) {
 
             for (int i = 0; i < count; i++) {
               Event event = eventBuffer.get(i);
-              Log.i(TAG, "event: " + event.getName() + " -> " + event.getValue());
+              Log.i(TAG, "event: "
+                  + event.getName()
+                  + " -> "
+                  + event.getValue());
             }
           }
         })
@@ -218,10 +202,8 @@ public void onFailure(@NonNull Exception e) {
 
   // Switch UI to the given fragment
   private void switchToFragment(Fragment newFrag) {
-    getSupportFragmentManager()
-            .beginTransaction()
-            .replace(R.id.fragment_container, newFrag)
-            .commit();
+    getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, newFrag)
+        .commit();
   }
 
   private boolean isSignedIn() {
@@ -243,7 +225,7 @@ public void onComplete(@NonNull Task<GoogleSignInAccount> task) {
               onDisconnected();
             }
           }
-    });
+        });
   }
 
   private void startSignInIntent() {
@@ -277,7 +259,7 @@ public void onComplete(@NonNull Task<Void> task) {
 
             onDisconnected();
           }
-    });
+        });
   }
 
   @Override
@@ -295,10 +277,10 @@ public void onSuccess(Intent intent) {
           }
         })
         .addOnFailureListener(new OnFailureListener() {
-           @Override
-           public void onFailure(@NonNull Exception e) {
-             handleException(e, getString(R.string.achievements_exception));
-           }
+          @Override
+          public void onFailure(@NonNull Exception e) {
+            handleException(e, getString(R.string.achievements_exception));
+          }
         });
   }
 
@@ -447,7 +429,6 @@ private void pushAccomplishments() {
     if (mOutbox.mBoredSteps > 0) {
       mAchievementsClient.increment(getString(R.string.achievement_really_bored),
           mOutbox.mBoredSteps);
-
       mAchievementsClient.increment(getString(R.string.achievement_bored),
           mOutbox.mBoredSteps);
       mOutbox.mBoredSteps = 0;
@@ -464,14 +445,6 @@ private void pushAccomplishments() {
     }
   }
 
-  public PlayersClient getPlayersClient() {
-    return mPlayersClient;
-  }
-
-  public String getDisplayName() {
-    return mDisplayName;
-  }
-
   /**
    * Update leaderboards with the user's score.
    *
@@ -494,7 +467,8 @@ public void onWinScreenDismissed() {
   protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
     super.onActivityResult(requestCode, resultCode, intent);
     if (requestCode == RC_SIGN_IN) {
-      Task<GoogleSignInAccount> task = GoogleSignIn.getSignedInAccountFromIntent(intent);
+      Task<GoogleSignInAccount> task =
+          GoogleSignIn.getSignedInAccountFromIntent(intent);
 
       try {
         GoogleSignInAccount account = task.getResult(ApiException.class);
@@ -542,16 +516,16 @@ public void onComplete(@NonNull Task<Player> task) {
               handleException(e, getString(R.string.players_exception));
               displayName = "???";
             }
-            mDisplayName = displayName;
             mMainMenuFragment.setGreeting("Hello, " + displayName);
           }
         });
 
+
     // if we have accomplishments to push, push them
     if (!mOutbox.isEmpty()) {
       pushAccomplishments();
-      Toast.makeText(this,
-          getString(R.string.your_progress_will_be_uploaded), Toast.LENGTH_LONG).show();
+      Toast.makeText(this, getString(R.string.your_progress_will_be_uploaded),
+          Toast.LENGTH_LONG).show();
     }
 
     loadAndPrintEvents();
@@ -583,16 +557,6 @@ public void onSignOutButtonClicked() {
     signOut();
   }
 
-  @Override
-  public void onShowFriendsButtonClicked() {
-    switchToFragment(mFriendsFragment);
-  }
-
-  @Override
-  public void onBackButtonClicked() {
-    switchToFragment(mMainMenuFragment);
-  }
-
   private class AccomplishmentsOutbox {
     boolean mPrimeAchievement = false;
     boolean mHumbleAchievement = false;
@@ -603,9 +567,9 @@ private class AccomplishmentsOutbox {
     int mHardModeScore = -1;
 
     boolean isEmpty() {
-      return !mPrimeAchievement && !mHumbleAchievement && !mLeetAchievement
-          && !mArrogantAchievement && mBoredSteps == 0 && mEasyModeScore < 0
-          && mHardModeScore < 0;
+      return !mPrimeAchievement && !mHumbleAchievement && !mLeetAchievement &&
+          !mArrogantAchievement && mBoredSteps == 0 && mEasyModeScore < 0 &&
+          mHardModeScore < 0;
     }
 
   }
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
index ac7b2ba8..9cd7b524 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
@@ -16,12 +16,12 @@
 package com.google.example.games.tanc;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import androidx.fragment.app.Fragment;
 
 /**
  * Fragment with the main menu for the game. The main menu allows the player
@@ -37,7 +37,6 @@ public class MainMenuFragment extends Fragment implements OnClickListener {
   private View mSignOutBarView;
   private View mShowAchievementsButton;
   private View mShowLeaderboardsButton;
-  private View mShowFriendsButton;
 
   interface Listener {
     // called when the user presses the `Easy` or `Okay` button; will pass in which via `hardMode`
@@ -54,9 +53,6 @@ interface Listener {
 
     // called when the user presses the `Sign Out` button
     void onSignOutButtonClicked();
-
-    // called when the user presses the `Friends` button
-    void onShowFriendsButtonClicked();
   }
 
   private Listener mListener = null;
@@ -75,8 +71,7 @@ public View onCreateView(LayoutInflater inflater,
         R.id.show_achievements_button,
         R.id.show_leaderboards_button,
         R.id.sign_in_button,
-        R.id.sign_out_button,
-        R.id.show_friends_button
+        R.id.sign_out_button
     };
 
     for (int clickableId : clickableIds) {
@@ -86,7 +81,6 @@ public View onCreateView(LayoutInflater inflater,
     // cache views
     mShowAchievementsButton = view.findViewById(R.id.show_achievements_button);
     mShowLeaderboardsButton = view.findViewById(R.id.show_leaderboards_button);
-    mShowFriendsButton = view.findViewById(R.id.show_friends_button);
 
     mGreetingTextView = view.findViewById(R.id.text_greeting);
     mSignInBarView = view.findViewById(R.id.sign_in_bar);
@@ -110,7 +104,6 @@ private void updateUI() {
     mGreetingTextView.setText(mGreeting);
     mShowAchievementsButton.setEnabled(!mShowSignInButton);
     mShowLeaderboardsButton.setEnabled(!mShowSignInButton);
-    mShowFriendsButton.setEnabled(!mShowSignInButton);
     mSignInBarView.setVisibility(mShowSignInButton ? View.VISIBLE : View.GONE);
     mSignOutBarView.setVisibility(mShowSignInButton ? View.GONE : View.VISIBLE);
   }
@@ -130,9 +123,6 @@ public void onClick(View view) {
       case R.id.show_leaderboards_button:
         mListener.onShowLeaderboardsRequested();
         break;
-      case R.id.show_friends_button:
-        mListener.onShowFriendsButtonClicked();
-        break;
       case R.id.sign_in_button:
         mListener.onSignInButtonClicked();
         break;
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
index 1d4e03ba..860eadaf 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
@@ -17,12 +17,12 @@
 package com.google.example.games.tanc;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import androidx.fragment.app.Fragment;
 
 /**
  * Fragment that shows the 'You won' message. Apart from congratulating the user
@@ -123,4 +123,4 @@ public void setShowSignInButton(boolean showSignIn) {
     mShowSignIn = showSignIn;
     updateUI();
   }
-}
\ No newline at end of file
+}
diff --git a/TypeANumber/src/main/res/drawable-hdpi/pgs_signed_in_friend.png b/TypeANumber/src/main/res/drawable-hdpi/pgs_signed_in_friend.png
deleted file mode 100644
index ef8a50849edf79d58119901ea5bc4acdda09a883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4528
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
O0000<MNUMnLSTY1&6oQC

diff --git a/TypeANumber/src/main/res/drawable-ldpi/pgs_signed_in_friend.png b/TypeANumber/src/main/res/drawable-ldpi/pgs_signed_in_friend.png
deleted file mode 100644
index fd2c60632e8d0697cb2ae234974647b16de5f29d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2020
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
C{KiHA

diff --git a/TypeANumber/src/main/res/drawable-mdpi/pgs_signed_in_friend.png b/TypeANumber/src/main/res/drawable-mdpi/pgs_signed_in_friend.png
deleted file mode 100644
index 299b359dfc420ddebfd67c92019424a3813c64e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2792
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

diff --git a/TypeANumber/src/main/res/drawable-xhdpi/pgs_signed_in_friend.png b/TypeANumber/src/main/res/drawable-xhdpi/pgs_signed_in_friend.png
deleted file mode 100644
index 7a953a8cecc334162394c355249a0f46320dc1c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6016
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

diff --git a/TypeANumber/src/main/res/layout/fragment_mainmenu.xml b/TypeANumber/src/main/res/layout/fragment_mainmenu.xml
index 1a427642..0bae8ccd 100644
--- a/TypeANumber/src/main/res/layout/fragment_mainmenu.xml
+++ b/TypeANumber/src/main/res/layout/fragment_mainmenu.xml
@@ -86,13 +86,7 @@
         <Button android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/show_leaderboards"
-            android:layout_marginBottom="20dp"
             android:id="@+id/show_leaderboards_button" />
-
-        <Button android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/show_friends"
-            android:id="@+id/show_friends_button" />
     </LinearLayout>
 
     <LinearLayout android:id="@+id/sign_in_bar"
diff --git a/TypeANumber/src/main/res/layout/friends_row.xml b/TypeANumber/src/main/res/layout/friends_row.xml
deleted file mode 100644
index b9dd22ba..00000000
--- a/TypeANumber/src/main/res/layout/friends_row.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright (C) 2013 Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="10dp"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/friend_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20dp" />
-
-    <ImageButton
-        android:id="@+id/show_profile"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="0.5"
-        android:scaleType="fitCenter"
-        android:background="@android:color/transparent"
-        android:src="@drawable/pgs_signed_in_friend" />
-</LinearLayout>
\ No newline at end of file
diff --git a/TypeANumber/src/main/res/layout/friends_screen.xml b/TypeANumber/src/main/res/layout/friends_screen.xml
deleted file mode 100644
index bd707d66..00000000
--- a/TypeANumber/src/main/res/layout/friends_screen.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright (C) 2013 Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/friends_game_section"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <RelativeLayout
-        android:id="@+id/friends_game_section2"
-        android:layout_width="wrap_content"
-        android:layout_weight="1"
-        android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/friends_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/friends_title"
-            android:textSize="40dp"
-            android:layout_width="wrap_content" />
-    </LinearLayout>
-
-    <ListView
-        android:id="@+id/load_friends_game_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/friends_title"
-        android:paddingTop="10dp"
-        android:visibility="gone"/>
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/friends_title"
-        android:paddingTop="40dp"/>
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/back_button"
-        android:layout_width="198dp"
-        android:layout_height="63dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="15dp"
-        android:layout_marginBottom="30dp"
-        android:text="@string/Back"
-        android:textSize="12sp" />
-</LinearLayout>
-
diff --git a/TypeANumber/src/main/res/values-v13/styles.xml b/TypeANumber/src/main/res/values-v13/styles.xml
index 03b93037..997965b5 100644
--- a/TypeANumber/src/main/res/values-v13/styles.xml
+++ b/TypeANumber/src/main/res/values-v13/styles.xml
@@ -16,5 +16,5 @@
 -->
 
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
+    <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar" />
 </resources>
diff --git a/TypeANumber/src/main/res/values/strings.xml b/TypeANumber/src/main/res/values/strings.xml
index ffd0a884..00b99429 100644
--- a/TypeANumber/src/main/res/values/strings.xml
+++ b/TypeANumber/src/main/res/values/strings.xml
@@ -51,13 +51,10 @@
     <string name="see_your_progress">See your progress:</string>
     <string name="show_achievements">Show Achievements</string>
     <string name="show_leaderboards">Show Leaderboards</string>
-    <string name="show_friends">Show Friends</string>
     <string name="sign_in_why">Sign in with Google to share your scores and achievements with your friends.</string>
     <string name="you_are_signed_in">You are signed in with Google.</string>
     <string name="sign_out">Sign out</string>
     <string name="you_win">You win! Your score is:</string>
     <string name="sign_in_to_upload_this_score">Sign in now to upload this score, save your achievements and share your progress with friends.</string>
     <string name="signin_other_error">There was an issue with sign in.  Please try again later.</string>
-    <string name="friends_title">Friends</string>
-    <string name="Back">Back</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 728e805b..d0e9a787 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -21,14 +21,14 @@ allprojects {
     }
 
     ext {
-        android_compile_version = 28
+        android_compile_version = 26
 
         // Google Play Services minimum requirements is 14
         android_min_sdk_version = 14
 
         appcompat_library_version = '27.0.2'
         support_library_version = '27.0.2'
-        gms_library_version = '17.0.0'
+        gms_library_version = '11.6.2'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 5465fec0..00000000
--- a/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8a0ae656..49314a56 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jul 31 16:24:33 BST 2020
+#Tue Nov 28 14:53:07 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip