diff --git a/play-services-auth-base/build.gradle b/play-services-auth-base/build.gradle
index 92ed11c76a..32c0565e0e 100644
--- a/play-services-auth-base/build.gradle
+++ b/play-services-auth-base/build.gradle
@@ -39,4 +39,6 @@ dependencies {
     api project(':play-services-basement')
     api project(':play-services-base')
     api project(':play-services-tasks')
+
+    annotationProcessor project(':safe-parcel-processor')
 }
diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/utils/BitmapUtils.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/utils/BitmapUtils.kt
new file mode 100644
index 0000000000..6ebf8a37ff
--- /dev/null
+++ b/play-services-base/core/src/main/kotlin/org/microg/gms/utils/BitmapUtils.kt
@@ -0,0 +1,33 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.utils
+
+import android.graphics.Bitmap
+import kotlin.math.sqrt
+
+object BitmapUtils {
+
+    fun getBitmapSize(bitmap: Bitmap?): Int {
+        if (bitmap != null) {
+            return bitmap.height * bitmap.rowBytes
+        }
+        return 0
+    }
+
+    fun scaledBitmap(bitmap: Bitmap, maxSize: Float): Bitmap {
+        val height: Int = bitmap.getHeight()
+        val width: Int = bitmap.getWidth()
+        val sqrt =
+            sqrt(((maxSize) / ((width.toFloat()) / (height.toFloat()) * ((bitmap.getRowBytes() / width).toFloat()))).toDouble())
+                .toInt()
+        return Bitmap.createScaledBitmap(
+            bitmap,
+            (((sqrt.toFloat()) / (height.toFloat()) * (width.toFloat())).toInt()),
+            sqrt,
+            true
+        )
+    }
+}
\ No newline at end of file
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/data/BitmapTeleporter.aidl b/play-services-base/src/main/aidl/com/google/android/gms/common/data/BitmapTeleporter.aidl
similarity index 100%
rename from play-services-api/src/main/aidl/com/google/android/gms/common/data/BitmapTeleporter.aidl
rename to play-services-base/src/main/aidl/com/google/android/gms/common/data/BitmapTeleporter.aidl
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/data/BitmapTeleporter.java b/play-services-base/src/main/java/com/google/android/gms/common/data/BitmapTeleporter.java
similarity index 100%
rename from play-services-api/src/main/java/com/google/android/gms/common/data/BitmapTeleporter.java
rename to play-services-base/src/main/java/com/google/android/gms/common/data/BitmapTeleporter.java
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/images/ImageManager.java b/play-services-base/src/main/java/com/google/android/gms/common/images/ImageManager.java
index e347fa0e8b..46bd845899 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/images/ImageManager.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/images/ImageManager.java
@@ -9,6 +9,28 @@
 package com.google.android.gms.common.images;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+import androidx.collection.LruCache;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * This class is used to load images from the network and handles local caching for you.
@@ -21,6 +43,157 @@ public class ImageManager {
      * @return A new ImageManager.
      */
     public static ImageManager create(Context context) {
-        throw new UnsupportedOperationException();
+        if (INSTANCE == null) {
+            synchronized (ImageManager.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new ImageManager(context);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public static final String TAG = "ImageManager";
+    private static volatile ImageManager INSTANCE;
+    private final LruCache<String, Bitmap> memoryCache;
+    private final ExecutorService executorService;
+    private final Handler handler;
+    private final Context context;
+
+    private ImageManager(Context context) {
+        this.context = context.getApplicationContext();
+        this.handler = new Handler(Looper.getMainLooper());
+        this.executorService = Executors.newFixedThreadPool(4);
+
+        final int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 1024 / 8);
+        this.memoryCache = new LruCache<String, Bitmap>(cacheSize) {
+            @Override
+            protected int sizeOf(@NonNull String key, @NonNull Bitmap bitmap) {
+                return bitmap.getByteCount() / 1024;
+            }
+        };
+    }
+
+    /**
+     * Compress Bitmap
+     */
+    public byte[] compressBitmap(Bitmap bitmap, Bitmap.CompressFormat format, int quality) {
+        Log.d(TAG, "compressBitmap width: " + bitmap.getWidth() + " height:" + bitmap.getHeight());
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        bitmap.compress(format, quality, byteArrayOutputStream);
+        byte[] bitmapBytes = byteArrayOutputStream.toByteArray();
+        bitmap = BitmapFactory.decodeByteArray(bitmapBytes, 0, bitmapBytes.length);
+        Log.d(TAG, "compressBitmap compress width: " + bitmap.getWidth() + " height:" + bitmap.getHeight());
+        return bitmapBytes;
+    }
+
+    public byte[] compressBitmap(Bitmap original, int newWidth, int newHeight) {
+        Log.d(TAG, "compressBitmap width: " + original.getWidth() + " height:" + original.getHeight());
+        Bitmap target = Bitmap.createScaledBitmap(original, newWidth, newHeight, true);
+        Log.d(TAG, "compressBitmap target width: " + target.getWidth() + " height:" + target.getHeight());
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        target.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    public void loadImage(final String url, final ImageView imageView) {
+        if (imageView == null) {
+            Log.d(TAG, "loadImage: imageView is null");
+            return;
+        }
+        final Bitmap cachedBitmap = getBitmapFromCache(url);
+        if (cachedBitmap != null) {
+            Log.d(TAG, "loadImage from cached");
+            imageView.setImageBitmap(cachedBitmap);
+        } else {
+            Log.d(TAG, "loadImage from net");
+            imageView.setTag(url);
+            executorService.submit(() -> {
+                final Bitmap bitmap = downloadBitmap(url);
+                if (bitmap != null) {
+                    addBitmapToCache(url, bitmap);
+                    if (imageView.getTag().equals(url)) {
+                        handler.post(() -> imageView.setImageBitmap(bitmap));
+                    }
+                }
+            });
+        }
+    }
+
+    private Bitmap getBitmapFromCache(String key) {
+        Bitmap bitmap = memoryCache.get(key);
+        if (bitmap == null) {
+            bitmap = getBitmapFromDiskCache(key);
+        }
+        return bitmap;
+    }
+
+    private void addBitmapToCache(String key, Bitmap bitmap) {
+        if (getBitmapFromCache(key) == null) {
+            memoryCache.put(key, bitmap);
+            addBitmapToDiskCache(key, bitmap);
+        }
+    }
+
+    private Bitmap getBitmapFromDiskCache(String key) {
+        File file = getDiskCacheFile(key);
+        if (file.exists()) {
+            return BitmapFactory.decodeFile(file.getAbsolutePath());
+        }
+        return null;
+    }
+
+    private void addBitmapToDiskCache(String key, Bitmap bitmap) {
+        File file = getDiskCacheFile(key);
+        try (FileOutputStream outputStream = new FileOutputStream(file)) {
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
+        } catch (IOException e) {
+            Log.e(TAG, "addBitmapToDiskCache: ", e);
+        }
     }
+
+    private File getDiskCacheFile(String key) {
+        File cacheDir = context.getCacheDir();
+        return new File(cacheDir, md5(key));
+    }
+
+    private String md5(String s) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("MD5");
+            digest.update(s.getBytes());
+            byte[] messageDigest = digest.digest();
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : messageDigest) {
+                StringBuilder h = new StringBuilder(Integer.toHexString(0xFF & b));
+                while (h.length() < 2) h.insert(0, "0");
+                hexString.append(h);
+            }
+            return hexString.toString();
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(TAG, "md5: ", e);
+        }
+        return "";
+    }
+
+    @WorkerThread
+    private Bitmap downloadBitmap(String url) {
+        HttpURLConnection connection = null;
+        try {
+            connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.connect();
+            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                InputStream inputStream = connection.getInputStream();
+                return BitmapFactory.decodeStream(inputStream);
+            }
+        } catch (IOException e) {
+            Log.d(TAG, "downloadBitmap: ", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+        return null;
+    }
+
+
 }
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/util/IOUtils.java b/play-services-base/src/main/java/com/google/android/gms/common/util/IOUtils.java
new file mode 100644
index 0000000000..d57225a2b5
--- /dev/null
+++ b/play-services-base/src/main/java/com/google/android/gms/common/util/IOUtils.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.common.util;
+
+import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public final class IOUtils {
+    private IOUtils() {
+    }
+
+    public static void closeQuietly(ParcelFileDescriptor parcelFileDescriptor) {
+        if (parcelFileDescriptor != null) {
+            try {
+                parcelFileDescriptor.close();
+            } catch (IOException unused) {
+            }
+        }
+    }
+
+    public static long copyStream(@NonNull InputStream inputStream, @NonNull OutputStream outputStream) throws IOException {
+        return copyStream(inputStream, outputStream, false, 1024);
+    }
+
+    public static boolean isGzipByteBuffer(@NonNull byte[] bArr) {
+        if (bArr.length > 1) {
+            if ((((bArr[1] & 255) << 8) | (bArr[0] & 255)) == 35615) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static byte[] readInputStreamFully(@NonNull InputStream inputStream) throws IOException {
+        return readInputStreamFully(inputStream, true);
+    }
+
+    public static byte[] toByteArray(@NonNull InputStream inputStream) throws IOException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        byte[] bArr = new byte[4096];
+        while (true) {
+            int read = inputStream.read(bArr);
+            if (read == -1) {
+                return byteArrayOutputStream.toByteArray();
+            }
+            byteArrayOutputStream.write(bArr, 0, read);
+        }
+    }
+
+
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (IOException unused) {
+            }
+        }
+    }
+
+    public static long copyStream(@NonNull InputStream inputStream, @NonNull OutputStream outputStream, boolean z, int i) throws IOException {
+        byte[] bArr = new byte[i];
+        long j = 0;
+        while (true) {
+            try {
+                int read = inputStream.read(bArr, 0, i);
+                if (read == -1) {
+                    break;
+                }
+                j += read;
+                outputStream.write(bArr, 0, read);
+            } catch (Throwable th) {
+                if (z) {
+                    closeQuietly(inputStream);
+                    closeQuietly(outputStream);
+                }
+                throw th;
+            }
+        }
+        if (z) {
+            closeQuietly(inputStream);
+            closeQuietly(outputStream);
+        }
+        return j;
+    }
+
+    public static byte[] readInputStreamFully(@NonNull InputStream inputStream, boolean z) throws IOException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        copyStream(inputStream, byteArrayOutputStream, z, 1024);
+        return byteArrayOutputStream.toByteArray();
+    }
+
+}
diff --git a/play-services-core-proto/build.gradle b/play-services-core-proto/build.gradle
index f3f4a16b88..961fdfa551 100644
--- a/play-services-core-proto/build.gradle
+++ b/play-services-core-proto/build.gradle
@@ -8,6 +8,7 @@ apply plugin: 'kotlin'
 
 dependencies {
     implementation "com.squareup.wire:wire-runtime:$wireVersion"
+    api "com.squareup.wire:wire-grpc-client:$wireVersion"
 }
 
 wire {
diff --git a/play-services-core-proto/src/main/proto/snapshot.proto b/play-services-core-proto/src/main/proto/snapshot.proto
new file mode 100644
index 0000000000..60fc7d2f82
--- /dev/null
+++ b/play-services-core-proto/src/main/proto/snapshot.proto
@@ -0,0 +1,126 @@
+package google.play.games.games.v1;
+
+option java_outer_classname = "SnapshotProto";
+
+option java_package = "org.microg.gms.games";
+option java_multiple_files = true;
+
+service SnapshotsExtended {
+  rpc SyncSnapshots (GetSnapshotRequest) returns (GetSnapshotResponse);
+  rpc DeleteSnapshot (DeleteSnapshotInfo) returns (EmptyResult);
+  rpc ResolveSnapshotHead(ResolveSnapshotHeadRequest) returns (ResolveSnapshotHeadResponse);
+  rpc PrepareSnapshotRevision(PrepareSnapshotRevisionRequest) returns (PrepareSnapshotRevisionResponse);
+  rpc CommitSnapshotRevision(CommitSnapshotRevisionRequest) returns (EmptyResult);
+}
+
+message ResolveSnapshotHeadResponse {
+  optional SnapshotMetadata snapshotMetadata = 1;
+}
+
+message PrepareSnapshotRevisionRequest {
+  optional string title = 1;
+  repeated ukq c = 2;
+  optional string randomUUID = 3;
+}
+
+message PrepareSnapshotRevisionResponse {
+  optional string title = 1;
+  repeated UploadLinkInfo uploadLinkInfos = 2;
+}
+
+message CommitSnapshotRevisionRequest {
+  optional string snapshotName = 1;
+  optional Snapshot snapshot = 3;
+  optional string unknownFileString2 = 2;
+  repeated string unknownFileString4 = 4;
+  optional string randomUUID = 5;
+  optional string oneofField6 = 6;
+  optional int32 unknownFileInt7 = 7;
+}
+
+message UploadLinkInfo {
+  optional int32 id = 2;
+  optional string url = 3;
+  optional int32 unknownFileInt4 = 4;
+}
+
+message ukq {
+  optional int32 unknownFileInt1 = 1;
+  optional int32 unknownFileInt2 = 2;
+}
+
+message ResolveSnapshotHeadRequest {
+  optional string snapshotName = 1;
+  optional int32 unknownFileInt2 = 2;
+  optional int32 unknownFileInt3 = 3;
+}
+
+message GetSnapshotRequest {
+  repeated int32 unknownFileIntList3 = 3;
+  optional int32 unknownFileInt4 = 4;
+  optional int32 unknownFileInt6 = 6;
+}
+
+message DeleteSnapshotInfo {
+  optional string snapshotName = 1;
+  optional string snapshotId = 2;
+}
+
+message EmptyResult {
+
+}
+
+message GetSnapshotResponse {
+  repeated GameSnapshot gameSnapshot = 1;
+  optional string dataSnapshot = 2;
+  optional string unknownFileString3 = 3;
+  optional int32 unknownFileInt4 = 4;
+}
+
+message GameSnapshot {
+  optional SnapshotMetadata metadata = 1;
+  optional int32 type = 2;
+}
+
+message SnapshotMetadata {
+  optional string snapshotName = 1;
+  optional Snapshot snapshot = 2;
+  optional int32 type = 3;
+  repeated Snapshot snapshots = 4;
+}
+
+message Snapshot {
+  optional string snapshotId = 1;
+  optional SnapshotContent content = 2;
+  optional SnapshotContentInfo snapshotContentInfo = 3;
+  optional SnapshotImage coverImage = 4;
+}
+
+message SnapshotContent {
+  optional string description = 2;
+  optional SnapshotTimeInfo snapshotTimeInfo = 3;
+  optional int64 progressValue = 5;
+  optional string deviceName = 6;
+  optional int64 duration = 7;
+}
+
+message SnapshotTimeInfo {
+  required int64 timestamp = 1;
+  required int32 playedTime = 2;
+}
+
+message SnapshotContentInfo {
+  optional string token = 1;
+  optional string url = 2;
+  optional string contentHash = 3;
+  optional int64 size = 4;
+}
+
+message SnapshotImage {
+  optional string token = 1;
+  optional string imageUrl = 2;
+  optional int32 width = 3;
+  optional int32 height = 4;
+  optional string contentHash = 5;
+  optional string mimeType = 6;
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 4c71e4ba1b..cfcfc004cf 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -588,6 +588,23 @@
 
         <!-- Games -->
 
+        <activity
+            android:name="org.microg.gms.games.ui.InGameUiActivity"
+            android:process=":ui"
+            android:configChanges="keyboardHidden|keyboard|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:excludeFromRecents="false"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.Dialog.Alert">
+            <intent-filter>
+                <action android:name="com.google.android.gms.games.SHOW_SELECT_SNAPSHOT"/>
+                <action android:name="com.google.android.gms.games.VIEW_ACHIEVEMENTS" />
+                <action android:name="com.google.android.gms.games.VIEW_LEADERBOARDS" />
+                <action android:name="com.google.android.gms.games.VIEW_LEADERBOARD_SCORES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name="org.microg.gms.games.GamesSignInActivity"
             android:enabled="true"
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/GamesService.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/GamesService.kt
index 411e703741..bcc1ffb74c 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/games/GamesService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/GamesService.kt
@@ -6,6 +6,7 @@
 package org.microg.gms.games
 
 import android.accounts.Account
+import android.accounts.AccountManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
@@ -13,6 +14,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.IBinder
 import android.os.Parcel
+import android.os.ParcelFileDescriptor
+import android.text.TextUtils
 import android.util.Log
 import androidx.core.app.PendingIntentCompat
 import androidx.core.os.bundleOf
@@ -22,18 +25,23 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.CommonStatusCodes
-import com.google.android.gms.common.api.Scope
 import com.google.android.gms.common.api.Status
 import com.google.android.gms.common.data.DataHolder
 import com.google.android.gms.common.internal.ConnectionInfo
 import com.google.android.gms.common.internal.GetServiceRequest
 import com.google.android.gms.common.internal.IGmsCallbacks
+import com.google.android.gms.drive.Contents
+import com.google.android.gms.drive.DriveId
+import com.google.android.gms.games.GameColumns
+import com.google.android.gms.games.GamesStatusCodes
 import com.google.android.gms.games.Player
 import com.google.android.gms.games.PlayerColumns
 import com.google.android.gms.games.PlayerEntity
 import com.google.android.gms.games.internal.IGamesCallbacks
 import com.google.android.gms.games.internal.IGamesClient
 import com.google.android.gms.games.internal.IGamesService
+import com.google.android.gms.games.snapshot.SnapshotColumns
+import com.google.android.gms.games.snapshot.SnapshotMetadataChangeEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
@@ -41,9 +49,16 @@ import org.microg.gms.BaseService
 import org.microg.gms.auth.AuthConstants
 import org.microg.gms.auth.AuthManager
 import org.microg.gms.auth.AuthPrefs
+import org.microg.gms.auth.signin.checkAccountAuthStatus
+import org.microg.gms.common.Constants
 import org.microg.gms.common.GmsService
 import org.microg.gms.common.PackageUtils
+import org.microg.gms.games.achievements.AchievementsApiClient
+import org.microg.gms.games.snapshot.SnapshotsDataClient
 import org.microg.gms.utils.warnOnTransactionIssues
+import java.io.File
+import java.io.FileOutputStream
+import java.util.regex.Pattern
 
 private const val TAG = "GamesService"
 
@@ -73,13 +88,22 @@ class GamesService : BaseService(TAG, GmsService.GAMES) {
 
         lifecycleScope.launchWhenStarted {
             try {
-                val account = request.account?.takeIf { it.name != AuthConstants.DEFAULT_ACCOUNT }
-                    ?: GamesConfigurationService.getDefaultAccount(this@GamesService, packageName)
-                    ?: return@launchWhenStarted sendSignInRequired()
-
                 val scopes = request.scopes.toList().realScopes
                 Log.d(TAG, "handleServiceRequest scopes to ${scopes.joinToString(" ")}")
 
+                Log.d(TAG, "handleServiceRequest request.account ${request.account?.name}")
+                val currentAccount: Account? = if (request.account?.name == AuthConstants.DEFAULT_ACCOUNT) {
+                    val accounts = AccountManager.get(this@GamesService).getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE)
+                    accounts.find { checkAccountAuthStatus(this@GamesService, packageName, scopes, it) }
+                } else {
+                    request.account
+                }
+
+                Log.d(TAG, "handleServiceRequest currentAccount to ${currentAccount?.name}")
+                val account = currentAccount
+                    ?: GamesConfigurationService.getDefaultAccount(this@GamesService, packageName)
+                    ?: return@launchWhenStarted sendSignInRequired()
+
                 val authManager = AuthManager(this@GamesService, account.name, packageName, "oauth2:${scopes.joinToString(" ")}")
                 if (!authManager.isPermitted && !AuthPrefs.isTrustGooglePermitted(this@GamesService)) {
                     Log.d(TAG, "Not permitted to use $account for ${scopes.toList()}, sign in required")
@@ -109,6 +133,9 @@ class GamesService : BaseService(TAG, GmsService.GAMES) {
 class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle, val packageName: String, val account: Account, val player: Player) :
     IGamesService.Stub(), LifecycleOwner {
 
+    private val pattern: Pattern = Pattern.compile("[0-9a-zA-Z-._~]{1,100}")
+    private var saveName: String? = null
+
     override fun clientDisconnecting(clientId: Long) {
         Log.d(TAG, "Not yet implemented: clientDisconnecting($clientId)")
     }
@@ -224,19 +251,64 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
         loadAchievementsV2(callbacks, false)
     }
 
-    override fun revealAchievement(callbacks: IGamesCallbacks?, achievementId: String?, windowToken: IBinder?, extraArgs: Bundle?) {
-        runCatching { extraArgs?.keySet() }
-        Log.d(TAG, "Not yet implemented: revealAchievement($achievementId, $windowToken, $extraArgs)")
+    override fun revealAchievement(callbacks: IGamesCallbacks?, achievementId: String, windowToken: IBinder?, extraArgs: Bundle?) {
+        Log.d(TAG, "Method revealAchievement($achievementId, $windowToken, $extraArgs) Called")
+        lifecycleScope.launchWhenStarted {
+            runCatching {
+                val authResponse = withContext(Dispatchers.IO) {
+                    AuthManager(context, account.name, packageName, SERVICE_GAMES_LITE).apply { isPermitted = true }.requestAuth(true)
+                }
+                var oauthToken: String? = null
+                if (authResponse.auth?.let { oauthToken = it } == null) {
+                    throw RuntimeException("oauthToken is null")
+                }
+                AchievementsApiClient.revealAchievement(context, oauthToken!!, achievementId)
+                callbacks?.onAchievementUpdated(Status.SUCCESS.statusCode, achievementId)
+            }.onFailure {
+                Log.d(TAG, "revealAchievement: error", it)
+                callbacks?.onAchievementUpdated(Status.INTERNAL_ERROR.statusCode, achievementId)
+            }
+        }
     }
 
-    override fun unlockAchievement(callbacks: IGamesCallbacks?, achievementId: String?, windowToken: IBinder?, extraArgs: Bundle?) {
-        runCatching { extraArgs?.keySet() }
-        Log.d(TAG, "Not yet implemented: unlockAchievement($achievementId, $windowToken, $extraArgs")
+    override fun unlockAchievement(callbacks: IGamesCallbacks?, achievementId: String, windowToken: IBinder?, extraArgs: Bundle?) {
+        Log.d(TAG, "Method unlockAchievement($achievementId, $windowToken, $extraArgs) Called")
+        lifecycleScope.launchWhenStarted {
+            runCatching {
+                val authResponse = withContext(Dispatchers.IO) {
+                    AuthManager(context, account.name, packageName, SERVICE_GAMES_LITE).apply { isPermitted = true }.requestAuth(true)
+                }
+                var oauthToken: String? = null
+                if (authResponse.auth?.let { oauthToken = it } == null) {
+                    throw RuntimeException("oauthToken is null")
+                }
+                AchievementsApiClient.unlockAchievement(context, oauthToken!!, achievementId)
+                callbacks?.onAchievementUpdated(Status.SUCCESS.statusCode, achievementId)
+            }.onFailure {
+                Log.d(TAG, "unlockAchievement: error", it)
+                callbacks?.onAchievementUpdated(Status.INTERNAL_ERROR.statusCode, achievementId)
+            }
+        }
     }
 
-    override fun incrementAchievement(callbacks: IGamesCallbacks?, achievementId: String?, numSteps: Int, windowToken: IBinder?, extraArgs: Bundle?) {
-        runCatching { extraArgs?.keySet() }
-        Log.d(TAG, "Not yet implemented: incrementAchievement($achievementId, $numSteps, $windowToken, $extraArgs)")
+    override fun incrementAchievement(callbacks: IGamesCallbacks?, achievementId: String, numSteps: Int, windowToken: IBinder?, extraArgs: Bundle?) {
+        Log.d(TAG, "Method: incrementAchievement($achievementId, $numSteps, $windowToken, $extraArgs) Called")
+        lifecycleScope.launchWhenStarted {
+            runCatching {
+                val authResponse = withContext(Dispatchers.IO) {
+                    AuthManager(context, account.name, packageName, SERVICE_GAMES_LITE).apply { isPermitted = true }.requestAuth(true)
+                }
+                var oauthToken: String? = null
+                if (authResponse.auth?.let { oauthToken = it } == null) {
+                    throw RuntimeException("oauthToken is null")
+                }
+                AchievementsApiClient.incrementAchievement(context, oauthToken!!, achievementId, numSteps)
+                callbacks?.onAchievementUpdated(Status.SUCCESS.statusCode, achievementId)
+            }.onFailure {
+                Log.d(TAG, "incrementAchievement: error", it)
+                callbacks?.onAchievementUpdated(Status.INTERNAL_ERROR.statusCode, achievementId)
+            }
+        }
     }
 
     override fun loadGame(callbacks: IGamesCallbacks?) {
@@ -473,13 +545,30 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
         Log.d(TAG, "Not yet implemented: submitLeaderboardScore($leaderboardId, $score, $scoreTag)")
     }
 
-    override fun setAchievementSteps(callbacks: IGamesCallbacks?, id: String?, numSteps: Int, windowToken: IBinder?, extras: Bundle?) {
-        runCatching { extras?.keySet() }
-        Log.d(TAG, "Not yet implemented: setAchievementSteps($id, $numSteps, $windowToken, $extras)")
+    override fun setAchievementSteps(callbacks: IGamesCallbacks?, achievementId: String, numSteps: Int, windowToken: IBinder?, extras: Bundle?) {
+        Log.d(TAG, "Method setAchievementSteps($achievementId, $numSteps, $windowToken, $extras) called")
+        lifecycleScope.launchWhenStarted {
+            runCatching {
+                val authResponse = withContext(Dispatchers.IO) {
+                    AuthManager(context, account.name, packageName, SERVICE_GAMES_LITE).apply { isPermitted = true }.requestAuth(true)
+                }
+                var oauthToken: String? = null
+                if (authResponse.auth?.let { oauthToken = it } == null) {
+                    throw RuntimeException("oauthToken is null")
+                }
+                AchievementsApiClient.setStepsAtLeast(context, oauthToken!!, achievementId, numSteps)
+                callbacks?.onAchievementUpdated(Status.SUCCESS.statusCode, achievementId)
+            }.onFailure {
+                Log.d(TAG, "setAchievementSteps: error", it)
+                callbacks?.onAchievementUpdated(Status.INTERNAL_ERROR.statusCode, achievementId)
+            }
+        }
     }
 
     private fun getGamesIntent(action: String, block: Intent.() -> Unit = {}) = Intent(action).apply {
-        setPackage(GAMES_PACKAGE_NAME)
+        // Jump to internal page implementation
+        setPackage(Constants.GMS_PACKAGE_NAME)
+        putExtra(EXTRA_ACCOUNT_KEY, Integer.toHexString(account.name.hashCode()))
         putExtra(EXTRA_GAME_PACKAGE_NAME, packageName)
         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         block()
@@ -491,6 +580,58 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
 
     override fun getPlayerSearchIntent(): Intent = getGamesIntent(ACTION_PLAYER_SEARCH)
 
+    override fun getSelectSnapshotIntent(
+        title: String?,
+        allowAddButton: Boolean,
+        allowDelete: Boolean,
+        maxSnapshots: Int
+    ): Intent {
+        Log.d(TAG, "Method getSelectSnapshotIntent($title, $allowAddButton, $allowDelete, $maxSnapshots) called")
+        return getGamesIntent(ACTION_VIEW_SNAPSHOTS) {
+            putExtra(EXTRA_TITLE, title)
+            putExtra(EXTRA_ALLOW_CREATE_SNAPSHOT, allowAddButton)
+            putExtra(EXTRA_ALLOW_DELETE_SNAPSHOT, allowDelete)
+            putExtra(EXTRA_MAX_SNAPSHOTS, maxSnapshots)
+        }
+    }
+
+    override fun loadSnapshots(callbacks: IGamesCallbacks?, forceReload: Boolean) {
+        Log.d(TAG, "Method loadSnapshots(forceReload:$forceReload) called")
+    }
+
+    override fun commitSnapshot(
+        callbacks: IGamesCallbacks?,
+        str: String?,
+        change: SnapshotMetadataChangeEntity?,
+        contents: Contents?
+    ) {
+        Log.d(TAG, "Method commitSnapshot(str:$str, change:$change, dvd:$contents)")
+        lifecycleScope.launchWhenStarted {
+            if (change != null && contents?.parcelFileDescriptor != null) {
+                runCatching {
+                    val authResponse = withContext(Dispatchers.IO) {
+                        AuthManager(context, account.name, packageName, "$SERVICE_GAMES_LITE ${Scopes.DRIVE_APPFOLDER}").apply { isPermitted = true }.requestAuth(true)
+                    }
+                    var oauthToken: String? = null
+                    if (authResponse.auth?.let { oauthToken = it } == null) {
+                        throw RuntimeException("oauthToken is null")
+                    }
+                    val result = SnapshotsDataClient.get(context).commitSnapshot(oauthToken!!, saveName, change, contents, maxCoverImageSize)
+                    if (result == true) {
+                        callbacks?.commitSnapshotResult(DataHolder.empty(GamesStatusCodes.OK.code))
+                    } else {
+                        callbacks?.commitSnapshotResult(DataHolder.empty(GamesStatusCodes.SNAPSHOT_COMMIT_FAILED.code))
+                    }
+                }.onFailure {
+                    Log.w(TAG, "commitSnapshot: error", it)
+                    callbacks?.commitSnapshotResult(DataHolder.empty(GamesStatusCodes.SNAPSHOT_COMMIT_FAILED.code))
+                }
+            } else {
+                callbacks?.commitSnapshotResult(DataHolder.empty(GamesStatusCodes.SNAPSHOT_COMMIT_FAILED.code))
+            }
+        }
+    }
+
     override fun loadEvents(callbacks: IGamesCallbacks?, forceReload: Boolean) {
         Log.d(TAG, "Not yet implemented: loadEvents($forceReload)")
     }
@@ -499,20 +640,76 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
         Log.d(TAG, "Not yet implemented: incrementEvent($eventId, $incrementAmount)")
     }
 
+    override fun discardAndCloseSnapshot(contents: Contents?) {
+        Log.d(TAG, "discardAndCloseSnapshot: $contents")
+    }
+
     override fun loadEventsById(callbacks: IGamesCallbacks?, forceReload: Boolean, eventsIds: Array<out String>?) {
         Log.d(TAG, "Not yet implemented: loadEventsById($forceReload, $eventsIds)")
     }
 
     override fun getMaxDataSize(): Int {
+        Log.d(TAG, "getMaxDataSize: ")
         return 3 * 1024 * 1024
     }
 
     override fun getMaxCoverImageSize(): Int {
+        Log.d(TAG, "getMaxCoverImageSize: ")
         return 800 * 1024
     }
 
-    override fun registerEventClient(callback: IGamesClient?, l: Long) {
-        Log.d(TAG, "Not yet implemented: registerEventClient($l)")
+    override fun resolveSnapshotHead(callbacks: IGamesCallbacks, saveName: String?, i: Int) {
+        Log.d(TAG, "Method resolveSnapshotHead $saveName, $i")
+        if (TextUtils.isEmpty(saveName)) {
+            Log.w(TAG, "resolveSnapshotHead: Must provide a non empty fileName!")
+            return
+        }
+        if (!pattern.matcher(saveName).matches()) {
+            Log.w(TAG, "resolveSnapshotHead: Must provide a valid file name!")
+            return
+        }
+        val driveId = DriveId(null, 30, 0, DriveId.RESOURCE_TYPE_FILE)
+        val file = File.createTempFile("blob", ".tmp", context.filesDir)
+        this.saveName = saveName
+        lifecycleScope.launchWhenStarted {
+            runCatching {
+                val authResponse = withContext(Dispatchers.IO) {
+                    AuthManager(context, account.name, packageName, SERVICE_GAMES_LITE).apply { isPermitted = true }.requestAuth(true)
+                }
+                var oauthToken: String? = null
+                if (authResponse.auth?.let { oauthToken = it } == null) {
+                    throw RuntimeException("oauthToken is null")
+                }
+                val resolveSnapshotHeadRequest = ResolveSnapshotHeadRequest.Builder().apply {
+                    this.snapshotName = saveName
+                    unknownFileInt2 = 5
+                    unknownFileInt3 = 3
+                }.build()
+                val resolveSnapshotHeadResponse = SnapshotsDataClient.get(context).resolveSnapshotHead(oauthToken!!, resolveSnapshotHeadRequest)
+                val contentUrl = resolveSnapshotHeadResponse?.snapshotMetadata?.snapshot?.snapshotContentInfo?.url
+                if (contentUrl != null) {
+                    val contentByteArray = SnapshotsDataClient.get(context).getDataFromDrive(oauthToken!!, contentUrl)
+                    val fileOutputStream = FileOutputStream(file)
+                    fileOutputStream.write(contentByteArray)
+                }
+                val columns = PlayerColumns.CURRENT_PLAYER_COLUMNS.toTypedArray() +
+                        GameColumns.CURRENT_GAME_COLUMNS.toTypedArray() +
+                        SnapshotColumns.CURRENT_GAME_COLUMNS.toTypedArray()
+                val dataHolder = if (player is PlayerEntity) {
+                    DataHolder.builder(columns)
+                        .withRow(player.toContentValues()).build(CommonStatusCodes.SUCCESS)
+                } else {
+                    DataHolder.builder(columns).build(CommonStatusCodes.SIGN_IN_REQUIRED)
+                }
+                callbacks.onResolveSnapshotHead(dataHolder, Contents(ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_WRITE), 1, ParcelFileDescriptor.MODE_READ_WRITE, driveId, true, null))
+            }.onFailure {
+                callbacks.onResolveSnapshotHead(DataHolder.empty(GamesStatusCodes.SNAPSHOT_COMMIT_FAILED.code), null)
+            }
+        }
+    }
+
+    override fun registerEventClient(callback: IGamesClient?, clientId: Long) {
+        Log.d(TAG, "Not yet implemented: registerEventClient($clientId)")
     }
 
     private fun getCompareProfileIntent(playerId: String, block: Intent.() -> Unit = {}): Intent = getGamesIntent(ACTION_VIEW_PROFILE) {
@@ -529,6 +726,15 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
         Log.d(TAG, "Not yet implemented: loadPlayerStats($forceReload)")
     }
 
+    override fun getLeaderboardsScoresIntent(leaderboardId: String?, timeSpan: Int, collection: Int): Intent {
+        Log.d(TAG, "Method getLeaderboardsScoresIntent Called: timeSpan:$timeSpan collection:$collection")
+        return getGamesIntent(ACTION_VIEW_LEADERBOARDS_SCORES) {
+            putExtra(EXTRA_LEADERBOARD_ID, leaderboardId)
+            putExtra(EXTRA_LEADERBOARD_TIME_SPAN, timeSpan)
+            putExtra(EXTRA_LEADERBOARD_COLLECTION, collection)
+        }
+    }
+
     override fun getCurrentAccount(): Account? {
         Log.d(TAG, "Not yet implemented: getCurrentAccount")
         return account
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementResponseKt.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementResponseKt.kt
new file mode 100644
index 0000000000..6304a9267f
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementResponseKt.kt
@@ -0,0 +1,194 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.achievements
+
+import org.json.JSONObject
+
+data class AchievementDefinitionsListResponse<T>(
+    val items: List<T>, val kind: String?, val nextPageToken: String?
+) {
+    override fun toString(): String {
+        return "AchievementDefinitionsListResponse(items=$items, kind='$kind', nextPageToken='$nextPageToken')"
+    }
+}
+
+data class AchievementDefinition(
+    val achievementType: Int,
+    val description: String?,
+    val experiencePoints: String,
+    val formattedTotalSteps: String?,
+    val id: String?,
+    var initialState: Int,
+    val isRevealedIconUrlDefault: Boolean?,
+    val isUnlockedIconUrlDefault: Boolean?,
+    val kind: String?,
+    val name: String?,
+    val revealedIconUrl: String?,
+    val totalSteps: Int,
+    val unlockedIconUrl: String?
+) {
+
+    constructor(name: String, type: Int) : this(type, null, "", "", "", 0, null, null, null, name, null, 0, null)
+
+    override fun toString(): String {
+        return "AchievementDefinition(achievementType=$achievementType, description='$description', experiencePoints='$experiencePoints', formattedTotalSteps='$formattedTotalSteps', id='$id', initialState=$initialState, isRevealedIconUrlDefault=$isRevealedIconUrlDefault, isUnlockedIconUrlDefault=$isUnlockedIconUrlDefault, kind='$kind', name='$name', revealedIconUrl='$revealedIconUrl', totalSteps=$totalSteps, unlockedIconUrl='$unlockedIconUrl')"
+    }
+}
+
+data class PlayerAchievement(
+    val kind: String?,
+    val id: String?,
+    val currentSteps: Int,
+    val formattedCurrentStepsString: String?,
+    val achievementState: String,
+    val lastUpdatedTimestamp: String?,
+    val experiencePoints: String?
+) {
+    override fun toString(): String {
+        return "PlayerAchievement(kind=$kind, id=$id, currentSteps=$currentSteps, formattedCurrentStepsString=$formattedCurrentStepsString, achievementState=$achievementState, lastUpdatedTimestamp=$lastUpdatedTimestamp, experiencePoints=$experiencePoints)"
+    }
+}
+
+data class AchievementIncrementResponse(
+    val kind: String?, val currentSteps: Int, val newlyUnlocked: Boolean
+) {
+    override fun toString(): String {
+        return "AchievementIncrementResponse(kind=$kind, currentSteps=$currentSteps, newlyUnlocked=$newlyUnlocked)"
+    }
+}
+
+data class AchievementRevealResponse(
+    val kind: String?,
+    val currentState: String,
+) {
+    override fun toString(): String {
+        return "AchievementRevealResponse(kind=$kind, currentState=$currentState)"
+    }
+}
+
+data class AchievementUnlockResponse(
+    val kind: String?,
+    val newlyUnlocked: Boolean,
+) {
+    override fun toString(): String {
+        return "AchievementUnlockResponse(kind=$kind, newlyUnlocked=$newlyUnlocked)"
+    }
+}
+
+fun JSONObject.toUnlockResponse(): AchievementUnlockResponse {
+    return AchievementUnlockResponse(
+        optString("kind"), optBoolean("newlyUnlocked")
+    )
+}
+
+fun JSONObject.toIncrementResponse(): AchievementIncrementResponse {
+    return AchievementIncrementResponse(
+        optString("kind"), optInt("currentSteps"), optBoolean("newlyUnlocked")
+    )
+}
+
+fun JSONObject.toRevealResponse(): AchievementRevealResponse {
+    return AchievementRevealResponse(
+        optString("kind"), optString("currentState")
+    )
+}
+
+fun JSONObject.toAllAchievementListResponse(): AchievementDefinitionsListResponse<AchievementDefinition> {
+    val items = optJSONArray("items")
+    val achievements = ArrayList<AchievementDefinition>()
+    if (items != null) {
+        for (i in 0..<items.length()) {
+            val jsonObject = items.getJSONObject(i)
+            val achievementDefinition = AchievementDefinition(
+                getAchievementType(jsonObject.optString("achievementType")),
+                jsonObject.optString("description"),
+                jsonObject.optString("experiencePoints"),
+                jsonObject.optString("formattedTotalSteps"),
+                jsonObject.optString("id"),
+                getAchievementState(jsonObject.optString("initialState")),
+                jsonObject.optBoolean("isRevealedIconUrlDefault"),
+                jsonObject.optBoolean("isUnlockedIconUrlDefault"),
+                jsonObject.optString("kind"),
+                jsonObject.optString("name"),
+                jsonObject.optString("revealedIconUrl"),
+                jsonObject.optInt("totalSteps"),
+                jsonObject.optString("unlockedIconUrl")
+            )
+            achievements.add(achievementDefinition)
+        }
+    }
+    return AchievementDefinitionsListResponse(achievements, optString("kind"), optString("nextPageToken"))
+}
+
+fun JSONObject.toPlayerAchievementListResponse(): AchievementDefinitionsListResponse<PlayerAchievement> {
+    val items = optJSONArray("items")
+    val achievements = ArrayList<PlayerAchievement>()
+    if (items != null) {
+        for (i in 0..<items.length()) {
+            val jsonObject = items.getJSONObject(i)
+            val playerAchievement = PlayerAchievement(
+                jsonObject.optString("kind"),
+                jsonObject.optString("id"),
+                jsonObject.optInt("currentSteps"),
+                jsonObject.optString("formattedCurrentStepsString"),
+                jsonObject.optString("achievementState"),
+                jsonObject.optString("lastUpdatedTimestamp"),
+                jsonObject.optString("experiencePoints"),
+            )
+            achievements.add(playerAchievement)
+        }
+    }
+    return AchievementDefinitionsListResponse(achievements, optString("kind"), optString("nextPageToken"))
+}
+
+fun getAchievementType(type: String): Int {
+    return if (type == "STANDARD") {
+        AchievementType.TYPE_STANDARD
+    } else AchievementType.TYPE_INCREMENTAL
+}
+
+fun getAchievementState(state: String?): Int {
+    if (state == "UNLOCKED") {
+        return AchievementState.STATE_UNLOCKED
+    }
+    return if (state == "REVEALED") {
+        AchievementState.STATE_REVEALED
+    } else AchievementState.STATE_HIDDEN
+}
+
+
+class AchievementState {
+    companion object {
+        /**
+         * Constant indicating an unlocked achievement.
+         */
+        const val STATE_UNLOCKED = 0
+
+        /**
+         * Constant indicating a revealed achievement.
+         */
+        const val STATE_REVEALED = 1
+
+        /**
+         * Constant indicating a hidden achievement.
+         */
+        const val STATE_HIDDEN = 2
+    }
+}
+
+class AchievementType {
+    companion object {
+        /**
+         * Constant indicating a standard achievement.
+         */
+        const val TYPE_STANDARD = 0
+
+        /**
+         * Constant indicating an incremental achievement.
+         */
+        const val TYPE_INCREMENTAL = 1
+    }
+}
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsAdapter.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsAdapter.kt
new file mode 100644
index 0000000000..e2aeb8076f
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsAdapter.kt
@@ -0,0 +1,101 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.achievements
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+import com.google.android.gms.R
+import com.google.android.gms.common.images.ImageManager
+
+class AchievementsAdapter(
+    private val mContext: Context,
+    private val achievements: List<AchievementDefinition>
+) :
+    RecyclerView.Adapter<AchievementsHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AchievementsHolder {
+        val itemView = if (viewType == -1) {
+            LayoutInflater.from(mContext).inflate(R.layout.item_achievement_header_layout, null)
+        } else {
+            LayoutInflater.from(mContext).inflate(R.layout.item_achievement_data_layout, null)
+        }
+        return AchievementsHolder(itemView, viewType)
+    }
+
+    override fun getItemCount(): Int {
+        return achievements.size
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: AchievementsHolder, position: Int) {
+        val definition = achievements[position]
+        if (definition.achievementType == -1) {
+            holder.headerView?.text = definition.name
+        } else {
+            holder.achievementTitle?.text = definition.name
+            holder.achievementDesc?.text = definition.description
+            holder.achievementContent?.text = mContext.getString(
+                R.string.games_achievement_extra_text,
+                definition.experiencePoints
+            )
+            val imageUrl =
+                if (definition.initialState == AchievementState.STATE_UNLOCKED) {
+                    definition.unlockedIconUrl
+                } else {
+                    definition.revealedIconUrl
+                }
+            if (imageUrl != null) {
+                ImageManager.create(mContext).loadImage(imageUrl, holder.achievementLogo)
+            } else {
+                val logoId = if (definition.initialState == AchievementState.STATE_UNLOCKED) {
+                    R.drawable.ic_achievement_unlocked
+                } else {
+                    R.drawable.ic_achievement_locked
+                }
+                holder.achievementLogo?.setImageResource(logoId)
+            }
+        }
+    }
+
+    /**
+     * There are two display types.
+     * Now only the unlock display type is displayed, and the progress display type is not displayed yet.
+     */
+    override fun getItemViewType(position: Int): Int {
+        val definition = achievements[position]
+        return definition.achievementType
+    }
+
+}
+
+class AchievementsHolder(itemView: View, viewType: Int) : RecyclerView.ViewHolder(itemView) {
+
+    var headerView: TextView? = null
+
+    var achievementLogo: ImageView? = null
+    var achievementTitle: TextView? = null
+    var achievementContent: TextView? = null
+    var achievementDesc: TextView? = null
+
+    init {
+        if (viewType == -1) {
+            headerView = itemView.findViewById(R.id.achievements_header_title)
+        } else {
+            achievementLogo = itemView.findViewById(R.id.achievement_logo)
+            achievementTitle = itemView.findViewById(R.id.achievement_title)
+            achievementContent = itemView.findViewById(R.id.achievement_content)
+            achievementDesc = itemView.findViewById(R.id.achievement_desc)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsApiClient.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsApiClient.kt
new file mode 100644
index 0000000000..e85d95d1b2
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/achievements/AchievementsApiClient.kt
@@ -0,0 +1,94 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.achievements
+
+import android.content.Context
+import com.android.volley.Request.Method
+import org.microg.gms.games.requestGamesInfo
+import java.util.Locale
+
+/**
+ * https://developers.google.com/games/services/web/api/rest#rest-resource:-achievementdefinitions
+ * https://developers.google.com/games/services/web/api/rest#rest-resource:-achievements
+ */
+object AchievementsApiClient {
+
+    /**
+     * Lists all the achievement definitions for your application.
+     */
+    suspend fun requestGameAllAchievements(mContext: Context, oauthToken: String, pageToken: String? = null) = requestGamesInfo(mContext,
+        Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/achievements",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toAllAchievementListResponse()
+
+    /**
+     * Lists the progress for all your application's achievements for the currently authenticated player.
+     */
+    suspend fun requestPlayerAllAchievements(mContext: Context, oauthToken: String, pageToken: String? = null) = requestGamesInfo(mContext,
+        Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/players/me/achievements",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toPlayerAchievementListResponse()
+
+    /**
+     * Increments the steps of the achievement with the given ID for the currently authenticated player.
+     */
+    suspend fun incrementAchievement(mContext: Context, oauthToken: String, achievementId: String, numSteps: Int) = requestGamesInfo(
+        mContext,
+        Method.POST,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/achievements/$achievementId/increment",
+        HashMap<String, String>().apply {
+            put("requestId", achievementId.hashCode().toString())
+            put("stepsToIncrement", if (numSteps <= 0) "1" else numSteps.toString())
+        }).toIncrementResponse()
+
+    /**
+     * Sets the state of the achievement with the given ID to REVEALED for the currently authenticated player.
+     */
+    suspend fun revealAchievement(mContext: Context, oauthToken: String, achievementId: String) = requestGamesInfo(
+        mContext,
+        Method.POST,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/achievements/$achievementId/reveal",
+        null
+    ).toRevealResponse()
+
+    /**
+     * Sets the steps for the currently authenticated player towards unlocking an achievement.
+     * If the steps parameter is less than the current number of steps that the player already gained for the achievement, the achievement is not modified.
+     */
+    suspend fun setStepsAtLeast(mContext: Context, oauthToken: String, achievementId: String, steps: Int) = requestGamesInfo(mContext,
+        Method.POST,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/achievements/$achievementId/setStepsAtLeast",
+        HashMap<String, String>().apply {
+            put("steps", if (steps <= 0) "1" else steps.toString())
+        }).toIncrementResponse()
+
+    /**
+     * Unlocks this achievement for the currently authenticated player.
+     */
+    suspend fun unlockAchievement(mContext: Context, oauthToken: String, achievementId: String) = requestGamesInfo(
+        mContext,
+        Method.POST,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/achievements/$achievementId/unlock",
+        null
+    ).toUnlockResponse()
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/extensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/extensions.kt
index 1349cc0367..5c8b047427 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/games/extensions.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/extensions.kt
@@ -9,15 +9,26 @@ import android.accounts.Account
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
+import android.net.Uri
 import androidx.core.content.contentValuesOf
 import androidx.core.net.toUri
-import com.android.volley.*
+import com.android.volley.NetworkResponse
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import com.android.volley.Response
 import com.android.volley.Response.success
+import com.android.volley.VolleyError
 import com.android.volley.toolbox.JsonObjectRequest
 import com.android.volley.toolbox.Volley
 import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.Scope
-import com.google.android.gms.games.*
+import com.google.android.gms.games.CurrentPlayerInfoEntity
+import com.google.android.gms.games.Player
+import com.google.android.gms.games.PlayerColumns
+import com.google.android.gms.games.PlayerEntity
+import com.google.android.gms.games.PlayerLevel
+import com.google.android.gms.games.PlayerLevelInfo
+import com.google.android.gms.games.PlayerRelationshipInfoEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
@@ -31,10 +42,13 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
+const val SERVICE_GAMES_LITE = "oauth2:https://www.googleapis.com/auth/games_lite"
 
 const val ACTION_START_1P = "com.google.android.play.games.service.START_1P"
 const val ACTION_VIEW_LEADERBOARDS = "com.google.android.gms.games.VIEW_LEADERBOARDS"
+const val ACTION_VIEW_LEADERBOARDS_SCORES = "com.google.android.gms.games.VIEW_LEADERBOARD_SCORES"
 const val ACTION_VIEW_ACHIEVEMENTS = "com.google.android.gms.games.VIEW_ACHIEVEMENTS"
+const val ACTION_VIEW_SNAPSHOTS = "com.google.android.gms.games.SHOW_SELECT_SNAPSHOT"
 const val ACTION_PLAYER_SEARCH = "com.google.android.gms.games.PLAYER_SEARCH"
 const val ACTION_VIEW_PROFILE = "com.google.android.gms.games.VIEW_PROFILE"
 const val ACTION_ADD_FRIEND = "com.google.android.gms.games.ADD_FRIEND"
@@ -50,6 +64,18 @@ const val EXTRA_POPUP_GRAVITY = "com.google.android.gms.games.key.connectingPopu
 const val EXTRA_SELF_IN_GAME_NAME = "com.google.android.gms.games.EXTRA_SELF_IN_GAME_NAME"
 const val EXTRA_OTHER_PLAYER_IN_GAME_NAME = "com.google.android.gms.games.EXTRA_OTHER_PLAYER_IN_GAME_NAME"
 
+const val EXTRA_MAX_SNAPSHOTS = "com.google.android.gms.games.MAX_SNAPSHOTS"
+const val EXTRA_ALLOW_CREATE_SNAPSHOT = "com.google.android.gms.games.ALLOW_CREATE_SNAPSHOT"
+const val EXTRA_TITLE = "com.google.android.gms.games.TITLE"
+const val EXTRA_ALLOW_DELETE_SNAPSHOT = "com.google.android.gms.games.ALLOW_DELETE_SNAPSHOT"
+const val EXTRA_SNAPSHOT_NEW = "com.google.android.gms.games.SNAPSHOT_NEW"
+const val EXTRA_SNAPSHOT_METADATA = "com.google.android.gms.games.SNAPSHOT_METADATA"
+
+const val EXTRA_LEADERBOARD_ID = "com.google.android.gms.games.LEADERBOARD_ID"
+const val EXTRA_LEADERBOARD_TIME_SPAN = "com.google.android.gms.games.LEADERBOARD_TIME_SPAN"
+const val EXTRA_LEADERBOARD_COLLECTION = "com.google.android.gms.games.LEADERBOARD_COLLECTION"
+
+const val EXTRA_ACCOUNT_KEY = "com.google.android.gms.games.ACCOUNT_KEY"
 const val GAMES_PACKAGE_NAME = "com.google.android.play.games"
 
 val List<Scope>.realScopes
@@ -153,6 +179,33 @@ fun JSONObject.toPlayer() = PlayerEntity(
     null
 )
 
+suspend fun requestGamesInfo(
+    context: Context,
+    method: Int,
+    oauthToken: String,
+    url: String,
+    params: HashMap<String, String>?,
+    requestBody: JSONObject? = null,
+    queue: RequestQueue = singleInstanceOf { Volley.newRequestQueue(context.applicationContext) }
+): JSONObject = suspendCoroutine { continuation ->
+    val uriBuilder = Uri.parse(url).buildUpon().apply {
+        if (!params.isNullOrEmpty()) {
+            for (key in params.keys) {
+                appendQueryParameter(key, params[key])
+            }
+        }
+    }
+    queue.add(object : JsonObjectRequest(method, uriBuilder.build().toString(), requestBody, {
+        continuation.resume(it)
+    }, {
+        continuation.resumeWithException(RuntimeException(it))
+    }) {
+        override fun getHeaders(): Map<String, String> = hashMapOf<String, String>().apply {
+            put("Authorization", "OAuth $oauthToken")
+        }
+    })
+}
+
 suspend fun registerForGames(context: Context, account: Account, queue: RequestQueue = singleInstanceOf { Volley.newRequestQueue(context.applicationContext) }) {
     val authManager = AuthManager(context, account.name, Constants.GMS_PACKAGE_NAME, "oauth2:${Scopes.GAMES_FIRSTPARTY}")
     authManager.setOauth2Foreground("1")
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardResponseKt.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardResponseKt.kt
new file mode 100644
index 0000000000..07799cfe9f
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardResponseKt.kt
@@ -0,0 +1,323 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.leaderboards
+
+import com.google.android.gms.games.PlayerEntity
+import org.json.JSONArray
+import org.json.JSONObject
+import org.microg.gms.games.toPlayer
+
+data class LeaderboardListResponse(
+    val items: List<LeaderboardDefinition>, val kind: String?, val nextPageToken: String?
+) {
+    override fun toString(): String {
+        return "LeaderboardListResponse(items=$items, kind='$kind', nextPageToken='$nextPageToken')"
+    }
+}
+
+data class LeaderboardDefinition(
+    val kind: String?,
+    val id: String?,
+    val name: String?,
+    val iconUrl: String?,
+    val isIconUrlDefault: Boolean,
+    val order: String?
+) {
+    override fun toString(): String {
+        return "LeaderboardDefinition(kind=$kind, id=$id, name=$name, iconUrl=$iconUrl, isIconUrlDefault=$isIconUrlDefault, order=$order)"
+    }
+}
+
+data class GetLeaderboardScoresResponse(
+    val kind: String?, val nextPageToken: String?, val player: PlayerEntity?, val items: List<LeaderboardScore>?
+) {
+    override fun toString(): String {
+        return "GetLeaderboardScoresResponse(kind=$kind, nextPageToken=$nextPageToken, player=$player, items=$items)"
+    }
+}
+
+data class LeaderboardScore(
+    val kind: String?,
+    val leaderboardId: String?,
+    val scoreValue: String?,
+    val scoreString: String?,
+    val publicRank: LeaderboardScoreRank?,
+    val socialRank: LeaderboardScoreRank?,
+    val friendsRank: LeaderboardScoreRank?,
+    val timeSpan: String,
+    val writeTimestamp: String,
+    val scoreTag: String
+) {
+    override fun toString(): String {
+        return "LeaderboardScore(kind=$kind, leaderboardId=$leaderboardId, scoreValue=$scoreValue, scoreString=$scoreString, publicRank=$publicRank, socialRank=$socialRank, friendsRank=$friendsRank, timeSpan=$timeSpan, writeTimestamp='$writeTimestamp', scoreTag='$scoreTag')"
+    }
+}
+
+data class LeaderboardScoreRank(
+    val kind: String?,
+    val rank: String?,
+    val formattedRank: String?,
+    val numScores: String?,
+    val formattedNumScores: String?,
+) {
+    override fun toString(): String {
+        return "LeaderboardScoreRank(kind=$kind, rank=$rank, formattedRank=$formattedRank, numScores=$numScores, formattedNumScores=$formattedNumScores)"
+    }
+}
+
+data class ListLeaderboardScoresResponse(
+    val kind: String?,
+    val nextPageToken: String?,
+    val prevPageToken: String?,
+    val numScores: String?,
+    val playerScore: LeaderboardEntry?,
+    val items: ArrayList<LeaderboardEntry>,
+) {
+    override fun toString(): String {
+        return "ListLeaderboardScoresResponse(kind=$kind, nextPageToken=$nextPageToken, prevPageToken=$prevPageToken, numScores=$numScores, playerScore=$playerScore, items=$items)"
+    }
+}
+
+data class LeaderboardEntry(
+    val kind: String?,
+    val player: PlayerEntity?,
+    val scoreRank: String?,
+    val formattedScoreRank: String?,
+    val scoreValue: String?,
+    val formattedScore: String?,
+    val timeSpan: String?,
+    val writeTimestampMillis: String?,
+    val scoreTag: String?,
+) {
+    constructor(leaderboardTitle: String?, leaderboardLogoUrl: String?) : this(
+        null, null, null, null, leaderboardTitle, null, null, null, leaderboardLogoUrl
+    )
+
+    override fun toString(): String {
+        return "LeaderboardEntry(kind=$kind, player=$player, scoreRank=$scoreRank, formattedScoreRank=$formattedScoreRank, scoreValue=$scoreValue, formattedScore=$formattedScore, timeSpan=$timeSpan, writeTimestampMillis=$writeTimestampMillis, scoreTag=$scoreTag)"
+    }
+}
+
+data class SubmitLeaderboardScoreListResponse(
+    val kind: String?,
+    val submittedScores: List<SubmitLeaderboardScoreResponse>?,
+) {
+    override fun toString(): String {
+        return "SubmitLeaderboardScoreListResponse(kind=$kind, submittedScores=$submittedScores)"
+    }
+}
+
+data class SubmitLeaderboardScoreResponse(
+    val kind: String?,
+    val beatenScoreTimeSpans: List<String>?,
+    val unbeatenScores: List<PlayerScore>?,
+    val formattedScore: String?,
+    val leaderboardId: String?,
+    val scoreTag: String?,
+) {
+    override fun toString(): String {
+        return "SubmitLeaderboardScoreResponse(kind=$kind, beatenScoreTimeSpans=$beatenScoreTimeSpans, unbeatenScores=$unbeatenScores, formattedScore=$formattedScore, leaderboardId=$leaderboardId, scoreTag=$scoreTag)"
+    }
+}
+
+data class PlayerScore(
+    val kind: String?, val timeSpan: String?, val score: String?, val formattedScore: String?, val scoreTag: String?
+) {
+    override fun toString(): String {
+        return "PlayerScore(kind=$kind, timeSpan=$timeSpan, score=$score, formattedScore=$formattedScore, scoreTag=$scoreTag)"
+    }
+}
+
+data class PlayerScoreSubmissionList(
+    val kind: String?, val scores: List<ScoreSubmission>
+) {
+    override fun toString(): String {
+        return "PlayerScoreSubmissionList(kind=$kind, scores=$scores)"
+    }
+}
+
+data class ScoreSubmission(
+    val kind: String?,
+    val leaderboardId: String?,
+    val score: String?,
+    val scoreTag: String?,
+    val signature: String?,
+) {
+    override fun toString(): String {
+        return "ScoreSubmission(kind=$kind, leaderboardId=$leaderboardId, score=$score, scoreTag=$scoreTag, signature=$signature)"
+    }
+}
+
+fun PlayerScoreSubmissionList.toJSONObject() = JSONObject().apply {
+    put("kind", kind)
+    put("scores", JSONArray().apply {
+        for (score in scores) {
+            put(score.toJSONObject())
+        }
+    })
+}
+
+fun ScoreSubmission.toJSONObject() = JSONObject().apply {
+    put("kind", kind)
+    put("leaderboardId", leaderboardId)
+    put("score", score)
+    put("scoreTag", scoreTag)
+    put("signature", signature)
+}
+
+fun JSONObject.toSubmitLeaderboardScoreListResponse() = SubmitLeaderboardScoreListResponse(
+    optString("kind"),
+    optJSONArray("submittedScores")?.toSubmitLeaderboardScoreResponseList(),
+)
+
+fun JSONArray.toSubmitLeaderboardScoreResponseList(): List<SubmitLeaderboardScoreResponse> {
+    val list = arrayListOf<SubmitLeaderboardScoreResponse>()
+    for (i in 0..<length()) {
+        val jsonObject = optJSONObject(i)
+        list.add(jsonObject.toSubmitLeaderboardScoreResponse())
+    }
+    return list
+}
+
+fun JSONObject.toSubmitLeaderboardScoreResponse() = SubmitLeaderboardScoreResponse(
+    optString("kind"),
+    optJSONArray("beatenScoreTimeSpans")?.toTimeSpans(),
+    optJSONArray("unbeatenScores")?.toPlayerScore(),
+    optString("formattedScore"),
+    optString("leaderboardId"),
+    optString("scoreTag"),
+)
+
+fun JSONArray.toTimeSpans(): List<String> {
+    val list = arrayListOf<String>()
+    for (i in 0..<length()) {
+        list.add(optString(i))
+    }
+    return list
+}
+
+fun JSONArray.toPlayerScore(): List<PlayerScore> {
+    val list = arrayListOf<PlayerScore>()
+    for (i in 0..<length()) {
+        val jsonObject = optJSONObject(i)
+        list.add(
+            PlayerScore(
+                jsonObject.optString("kind"),
+                jsonObject.optString("timeSpan"),
+                jsonObject.optString("score"),
+                jsonObject.optString("formattedScore"),
+                jsonObject.optString("scoreTag"),
+            )
+        )
+    }
+    return list
+}
+
+fun JSONObject.toListLeaderboardScoresResponse() = ListLeaderboardScoresResponse(
+    optString("kind"),
+    optString("nextPageToken"),
+    optString("prevPageToken"),
+    optString("numScores"),
+    optJSONObject("playerScore")?.toLeaderboardEntry(),
+    getJSONArray("items").toLeaderboardEntryList(),
+)
+
+fun JSONArray.toLeaderboardEntryList(): ArrayList<LeaderboardEntry> {
+    val list = arrayListOf<LeaderboardEntry>()
+    for (i in 0..<length()) {
+        val jsonObject = optJSONObject(i)
+        list.add(jsonObject.toLeaderboardEntry())
+    }
+    return list
+}
+
+fun JSONObject.toLeaderboardEntry() = LeaderboardEntry(
+    optString("kind"),
+    optJSONObject("player")?.toPlayer(),
+    optString("scoreRank"),
+    optString("formattedScoreRank"),
+    optString("scoreValue"),
+    optString("formattedScore"),
+    optString("timeSpan"),
+    optString("writeTimestampMillis"),
+    optString("scoreTag"),
+)
+
+fun JSONObject.toGetLeaderboardScoresResponse() = GetLeaderboardScoresResponse(
+    optString("kind"),
+    optString("nextPageToken"),
+    optJSONObject("player")?.toPlayer(),
+    optJSONArray("items")?.toLeaderboardScoreList()
+)
+
+fun JSONArray.toLeaderboardScoreList(): List<LeaderboardScore> {
+    val list = arrayListOf<LeaderboardScore>()
+    for (i in 0..<length()) {
+        val jsonObject = optJSONObject(i)
+        list.add(
+            LeaderboardScore(
+                jsonObject.optString("kind"),
+                jsonObject.optString("leaderboard_id"),
+                jsonObject.optString("scoreValue"),
+                jsonObject.optString("scoreString"),
+                jsonObject.optJSONObject("publicRank")?.toLeaderboardScoreRank(),
+                jsonObject.optJSONObject("socialRank")?.toLeaderboardScoreRank(),
+                jsonObject.optJSONObject("friendsRank")?.toLeaderboardScoreRank(),
+                jsonObject.optString("timeSpan"),
+                jsonObject.optString("writeTimestamp"),
+                jsonObject.optString("scoreTag"),
+            )
+        )
+    }
+    return list
+}
+
+fun JSONObject.toLeaderboardScoreRank() = LeaderboardScoreRank(
+    optString("kind"),
+    optString("rank"),
+    optString("formattedRank"),
+    optString("numScores"),
+    optString("formattedNumScores"),
+)
+
+fun JSONObject.toLeaderboardResponse(): LeaderboardDefinition {
+    return LeaderboardDefinition(
+        optString("kind"),
+        optString("id"),
+        optString("name"),
+        optString("iconUrl"),
+        optBoolean("isIconUrlDefault"),
+        optString("order")
+    )
+}
+
+fun JSONObject.toLeaderboardListResponse(): LeaderboardListResponse {
+    val items = optJSONArray("items")
+    val leaderboardDefinitions = ArrayList<LeaderboardDefinition>()
+    if (items != null) {
+        for (i in 0..<items.length()) {
+            val jsonObject = items.getJSONObject(i)
+            val achievementDefinition = LeaderboardDefinition(
+                jsonObject.optString("kind"),
+                jsonObject.optString("id"),
+                jsonObject.optString("name"),
+                jsonObject.optString("iconUrl"),
+                jsonObject.optBoolean("isIconUrlDefault"),
+                jsonObject.optString("order")
+            )
+            leaderboardDefinitions.add(achievementDefinition)
+        }
+    }
+    return LeaderboardListResponse(leaderboardDefinitions, optString("kind"), optString("nextPageToken"))
+}
+
+enum class ScoreTimeSpan {
+    ALL, ALL_TIME, WEEKLY, DAILY
+}
+
+enum class IncludeRankType {
+    ALL, PUBLIC, FRIENDS
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardScoresAdapter.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardScoresAdapter.kt
new file mode 100644
index 0000000000..e01a7ec416
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardScoresAdapter.kt
@@ -0,0 +1,95 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.leaderboards
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.gms.R
+import com.google.android.gms.common.images.ImageManager
+
+class LeaderboardScoresAdapter(
+    private val mContext: Context,
+    private val leaderboards: List<LeaderboardEntry>,
+) : RecyclerView.Adapter<LeaderboardScoresHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LeaderboardScoresHolder {
+        val view = if (viewType == -1) {
+            LayoutInflater.from(mContext).inflate(R.layout.item_leaderboard_score_header_layout, parent, false)
+        } else {
+            LayoutInflater.from(mContext).inflate(R.layout.item_leaderboard_score_data_layout, parent, false)
+        }
+        return LeaderboardScoresHolder(view, viewType)
+    }
+
+    override fun getItemCount(): Int {
+        return leaderboards.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val leaderboardEntry = leaderboards[position]
+        return if (leaderboardEntry.kind == null) -1 else 0
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: LeaderboardScoresHolder, position: Int) {
+        val leaderboardEntry = leaderboards[position]
+        if (leaderboardEntry.kind == null) {
+            val scoreTag = leaderboardEntry.scoreTag
+            if (scoreTag != null) {
+                ImageManager.create(mContext).loadImage(scoreTag, holder.leaderboardLogo)
+            } else {
+                holder.leaderboardLogo?.setImageResource(R.drawable.ic_leaderboard_placeholder)
+            }
+            holder.leaderboardTitle?.text = leaderboardEntry.scoreValue
+            return
+        }
+        val player = leaderboardEntry.player
+        val iconUrl = leaderboardEntry.player?.iconImageUrl
+        if (iconUrl != null) {
+            ImageManager.create(mContext).loadImage(iconUrl, holder.leaderboardPlayerLogo)
+        } else {
+            holder.leaderboardPlayerLogo?.setImageResource(R.drawable.ic_leaderboard_placeholder)
+        }
+        holder.leaderboardPlayerName?.text = player?.displayName
+        holder.leaderboardPlayerScore?.text = mContext.getString(R.string.games_leaderboards_score_label, leaderboardEntry.formattedScore)
+        holder.leaderboardPlayerRank?.text = leaderboardEntry.formattedScoreRank
+        if (position == leaderboards.size - 1) {
+            holder.leaderboardScoreLine?.visibility = View.INVISIBLE
+        }
+    }
+}
+
+class LeaderboardScoresHolder(itemView: View, viewType: Int) : RecyclerView.ViewHolder(itemView) {
+
+    var leaderboardPlayerLogo: ImageView? = null
+    var leaderboardPlayerName: TextView? = null
+    var leaderboardPlayerScore: TextView? = null
+    var leaderboardPlayerRank: TextView? = null
+    var leaderboardScoreLine: View? = null
+
+    var leaderboardTitle: TextView? = null
+    var leaderboardLogo: ImageView? = null
+
+    init {
+        if (viewType == -1) {
+            leaderboardTitle = itemView.findViewById(R.id.leaderboard_header_title)
+            leaderboardLogo = itemView.findViewById(R.id.leaderboard_header_logo)
+        } else {
+            leaderboardPlayerLogo = itemView.findViewById(R.id.leaderboard_player_logo)
+            leaderboardPlayerName = itemView.findViewById(R.id.leaderboard_player_name)
+            leaderboardPlayerScore = itemView.findViewById(R.id.leaderboard_player_score)
+            leaderboardPlayerRank = itemView.findViewById(R.id.leaderboard_player_rank)
+            leaderboardScoreLine = itemView.findViewById(R.id.leaderboard_score_line)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsAdapter.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsAdapter.kt
new file mode 100644
index 0000000000..958be1b5b2
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsAdapter.kt
@@ -0,0 +1,61 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.leaderboards
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.gms.R
+import com.google.android.gms.common.images.ImageManager
+
+class LeaderboardsAdapter(
+    private val mContext: Context, private val leaderboards: List<LeaderboardDefinition>, private val dealClick: (LeaderboardDefinition) -> Unit
+) : RecyclerView.Adapter<LeaderboardHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LeaderboardHolder {
+        val view = LayoutInflater.from(mContext).inflate(R.layout.item_leaderboard_data_layout, parent, false)
+        return LeaderboardHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return leaderboards.size
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: LeaderboardHolder, position: Int) {
+        val leaderboardDefinition = leaderboards[position]
+        val iconUrl = leaderboardDefinition.iconUrl
+        if (iconUrl != null) {
+            ImageManager.create(mContext).loadImage(iconUrl, holder.leaderboardLogo)
+        } else {
+            holder.leaderboardLogo?.setImageResource(R.drawable.ic_leaderboard_placeholder)
+        }
+        holder.leaderboardTitle?.text = leaderboardDefinition.name
+        if (position == leaderboards.size - 1) {
+            holder.leaderboardLine?.visibility = View.INVISIBLE
+        }
+        holder.itemView.setOnClickListener { dealClick(leaderboardDefinition) }
+    }
+}
+
+class LeaderboardHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    var leaderboardLogo: ImageView? = null
+    var leaderboardTitle: TextView? = null
+    var leaderboardLine: View? = null
+
+    init {
+        leaderboardLogo = itemView.findViewById(R.id.leaderboard_logo)
+        leaderboardTitle = itemView.findViewById(R.id.leaderboard_title)
+        leaderboardLine = itemView.findViewById(R.id.leaderboard_line)
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsApiClient.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsApiClient.kt
new file mode 100644
index 0000000000..2858ad9ad2
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/leaderboards/LeaderboardsApiClient.kt
@@ -0,0 +1,120 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.leaderboards
+
+import android.content.Context
+import com.android.volley.Request
+import org.microg.gms.games.requestGamesInfo
+import java.util.Locale
+import java.util.UUID
+
+/**
+ * https://developers.google.com/games/services/web/api/rest#rest-resource:-leaderboards
+ * https://developers.google.com/games/services/web/api/rest#rest-resource:-scores
+ */
+object LeaderboardsApiClient {
+
+    /**
+     * Lists all the leaderboard metadata for your application.
+     */
+    suspend fun requestAllLeaderboards(mContext: Context, oauthToken: String, pageToken: String? = null) =
+        requestGamesInfo(mContext, Request.Method.GET, oauthToken, "https://games.googleapis.com/games/v1/leaderboards", HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toLeaderboardListResponse()
+
+    /**
+     * Retrieves the metadata of the leaderboard with the given ID.
+     */
+    suspend fun getLeaderboardById(mContext: Context, oauthToken: String, leaderboardId: String) = requestGamesInfo(mContext,
+        Request.Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/leaderboards/${leaderboardId}",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+        }).toLeaderboardResponse()
+
+    /**
+     * Get high scores, and optionally ranks, in leaderboards for the currently authenticated player.
+     * For a specific time span, leaderboardId can be set to ALL to retrieve data for all leaderboards in a given time span.
+     * `NOTE: You cannot ask for 'ALL' leaderboards and 'ALL' timeSpans in the same request; only one parameter may be set to 'ALL'.
+     */
+    suspend fun getLeaderboardScoresById(
+        mContext: Context, oauthToken: String, leaderboardId: String, timeSpan: ScoreTimeSpan, pageToken: String? = null
+    ) = requestGamesInfo(mContext,
+        Request.Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/players/me/leaderboards/$leaderboardId/scores/$timeSpan",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            put("includeRankType", IncludeRankType.PUBLIC.toString())
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toGetLeaderboardScoresResponse()
+
+    /**
+     * Lists the scores in a leaderboard, starting from the top.
+     */
+    suspend fun requestLeaderboardScoresById(
+        mContext: Context, oauthToken: String, leaderboardId: String, pageToken: String? = null
+    ) = requestGamesInfo(mContext,
+        Request.Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/leaderboards/$leaderboardId/scores/${IncludeRankType.PUBLIC}",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            put("timeSpan", ScoreTimeSpan.ALL_TIME.toString())
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toListLeaderboardScoresResponse()
+
+    /**
+     * Lists the scores in a leaderboard around (and including) a player's score.
+     */
+    suspend fun requestLeaderboardScoresListWindowById(
+        mContext: Context, oauthToken: String, leaderboardId: String, collection: IncludeRankType, timeSpan: ScoreTimeSpan, pageToken: String? = null
+    ) = requestGamesInfo(mContext,
+        Request.Method.GET,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/leaderboards/$leaderboardId/window/$collection",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            put("timeSpan", timeSpan.toString())
+            put("returnTopIfAbsent", "true")
+            if (pageToken != null) {
+                put("pageToken", pageToken)
+            }
+        }).toListLeaderboardScoresResponse()
+
+    /**
+     * Submits a score to the specified leaderboard.
+     */
+    suspend fun submitLeaderboardScores(mContext: Context, oauthToken: String, leaderboardId: String, score: String) = requestGamesInfo(
+        mContext,
+        Request.Method.POST,
+        oauthToken,
+        "https://games.googleapis.com/games/v1/leaderboards/$leaderboardId/scores",
+        HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+            put("score", score)
+            put("scoreTag", UUID.fromString(leaderboardId + score).toString())
+        }).toSubmitLeaderboardScoreResponse()
+
+    /**
+     * Submits multiple scores to leaderboards.
+     */
+    suspend fun submitMultipleLeaderboardScores(
+        mContext: Context, oauthToken: String, list: PlayerScoreSubmissionList
+    ) = requestGamesInfo(
+        mContext, Request.Method.POST, oauthToken, "https://games.googleapis.com/games/v1/leaderboards/scores", HashMap<String, String>().apply {
+            put("language", Locale.getDefault().language)
+        }, list.toJSONObject()
+    ).toSubmitLeaderboardScoreListResponse()
+}
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotResponseKt.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotResponseKt.kt
new file mode 100644
index 0000000000..52a90b7d08
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotResponseKt.kt
@@ -0,0 +1,110 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.snapshot
+
+import org.json.JSONArray
+import org.json.JSONObject
+import org.microg.gms.games.GameSnapshot
+
+data class SnapshotsResponse(
+    val kind: String?, val nextPageToken: String?, val items: List<Snapshot>?
+) {
+    override fun toString(): String {
+        return "SnapshotsResponse(kind=$kind, nextPageToken=$nextPageToken, items=$items)"
+    }
+}
+
+data class Snapshot(
+    val id: String?,
+    val driveId: String?,
+    val kind: String?,
+    val type: String?,
+    val title: String?,
+    val description: String?,
+    val lastModifiedMillis: String?,
+    val durationMillis: String?,
+    val coverImage: SnapshotImage?,
+    val uniqueName: String?,
+    val progressValue: String?,
+) {
+
+    constructor(
+        id: String?,
+        title: String?,
+        description: String?,
+        lastModifiedMillis: String?,
+        coverImage: SnapshotImage?
+    ) : this(
+        id, null, null, null, title, description, lastModifiedMillis, null, coverImage, null, null
+    )
+
+    override fun toString(): String {
+        return "Snapshot(id=$id, driveId=$driveId, kind=$kind, type=$type, title=$title, description=$description, lastModifiedMillis=$lastModifiedMillis, durationMillis=$durationMillis, coverImage=$coverImage, uniqueName=$uniqueName, progressValue=$progressValue)"
+    }
+}
+
+data class SnapshotImage(
+    val width: Int?,
+    val height: Int?,
+    val mimeType: String?,
+    val url: String?,
+    val kind: String?,
+) {
+    override fun toString(): String {
+        return "SnapshotImage(width=$width, height=$height, mimeType='$mimeType', url='$url', kind='$kind')"
+    }
+}
+
+fun JSONObject.toSnapshotsResponse() = SnapshotsResponse(
+    optString("kind"),
+    optString("nextPageToken"),
+    optJSONArray("items")?.toSnapshot()
+)
+
+fun JSONArray.toSnapshot(): List<Snapshot> {
+    val snapshots = arrayListOf<Snapshot>()
+    for (i in 0..<length()) {
+        val jsonObject = optJSONObject(i)
+        snapshots.add(
+            Snapshot(
+                jsonObject.optString("id"),
+                jsonObject.optString("driveId"),
+                jsonObject.optString("kind"),
+                jsonObject.optString("type"),
+                jsonObject.optString("title"),
+                jsonObject.optString("description"),
+                jsonObject.optString("lastModifiedMillis"),
+                jsonObject.optString("durationMillis"),
+                jsonObject.optJSONObject("coverImage")?.toSnapshotImage(),
+                jsonObject.optString("uniqueName"),
+                jsonObject.optString("progressValue"),
+            )
+        )
+    }
+    return snapshots
+}
+
+fun JSONObject.toSnapshotImage() = SnapshotImage(
+    optInt("width"),
+    optInt("height"),
+    optString("mime_type"),
+    optString("url"),
+    optString("kind")
+)
+
+fun GameSnapshot.toSnapshot() = Snapshot(
+    metadata?.snapshot?.snapshotId,
+    metadata?.snapshotName,
+    metadata?.snapshot?.content?.description,
+    metadata?.snapshot?.content?.snapshotTimeInfo?.timestamp?.toString(),
+    SnapshotImage(
+        metadata?.snapshot?.coverImage?.width,
+        metadata?.snapshot?.coverImage?.height,
+        metadata?.snapshot?.coverImage?.mimeType,
+        metadata?.snapshot?.coverImage?.imageUrl,
+        null
+    )
+)
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsAdapter.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsAdapter.kt
new file mode 100644
index 0000000000..7b7e04763a
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsAdapter.kt
@@ -0,0 +1,96 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.snapshot
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.gms.R
+import com.google.android.gms.common.images.ImageManager
+import org.microg.gms.games.EXTRA_ALLOW_DELETE_SNAPSHOT
+import java.text.SimpleDateFormat
+import java.util.Date
+
+class SnapshotsAdapter(
+    private val mContext: Context,
+    private val callIntent: Intent,
+    snapshots: List<Snapshot>,
+    private val dealClick: (Snapshot, Int) -> Unit
+) :
+    RecyclerView.Adapter<SnapshotHolder>() {
+
+    private val snapshotDataList = arrayListOf<Snapshot>()
+    private val allowDelete = callIntent.getBooleanExtra(EXTRA_ALLOW_DELETE_SNAPSHOT, false)
+
+    init {
+        snapshotDataList.addAll(snapshots)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SnapshotHolder {
+        val view = LayoutInflater.from(mContext).inflate(R.layout.item_snapshot_data_layout, parent, false)
+        return SnapshotHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return snapshotDataList.size
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: SnapshotHolder, position: Int) {
+        val snapshot = snapshotDataList[position]
+        val imageUrl = snapshot.coverImage?.url
+        if (imageUrl != null) {
+            ImageManager.create(mContext).loadImage(imageUrl, holder.snapshotImage)
+        } else {
+            holder.snapshotImage?.setImageResource(R.drawable.ic_snapshot_load_error_image)
+        }
+        holder.snapshotTime?.text = snapshot.lastModifiedMillis?.let {
+            var timestamp = it.toLong()
+            //Check if the timestamp is greater than 10-digit threshold, indicating milliseconds
+            timestamp = if (timestamp > 10000000000L) timestamp else timestamp * 1000
+            SimpleDateFormat("yyyy/MM/dd HH:mm").format(Date(timestamp))
+        }
+        holder.snapshotDesc?.text = snapshot.description
+        if (allowDelete) {
+            holder.snapshotDeleteBtn?.visibility = View.VISIBLE
+            holder.snapshotDeleteBtn?.setOnClickListener { dealClick(snapshot, 1) }
+        } else{
+            holder.snapshotDeleteBtn?.visibility = View.GONE
+        }
+        holder.snapshotChooseBtn?.setOnClickListener { dealClick(snapshot, 0) }
+    }
+
+    fun update(snapshots: List<Snapshot>) {
+        snapshotDataList.clear()
+        snapshotDataList.addAll(snapshots)
+        notifyDataSetChanged()
+    }
+
+}
+
+class SnapshotHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    var snapshotImage: ImageView? = null
+    var snapshotTime: TextView? = null
+    var snapshotDesc: TextView? = null
+    var snapshotChooseBtn: TextView? = null
+    var snapshotDeleteBtn: TextView? = null
+
+    init {
+        snapshotImage = itemView.findViewById(R.id.snapshot_image)
+        snapshotTime = itemView.findViewById(R.id.snapshot_time)
+        snapshotDesc = itemView.findViewById(R.id.snapshot_desc)
+        snapshotChooseBtn = itemView.findViewById(R.id.snapshot_choose_btn)
+        snapshotDeleteBtn = itemView.findViewById(R.id.snapshot_delete_btn)
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsApiClient.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsApiClient.kt
new file mode 100644
index 0000000000..26150794ba
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsApiClient.kt
@@ -0,0 +1,234 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.snapshot
+
+import android.content.Context
+import android.util.Log
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.NetworkResponse
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import com.android.volley.Response
+import com.android.volley.VolleyError
+import com.android.volley.toolbox.HttpHeaderParser
+import com.google.android.gms.common.BuildConfig
+import com.squareup.wire.GrpcClient
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import org.json.JSONObject
+import org.microg.gms.checkin.LastCheckinInfo
+import org.microg.gms.games.CommitSnapshotRevisionRequest
+import org.microg.gms.games.DeleteSnapshotInfo
+import org.microg.gms.games.EmptyResult
+import org.microg.gms.games.GetSnapshotRequest
+import org.microg.gms.games.SnapshotsExtendedClient
+import org.microg.gms.games.GetSnapshotResponse
+import org.microg.gms.games.PrepareSnapshotRevisionRequest
+import org.microg.gms.games.PrepareSnapshotRevisionResponse
+import org.microg.gms.games.ResolveSnapshotHeadRequest
+import org.microg.gms.games.ResolveSnapshotHeadResponse
+import org.microg.gms.games.requestGamesInfo
+import org.microg.gms.profile.Build
+import java.util.Locale
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+
+private const val TAG = "SnapshotsApiClient"
+
+/**
+ * https://developers.google.com/games/services/web/api/rest#rest-resource:-snapshots
+ *
+ * Google Play Games Services can only support obtaining snapshot lists.
+ * There is no interface for saving or deleting snapshots.
+ */
+object SnapshotsApiClient {
+
+    private const val POST_TIMEOUT = 15000
+    const val SNAPSHOT_UPLOAD_LINK_DATA = 1
+    const val SNAPSHOT_UPLOAD_LINK_IMAGE = 2
+
+    suspend fun prepareSnapshotRevision(context: Context, oauthToken: String,
+                                        prepareSnapshotRevisionRequest: PrepareSnapshotRevisionRequest) : PrepareSnapshotRevisionResponse {
+        val snapshotClient = getGrpcClient(context, oauthToken)
+        return withContext(Dispatchers.IO) { snapshotClient.PrepareSnapshotRevision().execute(prepareSnapshotRevisionRequest) }
+    }
+
+    suspend fun uploadDataByUrl(oauthToken: String, url: String, requestQueue: RequestQueue, body: ByteArray): String = suspendCoroutine { continuation ->
+        requestQueue.add(object : Request<String>(Method.PUT, url, null) {
+
+            override fun deliverResponse(response: String) {
+                Log.d(TAG, "deliverResponse: $response")
+                continuation.resume(response)
+            }
+
+            override fun deliverError(error: VolleyError?) {
+                error?.let {
+                    continuation.resumeWithException(error)
+                }
+            }
+
+            override fun getBody(): ByteArray {
+                return body
+            }
+
+            override fun parseNetworkResponse(response: NetworkResponse): Response<String> {
+                var result = ""
+                try {
+                    val json = JSONObject(response.data.toString(Charsets.UTF_8))
+                    result = json.getString("resourceId")
+                } catch (e: Exception) {
+                    Log.w(TAG, "parseNetworkResponse: ", e)
+                }
+                return Response.success(result, HttpHeaderParser.parseCacheHeaders(response))
+            }
+
+            override fun getHeaders(): MutableMap<String, String> {
+                val headers = HashMap<String, String>()
+                headers["authorization"] = "OAuth $oauthToken"
+                headers["x-goog-upload-command"] = "upload, finalize"
+                headers["x-goog-upload-protocol"] = "resumable"
+                headers["Content-Type"] = "application/x-www-form-urlencoded"
+                headers["x-goog-upload-offset"] = "0"
+                headers["User-Agent"]  = "Mozilla/5.0 (Linux; Android ${Build.VERSION.RELEASE}; ${Build.MODEL} Build/${Build.ID};"
+                return headers
+            }
+        }.setRetryPolicy(DefaultRetryPolicy(POST_TIMEOUT, 0, 0.0F)))
+    }
+
+    suspend fun getDataFromDrive(oauthToken: String, url: String, requestQueue: RequestQueue) : ByteArray = suspendCoroutine { continuation ->
+        requestQueue.add(object : Request<ByteArray>(Method.GET, url, null) {
+            override fun parseNetworkResponse(response: NetworkResponse): Response<ByteArray> {
+                return Response.success(response.data, HttpHeaderParser.parseCacheHeaders(response))
+            }
+
+            override fun deliverResponse(response: ByteArray) {
+                Log.d(TAG, "deliverResponse: $response")
+                continuation.resume(response)
+            }
+
+            override fun deliverError(error: VolleyError?) {
+                error?.let {
+                    continuation.resumeWithException(error)
+                }
+            }
+
+            override fun getHeaders(): MutableMap<String, String> {
+                val headers = HashMap<String, String>()
+                headers["authorization"] = "OAuth $oauthToken"
+                headers["User-Agent"]  = "Mozilla/5.0 (Linux; Android ${Build.VERSION.RELEASE}; ${Build.MODEL} Build/${Build.ID};"
+                return headers
+            }
+
+        }.setRetryPolicy(DefaultRetryPolicy(POST_TIMEOUT, 0, 0.0F)))
+    }
+
+    suspend fun getRealUploadUrl(oauthToken: String, url: String, requestQueue: RequestQueue) : String = suspendCoroutine { continuation ->
+        requestQueue.add(object : Request<String>(Method.POST, url, null) {
+            override fun parseNetworkResponse(response: NetworkResponse): Response<String> {
+                val responseHeaders = response.headers
+                return Response.success(responseHeaders?.get("X-Goog-Upload-URL"), HttpHeaderParser.parseCacheHeaders(response))
+            }
+
+            override fun deliverResponse(response: String?) {
+                Log.d(TAG, "deliverResponse: $response")
+                continuation.resume(response?:"")
+            }
+
+            override fun deliverError(error: VolleyError?) {
+                error?.let {
+                    continuation.resumeWithException(error)
+                }
+            }
+
+            override fun getHeaders(): MutableMap<String, String> {
+                val headers = HashMap<String, String>()
+                headers["authorization"] = "OAuth $oauthToken"
+                headers["x-goog-upload-command"] = "start"
+                headers["x-goog-upload-protocol"] = "resumable"
+                headers["Content-Type"] = "application/x-www-form-urlencoded"
+                headers["User-Agent"]  = "Mozilla/5.0 (Linux; Android ${Build.VERSION.RELEASE}; ${Build.MODEL} Build/${Build.ID};"
+                return headers
+            }
+
+        }.setRetryPolicy(DefaultRetryPolicy(POST_TIMEOUT, 0, 0.0F)))
+    }
+
+    /**
+     *  Get the request content by capturing the packet.
+     *  Currently only supports getting list data.
+     */
+    /**
+     *  Get the request content by capturing the packet.
+     *  Currently only supports getting list data.
+     */
+    suspend fun requestSnapshotList(context: Context, oauthToken: String): GetSnapshotResponse {
+        val snapshotClient = getGrpcClient(context, oauthToken)
+        val snapshotRequestBody = GetSnapshotRequest.Builder().apply {
+            unknownFileIntList3 = listOf(2, 3, 1)
+            unknownFileInt4 = 25
+            unknownFileInt6 = 3
+        }.build()
+        return withContext(Dispatchers.IO) { snapshotClient.SyncSnapshots().execute(snapshotRequestBody) }
+    }
+
+    suspend fun deleteSnapshot(context: Context, oauthToken: String, snapshot: Snapshot): EmptyResult {
+        val snapshotClient = getGrpcClient(context, oauthToken)
+        val deleteSnapshotInfo = DeleteSnapshotInfo.Builder().apply {
+            snapshotName = snapshot.title
+            snapshotId = snapshot.id
+        }.build()
+        return withContext(Dispatchers.IO) { snapshotClient.DeleteSnapshot().execute(deleteSnapshotInfo) }
+    }
+
+    suspend fun resolveSnapshotHead(context: Context, oauthToken: String, resolveSnapshotHeadRequest: ResolveSnapshotHeadRequest): ResolveSnapshotHeadResponse {
+        val snapshotClient = getGrpcClient(context, oauthToken)
+        return withContext(Dispatchers.IO) { snapshotClient.ResolveSnapshotHead().execute(resolveSnapshotHeadRequest) }
+    }
+
+    suspend fun commitSnapshotRevision(context: Context, oauthToken: String,
+                                       commitSnapshotRevisionRequest: CommitSnapshotRevisionRequest): EmptyResult {
+        val snapshotClient = getGrpcClient(context, oauthToken)
+        return withContext(Dispatchers.IO) { snapshotClient.CommitSnapshotRevision().execute(commitSnapshotRevisionRequest) }
+    }
+
+    private fun getGrpcClient(context: Context, oauthToken: String) : SnapshotsExtendedClient {
+        val client = OkHttpClient().newBuilder().addInterceptor(
+            HeaderInterceptor(context, oauthToken)
+        ).build()
+        val grpcClient = GrpcClient.Builder().client(client).baseUrl("https://games.googleapis.com").build()
+        return grpcClient.create(SnapshotsExtendedClient::class)
+    }
+
+    class HeaderInterceptor(
+        private val context: Context,
+        private val oauthToken: String,
+    ) : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): okhttp3.Response {
+            val original = chain.request()
+            val requestBuilder = original.newBuilder()
+                .header("authorization", "Bearer $oauthToken")
+                .header("te", "trailers")
+                .header("x-play-games-agent", createPlayGamesAgent())
+                .header("x-device-id", LastCheckinInfo.read(context).androidId.toString(16))
+                .header("user-agent", "grpc-java-okhttp/1.66.0-SNAPSHOT")
+            val request = requestBuilder.build()
+            Log.d(TAG, "request: $request")
+            return chain.proceed(request)
+        }
+
+        private fun createPlayGamesAgent(): String {
+            var playGamesAgent =
+                "Mozilla/5.0 (Linux; Android ${Build.VERSION.RELEASE}; ${Build.MODEL} Build/${Build.ID};"
+            playGamesAgent +=  context.packageName + "/" + BuildConfig.VERSION_CODE + ";"
+            playGamesAgent += "FastParser/1.1; Games Android SDK/1.0-1052947;"
+            playGamesAgent += "com.google.android.play.games/517322040; (gzip); Games module/242632000"
+            return playGamesAgent
+        }
+    }
+}
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsDataClient.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsDataClient.kt
new file mode 100644
index 0000000000..5b3f01799e
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/snapshot/SnapshotsDataClient.kt
@@ -0,0 +1,287 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.snapshot
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Bitmap
+import android.text.TextUtils
+import android.util.Log
+import com.android.volley.toolbox.Volley
+import com.google.android.gms.common.util.IOUtils
+import com.google.android.gms.drive.Contents
+import com.google.android.gms.games.snapshot.SnapshotMetadataChangeEntity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
+import org.microg.gms.games.CommitSnapshotRevisionRequest
+import org.microg.gms.games.PrepareSnapshotRevisionRequest
+import org.microg.gms.games.ResolveSnapshotHeadRequest
+import org.microg.gms.games.SnapshotContent
+import org.microg.gms.games.SnapshotContentInfo
+import org.microg.gms.games.SnapshotTimeInfo
+import org.microg.gms.games.snapshot.SnapshotsApiClient.SNAPSHOT_UPLOAD_LINK_DATA
+import org.microg.gms.games.snapshot.SnapshotsApiClient.SNAPSHOT_UPLOAD_LINK_IMAGE
+import org.microg.gms.games.ukq
+import org.microg.gms.profile.Build
+import org.microg.gms.utils.BitmapUtils
+import org.microg.gms.utils.singleInstanceOf
+import java.io.BufferedInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.util.UUID
+
+class SnapshotsDataClient(val context: Context) {
+
+    private val requestQueue = singleInstanceOf { Volley.newRequestQueue(context.applicationContext) }
+
+    suspend fun loadSnapshotData(oauthToken: String) = withContext(Dispatchers.IO) {
+        val snapshots = arrayListOf<Snapshot>()
+        val snapshotsResponse = runCatching { SnapshotsApiClient.requestSnapshotList(context, oauthToken) }.getOrNull()
+        snapshotsResponse?.gameSnapshot?.forEach {
+            snapshots.add(it.toSnapshot())
+        }
+        return@withContext snapshots
+    }
+
+    private suspend fun uploadDataByUrl(oauthToken: String, url: String, body: ByteArray) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.uploadDataByUrl(oauthToken, url, requestQueue, body) }
+    }
+
+    suspend fun getDataFromDrive(oauthToken: String, url: String) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.getDataFromDrive(oauthToken, url, requestQueue) }.getOrNull()
+    }
+
+    private suspend fun getRealUploadUrl(oauthToken: String, url: String) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.getRealUploadUrl(oauthToken, url, requestQueue) }.getOrNull()
+    }
+
+    suspend fun resolveSnapshotHead(oauthToken: String, resolveSnapshotHeadRequest: ResolveSnapshotHeadRequest) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.resolveSnapshotHead(context, oauthToken, resolveSnapshotHeadRequest) }.getOrNull()
+    }
+
+    private suspend fun prepareSnapshotRevision(oauthToken: String, prepareSnapshotRevisionRequest: PrepareSnapshotRevisionRequest) =
+        withContext(Dispatchers.IO) {
+            runCatching { SnapshotsApiClient.prepareSnapshotRevision(context, oauthToken, prepareSnapshotRevisionRequest) }.getOrNull()
+        }
+
+    private suspend fun commitSnapshotRevision(oauthToken: String, commitSnapshotRevisionRequest: CommitSnapshotRevisionRequest) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.commitSnapshotRevision(context, oauthToken, commitSnapshotRevisionRequest) }.getOrNull()
+    }
+
+    suspend fun deleteSnapshotData(oauthToken: String, snapshot: Snapshot) = withContext(Dispatchers.IO) {
+        runCatching { SnapshotsApiClient.deleteSnapshot(context, oauthToken, snapshot) }.getOrNull()
+    }
+
+    suspend fun commitSnapshot(
+        oauthToken: String, snapshotTitle: String?, change: SnapshotMetadataChangeEntity, contents: Contents, maxCoverImageSize: Int
+    ) = withContext(Dispatchers.IO) {
+        runCatching {
+            if (TextUtils.isEmpty(snapshotTitle)) {
+                return@runCatching false
+            }
+
+            //Get data upload link
+            val ret = prepareSnapshotRevision(oauthToken, createPrepareSnapshotRevisionRequest(change, snapshotTitle!!))
+            Log.d(TAG, "commitSnapshot ret: $ret")
+            if (ret != null && ret.uploadLinkInfos.isNotEmpty()) {
+                val imageUploadTempUrl = ret.uploadLinkInfos.firstOrNull { it.id == SNAPSHOT_UPLOAD_LINK_IMAGE }?.url
+
+                val snapshotDataUploadTempUrl = ret.uploadLinkInfos.firstOrNull { it.id == SNAPSHOT_UPLOAD_LINK_DATA }?.url
+                if (snapshotDataUploadTempUrl == null) {
+                    Log.w(TAG, "commitSnapshot data upload temp url is null")
+                    return@runCatching false
+                }
+
+                val deferredGetImageRealUploadUrl = async {
+                    Log.w(TAG, "commitSnapshot image upload temp url is null")
+                    if (imageUploadTempUrl == null) {
+                        null
+                    } else {
+                        getRealUploadUrl(oauthToken, imageUploadTempUrl)
+                    }
+                }
+                val deferredGetDataRealUploadUrl = async {
+                    getRealUploadUrl(oauthToken, snapshotDataUploadTempUrl)
+                }
+
+
+                val deferredUploadSnapshotImage = async {
+                    val snapshotImageUploadUrl = deferredGetImageRealUploadUrl.await()
+                    if (snapshotImageUploadUrl == null) {
+                        Log.w(TAG, "commitSnapshot image upload url is null")
+                        Triple(0, 0, null)
+                    } else {
+                        uploadSnapshotImage(
+                            change!!.coverImageTeleporter!!.createTargetBitmap(), maxCoverImageSize, oauthToken, snapshotImageUploadUrl
+                        )
+                    }
+
+                }
+
+                val deferredUploadSnapshotData = async {
+                    val snapshotDataUploadUrl = deferredGetDataRealUploadUrl.await()
+                    if (snapshotDataUploadUrl == null) {
+                        Log.w(TAG, "commitSnapshot data upload url is null")
+                        return@async null
+                    }
+                    uploadSnapshotData(contents, oauthToken, snapshotDataUploadUrl)
+                }
+
+                val deferredCommit = async {
+                    val (imageWidth, imageHeight, snapShotImageResourceId: String?) = deferredUploadSnapshotImage.await()
+                    val snapshotDataResourceId = deferredUploadSnapshotData.await()
+                    if (snapshotDataResourceId != null) {
+                        commitSnapshotRevision(
+                            oauthToken, createCommitSnapshotRequest(
+                                change, snapshotDataResourceId, snapShotImageResourceId, imageWidth, imageHeight, snapshotTitle
+                            )
+                        )
+                    } else {
+                        return@async false
+                    }
+                }
+                deferredCommit.await()
+                return@runCatching true
+            } else {
+                return@runCatching false
+            }
+        }.getOrNull()
+    }
+
+    private fun createPrepareSnapshotRevisionRequest(change: SnapshotMetadataChangeEntity, snapshotTitle: String): PrepareSnapshotRevisionRequest {
+        val snapshotUpDateLink = mutableListOf<ukq>()
+        snapshotUpDateLink.add(ukq.Builder().apply {
+            unknownFileInt1 = SNAPSHOT_UPLOAD_LINK_DATA
+            unknownFileInt2 = 1
+        }.build())
+        if (change.coverImageTeleporter != null) {
+            snapshotUpDateLink.add(ukq.Builder().apply {
+                unknownFileInt1 = SNAPSHOT_UPLOAD_LINK_IMAGE
+                unknownFileInt2 = 1
+            }.build())
+        }
+        val prepareSnapshotRevisionRequest = PrepareSnapshotRevisionRequest.Builder().apply {
+            title = snapshotTitle
+            c = snapshotUpDateLink
+            randomUUID = UUID.randomUUID().toString()
+        }.build()
+        return prepareSnapshotRevisionRequest
+    }
+
+    private fun createCommitSnapshotRequest(
+        change: SnapshotMetadataChangeEntity,
+        snapshotDataResourceId: String,
+        snapShotImageResourceId: String?,
+        imageWidth: Int,
+        imageHeight: Int,
+        snapshotTitle: String
+    ): CommitSnapshotRevisionRequest {
+        Log.d(TAG, "createCommitSnapshotRequest: ")
+        val snapshotTimeInfo = getSnapshotTimeInfo()
+        val snapshotContent = SnapshotContent.Builder().apply {
+            description = change.description
+            this.snapshotTimeInfo = snapshotTimeInfo
+            progressValue = change.progressValue ?: -1
+            this.deviceName = Build.DEVICE
+            duration = change.progressValue ?: -1
+        }.build()
+        val snapshotContentInfo = SnapshotContentInfo.Builder().apply {
+            token = snapshotDataResourceId
+        }.build()
+
+        val snapshotImage: org.microg.gms.games.SnapshotImage? = if (!TextUtils.isEmpty(snapShotImageResourceId)) {
+            org.microg.gms.games.SnapshotImage.Builder().apply {
+                this.token = snapShotImageResourceId
+                this.width = imageWidth
+                this.height = imageHeight
+            }.build()
+        } else {
+            null
+        }
+
+        val snapshotBuilder = org.microg.gms.games.Snapshot.Builder().apply {
+            content = snapshotContent
+            this.snapshotContentInfo = snapshotContentInfo
+        }
+        if (snapshotImage != null) {
+            snapshotBuilder.coverImage = snapshotImage
+        }
+        val commitSnapshotRevisionRequest = CommitSnapshotRevisionRequest.Builder().apply {
+            this.snapshotName = snapshotTitle
+            this.snapshot = snapshotBuilder.build()
+            this.randomUUID = UUID.randomUUID().toString()
+            this.unknownFileInt7 = 3
+        }.build()
+        return commitSnapshotRevisionRequest
+    }
+
+    private suspend fun uploadSnapshotData(contents: Contents, oauthToken: String, snapshotDataUploadUrl: String): String? {
+        Log.d(TAG, "uploadSnapshotData: $snapshotDataUploadUrl")
+        val readInputStreamFully: ByteArray
+        val fileInputStream = contents.inputStream
+        val bufferedInputStream = BufferedInputStream(fileInputStream)
+        var snapshotDataResourceId: String? = null
+        try {
+            fileInputStream.channel.position(0L)
+            readInputStreamFully = IOUtils.readInputStreamFully(bufferedInputStream, false)
+            fileInputStream.channel.position(0L)
+            snapshotDataResourceId = uploadDataByUrl(oauthToken, snapshotDataUploadUrl, readInputStreamFully).getOrNull()
+            fileInputStream.close()
+        } catch (e: IOException) {
+            Log.w("SnapshotContentsEntity", "Failed to read snapshot data", e)
+        }
+        return snapshotDataResourceId
+    }
+
+    private suspend fun uploadSnapshotImage(bitmap: Bitmap, maxCoverImageSize: Int, oauthToken: String, imageUploadUrl: String): Triple<Int, Int, String?> {
+        Log.d(TAG, "uploadSnapshotImage imageUploadUrl: $imageUploadUrl")
+        var snapshotBitmap = bitmap
+        val bitmapSize = BitmapUtils.getBitmapSize(snapshotBitmap)
+        if (bitmapSize > maxCoverImageSize) {
+            Log.w(TAG, "commitSnapshot Snapshot cover image is too large. Currently at $bitmapSize bytes; max is $maxCoverImageSize Image will be scaled")
+            snapshotBitmap = BitmapUtils.scaledBitmap(snapshotBitmap, maxCoverImageSize.toFloat())
+            Log.d(TAG, "commitSnapshot scaledBitmap: ${snapshotBitmap.width} ${snapshotBitmap.height}")
+        }
+        Log.d(TAG, "commitSnapshot snapshotBitmap: $snapshotBitmap")
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        snapshotBitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream)
+        val snapShotImageResourceId = uploadDataByUrl(oauthToken, imageUploadUrl, byteArrayOutputStream.toByteArray()).getOrNull()
+        snapshotBitmap.recycle()
+        bitmap.recycle()
+        withContext(Dispatchers.IO) {
+            byteArrayOutputStream.close()
+        }
+        var imageWidth = snapshotBitmap.width
+        var imageHeight = snapshotBitmap.height
+        if (imageWidth > imageHeight) {
+            val temp = imageWidth
+            imageWidth = imageHeight
+            imageHeight = temp
+        }
+        Log.d(TAG, "commitSnapshot $imageWidth: $imageHeight")
+        return Triple(imageWidth, imageHeight, snapShotImageResourceId)
+    }
+
+    private fun getSnapshotTimeInfo(): SnapshotTimeInfo {
+        val timestamp = System.currentTimeMillis()
+        return SnapshotTimeInfo.Builder().apply {
+            this.timestamp = timestamp / 1000
+            this.playedTime = ((timestamp % 1000) * 1000000).toInt()
+        }.build()
+    }
+
+    companion object {
+        private const val TAG = "SnapshotsDataClient"
+
+        @SuppressLint("StaticFieldLeak")
+        @Volatile
+        private var instance: SnapshotsDataClient? = null
+        fun get(context: Context): SnapshotsDataClient = instance ?: synchronized(this) {
+            instance ?: SnapshotsDataClient(context.applicationContext).also { instance = it }
+        }
+    }
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/ui/GamesUiFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/ui/GamesUiFragment.kt
new file mode 100644
index 0000000000..1f25fb1b77
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/ui/GamesUiFragment.kt
@@ -0,0 +1,464 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.ui
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.app.Activity.RESULT_OK
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewStub
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.gms.R
+import com.google.android.gms.common.Scopes
+import com.google.android.gms.games.snapshot.SnapshotMetadataEntity
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.microg.gms.auth.AuthConstants
+import org.microg.gms.auth.AuthManager
+import org.microg.gms.auth.signin.SignInConfigurationService
+import org.microg.gms.common.Constants
+import org.microg.gms.games.ACTION_VIEW_ACHIEVEMENTS
+import org.microg.gms.games.ACTION_VIEW_LEADERBOARDS
+import org.microg.gms.games.ACTION_VIEW_LEADERBOARDS_SCORES
+import org.microg.gms.games.ACTION_VIEW_SNAPSHOTS
+import org.microg.gms.games.EXTRA_ACCOUNT_KEY
+import org.microg.gms.games.EXTRA_ALLOW_CREATE_SNAPSHOT
+import org.microg.gms.games.EXTRA_GAME_PACKAGE_NAME
+import org.microg.gms.games.EXTRA_LEADERBOARD_ID
+import org.microg.gms.games.EXTRA_MAX_SNAPSHOTS
+import org.microg.gms.games.EXTRA_SNAPSHOT_METADATA
+import org.microg.gms.games.EXTRA_SNAPSHOT_NEW
+import org.microg.gms.games.EXTRA_TITLE
+import org.microg.gms.games.GamesConfigurationService
+import org.microg.gms.games.SERVICE_GAMES_LITE
+import org.microg.gms.games.achievements.AchievementDefinition
+import org.microg.gms.games.achievements.AchievementState
+import org.microg.gms.games.achievements.AchievementsAdapter
+import org.microg.gms.games.achievements.AchievementsApiClient
+import org.microg.gms.games.achievements.PlayerAchievement
+import org.microg.gms.games.achievements.getAchievementState
+import org.microg.gms.games.leaderboards.LeaderboardDefinition
+import org.microg.gms.games.leaderboards.LeaderboardEntry
+import org.microg.gms.games.leaderboards.LeaderboardScoresAdapter
+import org.microg.gms.games.leaderboards.LeaderboardsAdapter
+import org.microg.gms.games.leaderboards.LeaderboardsApiClient
+import org.microg.gms.games.snapshot.Snapshot
+import org.microg.gms.games.snapshot.SnapshotsAdapter
+import org.microg.gms.games.snapshot.SnapshotsDataClient
+import org.microg.gms.people.PeopleManager
+import org.microg.gms.profile.ProfileManager
+
+class GamesUiFragment : BottomSheetDialogFragment() {
+
+    companion object {
+        const val TAG = "GamesUiFragment"
+        private const val KEY_PACKAGE_NAME = "clientPackageName"
+        private const val KEY_ACCOUNT_KEY = "accountKey"
+        private const val KEY_CALLER_INTENT = "callerIntent"
+
+        fun newInstance(clientPackageName: String, accountKey: String, intent: Intent): GamesUiFragment {
+            val fragment = GamesUiFragment()
+            val args = Bundle().apply {
+                putString(KEY_PACKAGE_NAME, clientPackageName)
+                putString(KEY_ACCOUNT_KEY, accountKey)
+                putParcelable(KEY_CALLER_INTENT, intent)
+            }
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    private lateinit var clientPackageName: String
+    private lateinit var callerIntent: Intent
+    private var account: Account? = null
+
+    private var playerLogo: ImageView? = null
+    private var uiTitle: TextView? = null
+    private var actionBtn: FloatingActionButton? = null
+    private var refreshBtn: ImageView? = null
+    private var cancelBtn: ImageView? = null
+    private var recyclerView: RecyclerView? = null
+    private var loadingView: FrameLayout? = null
+    private var errorView: TextView? = null
+    private var contentVb: ViewStub? = null
+
+    private var currentAccount: Account? = null
+    private var snapshotsAdapter: SnapshotsAdapter? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.d(TAG, "onCreate start")
+        kotlin.runCatching {
+            clientPackageName = arguments?.getString(KEY_PACKAGE_NAME)!!
+            callerIntent = arguments?.getParcelable(KEY_CALLER_INTENT)!!
+            account = AccountManager.get(context).accounts.filter {
+                it.type == AuthConstants.DEFAULT_ACCOUNT_TYPE && Integer.toHexString(it.name.hashCode()) == arguments?.getString(KEY_ACCOUNT_KEY)
+            }.getOrNull(0)
+        }.onFailure {
+            activity?.finish()
+        }
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        Log.d(TAG, "onActivityCreated start ")
+        kotlin.runCatching {
+            loadData(requireContext())
+        }.onFailure {
+            activity?.finish()
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
+        dialog.setOnShowListener {
+            dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            dialog.behavior.skipCollapsed = true
+            dialog.setCanceledOnTouchOutside(false)
+        }
+        dialog.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+                dialog.dismiss()
+                return@setOnKeyListener true
+            }
+            return@setOnKeyListener false
+        }
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        Log.d(TAG, "onCreateView")
+        return layoutInflater.inflate(R.layout.fragment_games_ui_layout, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        Log.d(TAG, "onViewCreated")
+        uiTitle = view.findViewById(R.id.games_ui_title)
+        actionBtn = view.findViewById(R.id.games_ui_action_button)
+        refreshBtn = view.findViewById(R.id.games_ui_refresh)
+        cancelBtn = view.findViewById(R.id.games_ui_cancel)
+        cancelBtn?.setOnClickListener { dismiss() }
+        recyclerView = view.findViewById(R.id.games_ui_recyclerview)
+        loadingView = view.findViewById(R.id.games_ui_loading)
+        playerLogo = view.findViewById(R.id.games_ui_player_logo)
+        errorView = view.findViewById(R.id.games_ui_error_tips)
+        contentVb = view.findViewById(R.id.games_ui_achievements_vb)
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        activity?.finish()
+        super.onDismiss(dialog)
+    }
+
+    private fun showErrorMsg(error: String) {
+        loadingView?.visibility = View.GONE
+        recyclerView?.visibility = View.GONE
+        errorView?.visibility = View.VISIBLE
+        errorView?.text = error
+    }
+
+    private fun loadData(context: Context) {
+        ProfileManager.ensureInitialized(context)
+        lifecycleScope.launch {
+            currentAccount = account ?: GamesConfigurationService.getDefaultAccount(context, clientPackageName) ?: SignInConfigurationService.getDefaultAccount(
+                context, clientPackageName
+            )
+
+            if (currentAccount == null) {
+                showErrorMsg(context.getString(R.string.games_api_access_denied))
+                return@launch
+            }
+
+            withContext(Dispatchers.IO) {
+                PeopleManager.getOwnerAvatarBitmap(
+                    context, currentAccount!!.name, false
+                )
+            }?.also {
+                playerLogo?.setImageBitmap(it)
+            }
+
+            val authResponse = withContext(Dispatchers.IO) {
+                AuthManager(context, currentAccount!!.name, clientPackageName, "$SERVICE_GAMES_LITE ${Scopes.DRIVE_APPFOLDER}").apply { isPermitted = true }
+                    .requestAuth(true)
+            }
+            var oauthToken: String? = null
+            if (authResponse.auth?.let { oauthToken = it } == null) {
+                showErrorMsg(context.getString(R.string.games_achievements_empty_text))
+                return@launch
+            }
+
+            runCatching {
+                when (callerIntent.action) {
+                    ACTION_VIEW_ACHIEVEMENTS -> loadLocalAchievements(context, oauthToken!!)
+                    ACTION_VIEW_LEADERBOARDS -> loadLocalLeaderboards(context, oauthToken!!)
+                    ACTION_VIEW_SNAPSHOTS -> loadSnapshots(context, oauthToken!!)
+                    ACTION_VIEW_LEADERBOARDS_SCORES -> loadLocalLeaderboardScores(context, oauthToken!!)
+                    else -> showErrorMsg("Not yet implemented")
+                }
+            }.onFailure {
+                Log.d(TAG, "show error: ", it)
+                activity?.finish()
+            }
+        }
+    }
+
+    private suspend fun loadSnapshots(context: Context, oauthToken: String) {
+        uiTitle?.text = callerIntent.getStringExtra(EXTRA_TITLE)
+        refreshBtn?.visibility = View.VISIBLE
+        refreshBtn?.setOnClickListener {
+            errorView?.visibility = View.GONE
+            loadingView?.visibility = View.VISIBLE
+            lifecycleScope.launchWhenCreated {
+                val snapshots = withContext(Dispatchers.IO) {
+                    SnapshotsDataClient.get(context).loadSnapshotData(oauthToken)
+                }
+                if (snapshots.isEmpty()) {
+                    showErrorMsg(context.getString(R.string.games_snapshot_empty_text))
+                } else {
+                    snapshotsAdapter?.update(snapshots)
+                }
+                addSnapshotBtnDetail(snapshots)
+            }
+        }
+        val snapshots = withContext(Dispatchers.IO) {
+            SnapshotsDataClient.get(context).loadSnapshotData(oauthToken)
+        }
+        addSnapshotBtnDetail(snapshots)
+        if (snapshots.isEmpty()) {
+            showErrorMsg(context.getString(R.string.games_snapshot_empty_text))
+            return
+        }
+        recyclerView?.apply {
+            layoutManager = LinearLayoutManager(context)
+            addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                errorView?.visibility = View.GONE
+                loadingView?.visibility = View.GONE
+            }
+        }?.adapter = snapshotsAdapter ?: SnapshotsAdapter(context, callerIntent, snapshots) { snapshot, i ->
+            lifecycleScope.launch {
+                if (i == 0) {
+                    val intent = Intent()
+                    val snapshotMetadataEntity = SnapshotMetadataEntity(
+                        null,
+                        null,
+                        snapshot.id,
+                        null,
+                        snapshot.coverImage?.url,
+                        snapshot.title,
+                        snapshot.description,
+                        snapshot.lastModifiedMillis?.toLong() ?: 0,
+                        0,
+                        1f,
+                        snapshot.title,
+                        false,
+                        0,
+                        ""
+                    )
+                    intent.putExtra(EXTRA_SNAPSHOT_METADATA, snapshotMetadataEntity)
+                    activity?.setResult(RESULT_OK, intent)
+                    activity?.finish()
+                } else {
+                    AlertDialog.Builder(context).apply {
+                        setTitle(getString(R.string.games_delete_snapshot_dialog_title))
+                        setMessage(getString(R.string.games_delete_snapshot_dialog_message))
+                    }.setNegativeButton(getString(R.string.games_delete_snapshot_dialog_cancel)) { dialog, _ ->
+                        dialog.dismiss()
+                    }.setPositiveButton(getString(R.string.games_delete_snapshot_dialog_ok)) { dialog, _ ->
+                        dialog.dismiss()
+                        lifecycleScope.launchWhenCreated {
+                            val snapshotData = SnapshotsDataClient.get(context).deleteSnapshotData(oauthToken, snapshot)
+                            if (snapshotData != null) {
+                                refreshBtn?.performClick()
+                            } else {
+                                Toast.makeText(context, getString(R.string.games_delete_snapshot_error), Toast.LENGTH_SHORT).show()
+                            }
+                        }
+                    }.show()
+                }
+            }
+        }.also {
+            snapshotsAdapter = it
+        }
+    }
+
+    private fun addSnapshotBtnDetail(snapshots: List<Snapshot>) {
+        val allowCreate = callerIntent.getBooleanExtra(EXTRA_ALLOW_CREATE_SNAPSHOT, true)
+        val maxSnapshot = callerIntent.getIntExtra(EXTRA_MAX_SNAPSHOTS, -1)
+        if (allowCreate && (maxSnapshot != -1 && snapshots.size < maxSnapshot)) {
+            actionBtn?.visibility = View.VISIBLE
+            actionBtn?.setOnClickListener {
+                val resultIntent = Intent()
+                resultIntent.putExtra(EXTRA_SNAPSHOT_NEW, true)
+                activity?.setResult(RESULT_OK, resultIntent)
+                activity?.finish()
+            }
+        } else {
+            actionBtn?.visibility = View.INVISIBLE
+        }
+    }
+
+    private suspend fun loadLocalLeaderboards(context: Context, oauthToken: String) {
+        uiTitle?.text = context.getString(R.string.games_leaderboard_list_title)
+        val loadLeaderboards = withContext(Dispatchers.IO) {
+            ArrayList<LeaderboardDefinition>().apply {
+                var playerPageToken: String? = null
+                do {
+                    val response = LeaderboardsApiClient.requestAllLeaderboards(context, oauthToken, playerPageToken)
+                    addAll(response.items)
+                    playerPageToken = response.nextPageToken
+                } while (!playerPageToken.isNullOrEmpty())
+            }
+        }
+        if (loadLeaderboards.isEmpty()) {
+            showErrorMsg(context.getString(R.string.games_leaderboard_empty_text))
+            return
+        }
+        recyclerView?.apply {
+            layoutManager = LinearLayoutManager(context)
+            addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                loadingView?.visibility = View.GONE
+            }
+        }?.adapter = LeaderboardsAdapter(context, loadLeaderboards) { leaderboard ->
+            val intent = Intent(ACTION_VIEW_LEADERBOARDS_SCORES)
+            intent.setPackage(Constants.GMS_PACKAGE_NAME)
+            intent.putExtra(EXTRA_GAME_PACKAGE_NAME, clientPackageName)
+            intent.putExtra(EXTRA_ACCOUNT_KEY, Integer.toHexString(currentAccount?.name.hashCode()))
+            intent.putExtra(EXTRA_LEADERBOARD_ID, leaderboard.id)
+            activity?.startActivity(intent)
+        }
+    }
+
+    private suspend fun loadLocalLeaderboardScores(context: Context, oauthToken: String) {
+        val leaderboardId = callerIntent.getStringExtra(EXTRA_LEADERBOARD_ID)
+        val leaderboardScores = withContext(Dispatchers.IO) {
+            ArrayList<LeaderboardEntry>().apply {
+                val response = LeaderboardsApiClient.requestLeaderboardScoresById(
+                    context, oauthToken, leaderboardId!!, null
+                )
+                addAll(response.items)
+            }
+        }
+        if (leaderboardScores.isEmpty()) {
+            showErrorMsg(context.getString(R.string.games_leaderboard_empty_text))
+            return
+        }
+        val leaderboardDefinition = withContext(Dispatchers.IO) {
+            LeaderboardsApiClient.getLeaderboardById(context, oauthToken, leaderboardId!!)
+        }
+        val leaderboardEntries = arrayListOf<LeaderboardEntry>()
+        leaderboardEntries.add(LeaderboardEntry(leaderboardDefinition.name, leaderboardDefinition.iconUrl))
+        leaderboardEntries.addAll(leaderboardScores)
+        recyclerView?.apply {
+            layoutManager = LinearLayoutManager(context)
+            addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                loadingView?.visibility = View.GONE
+            }
+            addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(recyclerView, dx, dy)
+                    val layoutManager = recyclerView.layoutManager
+                    if (layoutManager is LinearLayoutManager) {
+                        val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
+                        uiTitle?.text = if (firstVisibleItemPosition != 0) leaderboardDefinition.name else ""
+                    }
+                }
+            })
+        }?.adapter = LeaderboardScoresAdapter(context, leaderboardEntries)
+    }
+
+    private suspend fun loadLocalAchievements(context: Context, oauthToken: String) {
+        uiTitle?.text = context.getString(R.string.games_achievement_list_title)
+        val allAchievements = withContext(Dispatchers.IO) {
+            ArrayList<AchievementDefinition>().apply {
+                val playerAchievements = ArrayList<PlayerAchievement>()
+                var playerPageToken: String? = null
+                do {
+                    val response = AchievementsApiClient.requestPlayerAllAchievements(context, oauthToken, playerPageToken)
+                    playerAchievements.addAll(response.items)
+                    playerPageToken = response.nextPageToken
+                } while (!playerPageToken.isNullOrEmpty())
+
+                var pageToken: String? = null
+                do {
+                    val response = AchievementsApiClient.requestGameAllAchievements(context, oauthToken, pageToken)
+                    response.items.forEach { item ->
+                        if (playerAchievements.any { it.id == item.id }) {
+                            item.initialState = getAchievementState(playerAchievements.find { it.id == item.id }?.achievementState)
+                        }
+                        add(item)
+                    }
+                    pageToken = response.nextPageToken
+                } while (!pageToken.isNullOrEmpty())
+            }
+        }
+        if (allAchievements.isEmpty()) {
+            showErrorMsg(context.getString(R.string.games_achievements_empty_text))
+            return
+        }
+        val targetList = ArrayList<AchievementDefinition>()
+        val unlockList = ArrayList<AchievementDefinition>()
+        val revealedList = ArrayList<AchievementDefinition>()
+        for (definition in allAchievements) {
+            when (definition.initialState) {
+                AchievementState.STATE_REVEALED -> {
+                    revealedList.add(definition)
+                }
+
+                AchievementState.STATE_UNLOCKED -> {
+                    unlockList.add(definition)
+                }
+            }
+        }
+        if (unlockList.isNotEmpty()) {
+            targetList.add(AchievementDefinition(context.getString(R.string.games_achievement_unlocked_content_description), -1))
+            targetList.addAll(unlockList)
+        }
+        if (revealedList.isNotEmpty()) {
+            targetList.add(AchievementDefinition(context.getString(R.string.games_achievement_locked_content_description), -1))
+            targetList.addAll(revealedList)
+        }
+        val inflatedView = contentVb?.inflate()
+        inflatedView?.findViewById<TextView>(R.id.achievements_counter_text)?.text =
+            String.format("${unlockList.size} / ${unlockList.size + revealedList.size}")
+        recyclerView?.apply {
+            layoutManager = LinearLayoutManager(context)
+            inflatedView?.id?.let {
+                val layoutParams = layoutParams as RelativeLayout.LayoutParams
+                layoutParams.addRule(RelativeLayout.BELOW, it)
+                setLayoutParams(layoutParams)
+            }
+            addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                loadingView?.visibility = View.GONE
+            }
+        }?.adapter = AchievementsAdapter(context, targetList)
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/games/ui/InGameUiActivity.kt b/play-services-core/src/main/kotlin/org/microg/gms/games/ui/InGameUiActivity.kt
new file mode 100644
index 0000000000..8a576b5a6c
--- /dev/null
+++ b/play-services-core/src/main/kotlin/org/microg/gms/games/ui/InGameUiActivity.kt
@@ -0,0 +1,50 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games.ui
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.gms.R
+import org.microg.gms.games.EXTRA_ACCOUNT_KEY
+import org.microg.gms.games.EXTRA_GAME_PACKAGE_NAME
+
+private const val TAG = "InGameUiActivity"
+
+class InGameUiActivity : AppCompatActivity() {
+
+    private val clientPackageName: String?
+        get() = runCatching {
+            intent?.extras?.getString(EXTRA_GAME_PACKAGE_NAME)
+        }.getOrNull()
+    private val accountKey: String?
+        get() = runCatching {
+            intent.getStringExtra(EXTRA_ACCOUNT_KEY)
+        }.getOrNull()
+
+    @SuppressLint("CommitTransaction")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setTheme(R.style.ThemeTranslucentCommon)
+        Log.d(TAG, "InGameUiActivity onCreate: clientPackageName:$clientPackageName")
+        if (clientPackageName == null || accountKey == null) {
+            Log.d(TAG, "InGameUiActivity finishResult: params invalid")
+            finish()
+            return
+        }
+
+        val fragment = supportFragmentManager.findFragmentByTag(GamesUiFragment.TAG)
+        if (fragment == null) {
+            Log.d(TAG, "supportFragmentManager show")
+            val gamesUiFragment = GamesUiFragment.newInstance(clientPackageName!!, accountKey!!, intent)
+            supportFragmentManager.beginTransaction()
+                .add(gamesUiFragment, GamesUiFragment.TAG)
+                .commitAllowingStateLoss()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_achievement_locked.xml b/play-services-core/src/main/res/drawable/ic_achievement_locked.xml
new file mode 100644
index 0000000000..5e5fffd193
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_achievement_locked.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="56dp" android:width="56dp" android:viewportWidth="56" android:viewportHeight="56">
+    <path android:fillColor="#f8f9fa" android:pathData="M 8 0.3 L 48 0.3 Q 55.7 0.3 55.7 8 L 55.7 48 Q 55.7 55.7 48 55.7 L 8 55.7 Q 0.3 55.7 0.3 48 L 0.3 8 Q 0.3 0.3 8 0.3 Z" android:strokeColor="#dadce0" android:strokeWidth="0.6" android:fillType="evenOdd"/>
+    <path android:fillColor="#9aa0a6" android:pathData="M39.3968,15.6826 L16.5397,15.6826 C15.1429,15.6826 14,16.8254 14,18.2222 L14,22.0318 C14,23.4286 15.1429,24.5714 16.5397,24.5714 L19.0794,24.5714 L19.0794,28.381 C19.0794,31.1873 21.3524,33.4603 24.1587,33.4603 L25.4286,33.4603 L25.4286,38.5397 L21.619,38.5397 L21.619,41.0794 L34.3175,41.0794 L34.3175,38.5397 L30.5079,38.5397 L30.5079,33.4603 L31.7778,33.4603 C34.5841,33.4603 36.8571,31.1873 36.8571,28.381 L36.8571,24.5714 L39.3968,24.5714 C40.7937,24.5714 41.9365,23.4286 41.9365,22.0318 L41.9365,18.2222 C41.9365,16.8254 40.7937,15.6826 39.3968,15.6826 Z M16.5397,22.0318 L16.5397,18.2222 L19.0794,18.2222 L19.0794,22.0318 L16.5397,22.0318 Z M36.8571,22.0318 L39.3968,22.0318 L39.3968,18.2222 L36.8571,18.2222 L36.8571,22.0318 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_achievement_logo.xml b/play-services-core/src/main/res/drawable/ic_achievement_logo.xml
new file mode 100644
index 0000000000..003f0e59a7
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_achievement_logo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="284dp" android:width="277dp" android:viewportWidth="277" android:viewportHeight="284">
+    <path android:fillColor="#fdd835" android:pathData="M 132.349537 153.415868 L 154.59016 145.373655 L 174.591978 200.688388 L 152.351355 208.730601 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fdd835" android:pathData="M100.033951,171.280456 C73.4064296,180.901092 44.0184898,167.135704 34.363951,140.520456 L32.933951,136.570456 L129.363951,101.710456 L130.793951,105.660456 C140.381728,132.273285 126.622532,161.625639 100.033951,171.280456 Z M44.0244105,141.42119 C53.5333097,161.294506 76.5471759,170.737754 97.2744105,163.27119 C117.99741,155.769966 129.6683,133.78979 124.27441,112.42119 L44.0244105,141.42119 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M190.14457,138.482873 C163.517049,148.103508 134.129109,134.33812 124.47457,107.722873 L123.04457,103.772873 L219.47457,68.9128728 L220.90457,72.8628728 C230.492347,99.4757021 216.733152,128.828056 190.14457,138.482873 Z M134.13503,108.623607 C143.643929,128.496922 166.657795,137.940171 187.38503,130.473607 C208.10803,122.972383 219.77892,100.992206 214.38503,79.623607 L134.13503,108.623607 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fbbc04" android:pathData="M 136.280505 164.330441 L 158.521128 156.288228 L 166.485129 178.312557 L 144.244506 186.354771 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fdd835" android:pathData="M60.8775401,111.340688 L182.566191,67.3380485 L189.867093,87.5285843 C202.018086,121.131977 184.62748,158.223236 151.024087,170.374229 C117.420694,182.525223 80.3294349,165.134617 68.1784417,131.531223 L60.8775401,111.340688 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fdd835" android:pathData="M 135.179512 209.299963 L 188.143228 190.148273 L 193.233796 204.226164 L 140.27008 223.377854 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fdd835" android:pathData="M 121.431985 225.640814 L 209.15314 193.920828 L 214.243708 207.998719 L 126.522553 239.718705 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fffde7" android:pathData="M 124.284569 226.766172 L 152.475348 216.505568 L 154.527469 222.143723 L 126.33669 232.404328 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 99.857656 259.815435 L 102.602334 261.611304 L 88.4823336 283.191304 L 85.737656 281.395435 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 97.7522612 26.2256827 L 94.6677283 27.3410556 L 85.4577283 1.87105562 L 88.5422612 0.755682712 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 25.7005087 94.6653429 L 24.7394808 97.8013954 L 0.0694808444 90.2413954 L 1.0305087 87.1053429 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 198.512524 35.5410123 L 195.767465 33.7457261 L 209.887465 12.1557261 L 212.632524 13.9510123 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 240.699481 211.681395 L 241.660509 208.545343 L 266.330509 216.105343 L 265.369481 219.241395 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 36.2927128 197.100957 L 37.4072767 200.185782 L 11.6672767 209.485782 L 10.5527128 206.400957 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fdd835" android:pathData="M 275.802713 110.500957 L 276.917277 113.585782 L 251.177277 122.885782 L 250.062713 119.800957 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 156.015859 82.9851453 L 157.464131 82.461593 L 172.394131 123.761593 L 170.945859 124.285145 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 143.821827 111.557485 L 143.298163 110.109253 L 184.588163 95.1792532 L 185.111827 96.6274851 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 144.003077 94.7505241 L 144.656912 93.3562142 L 184.406912 111.996214 L 183.753077 113.390524 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 155.577114 123.580363 L 154.182876 122.926375 L 172.832876 83.1663754 L 174.227114 83.8203629 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 140.545547 132.260667 L 141.194442 132.026072 L 147.904442 150.586072 L 147.255547 150.820667 Z" android:strokeWidth="1"/>
+    <path android:pathData="M134.939995,144.783369 L153.509995,138.073369" android:strokeColor="#fff59d" android:strokeWidth="0.69" android:fillType="evenOdd"/>
+    <path android:fillColor="#fff59d" android:pathData="M 135.057237 145.107837 L 134.822753 144.458901 L 153.392753 137.748901 L 153.627237 138.397837 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 135.143516 137.545729 L 135.436474 136.921009 L 153.306474 145.301009 L 153.013516 145.925729 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fff59d" android:pathData="M 140.342355 150.509848 L 139.717635 150.21689 L 148.097635 132.34689 L 148.722355 132.639848 Z" android:strokeWidth="1"/>
+    <path android:fillColor="#fffde7" android:pathData="M 93.0544119 121.255951 L 99.9855777 118.750788 L 107.745578 140.220788 L 100.814412 142.725951 Z" android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_achievement_unlocked.xml b/play-services-core/src/main/res/drawable/ic_achievement_unlocked.xml
new file mode 100644
index 0000000000..3f997ab03e
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_achievement_unlocked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="56dp" android:width="56dp" android:viewportWidth="56" android:viewportHeight="56">
+    <path android:fillColor="#ffffff" android:pathData="M 8 0.3 L 48 0.3 Q 55.7 0.3 55.7 8 L 55.7 48 Q 55.7 55.7 48 55.7 L 8 55.7 Q 0.3 55.7 0.3 48 L 0.3 8 Q 0.3 0.3 8 0.3 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffee58" android:pathData="M 8 0.3 L 48 0.3 Q 55.7 0.3 55.7 8 L 55.7 48 Q 55.7 55.7 48 55.7 L 8 55.7 Q 0.3 55.7 0.3 48 L 0.3 8 Q 0.3 0.3 8 0.3 Z" android:strokeWidth="1" android:strokeAlpha="0.05" android:fillAlpha="0.05" android:fillType="evenOdd"/>
+    <path android:pathData="M 8 0.3 L 48 0.3 Q 55.7 0.3 55.7 8 L 55.7 48 Q 55.7 55.7 48 55.7 L 8 55.7 Q 0.3 55.7 0.3 48 L 0.3 8 Q 0.3 0.3 8 0.3 Z" android:strokeColor="#ffee58" android:strokeWidth="0.6" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffee58" android:pathData="M28,15.6826 L28,41.0794 L21.619,41.0794 L21.619,38.5397 L25.4286,38.5397 L25.4286,33.4603 L24.1587,33.4603 C21.3524,33.4603 19.0794,31.1873 19.0794,28.381 L19.0794,24.5714 L16.5397,24.5714 C15.1429,24.5714 14,23.4286 14,22.0318 L14,18.2222 C14,16.8254 15.1429,15.6826 16.5397,15.6826 L28,15.6826 Z M16.5397,22.0318 L19.0794,22.0318 L19.0794,18.2222 L16.5397,18.2222 L16.5397,22.0318 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:fillColor="#fdd835" android:pathData="M28,15.6826 L39.4603,15.6826 C40.8571,15.6826 42,16.8254 42,18.2222 L42,22.0318 C42,23.4286 40.8571,24.5714 39.4603,24.5714 L36.9206,24.5714 L36.9206,28.381 C36.9206,31.1873 34.6476,33.4603 31.8413,33.4603 L30.5714,33.4603 L30.5714,38.5397 L34.381,38.5397 L34.381,41.0794 L28,41.0794 L28,15.6826 Z M39.4603,22.0318 L39.4603,18.2222 L36.9206,18.2222 L36.9206,22.0318 L39.4603,22.0318 Z" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_leaderboard_placeholder.xml b/play-services-core/src/main/res/drawable/ic_leaderboard_placeholder.xml
new file mode 100644
index 0000000000..87f168a24c
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_leaderboard_placeholder.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="40dp" android:width="40dp" android:viewportWidth="72" android:viewportHeight="72">
+    <path android:fillColor="@android:color/holo_green_dark" android:pathData="M36,36m-36,0a36,36 0,1 1,72 0a36,36 0,1 1,-72 0" android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="@android:color/white" android:pathData="M35.98,19.58L26.95,33.52L18,26.12L22.9,47.37L35.98,47.37L49.05,47.37L53.96,26.12L45.01,33.52L35.98,19.58ZM32.71,37.56L35.98,32.66L39.25,37.56L36.07,42.46L32.71,37.56Z" android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="@android:color/white" android:pathData="M23.11,49l0.78,3.28l24.01,0l0.76,-3.28z" android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_refresh.xml b/play-services-core/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 0000000000..23d10bcc9f
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#ff80868b"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#ff80868b"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_snapshot_choose_fill.xml b/play-services-core/src/main/res/drawable/ic_snapshot_choose_fill.xml
new file mode 100644
index 0000000000..581eb9441c
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_snapshot_choose_fill.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/holo_green_dark" />
+    <corners android:radius="2dp"/>
+</shape>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_snapshot_choose_stroke.xml b/play-services-core/src/main/res/drawable/ic_snapshot_choose_stroke.xml
new file mode 100644
index 0000000000..5c5d1dd412
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_snapshot_choose_stroke.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="2dp"/>
+    <stroke android:color="@android:color/darker_gray" android:width="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_snapshot_load_error_image.xml b/play-services-core/src/main/res/drawable/ic_snapshot_load_error_image.xml
new file mode 100644
index 0000000000..bf59227319
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_snapshot_load_error_image.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="500dp" android:width="1024dp" android:viewportWidth="1024" android:viewportHeight="500">
+    <path android:fillColor="#f8f9fa" android:pathData="M757,288.2m-88.2,0a88.2,88.2 0,1 1,176.4 0a88.2,88.2 0,1 1,-176.4 0"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M296.6,331.4c-59.1,0 -107.1,-48 -107.1,-107.1s48,-107.1 107.1,-107.1h315.8c59.1,0 107.1,48 107.1,107.1s-48,107.1 -107.1,107.1H296.6z"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M382.4,83.3m-69,0a69,69 0,1 1,138 0a69,69 0,1 1,-138 0"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M622.1,191.4m-103,0a103,103 0,1 1,206 0a103,103 0,1 1,-206 0"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M142.6,365.1m-93.9,0a93.9,93.9 0,1 1,187.8 0a93.9,93.9 0,1 1,-187.8 0"/>
+    <path android:fillColor="#80868b" android:pathData="M525.6,297.8l-61.4,0l23.5,-23.4l61.4,0z" android:strokeColor="#80868b" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#e8eaed" android:pathData="M551.6,365.9l-61.5,0l-25.9,-68.1l61.4,0z" android:strokeColor="#80868b" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#80868b" android:pathData="M524.9,364.2h-14.4v-4.6c0,-2.1 1.6,-3.7 3.7,-3.7h6.9c2.1,0 3.7,1.6 3.7,3.7L524.9,364.2L524.9,364.2z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M566.5,345m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0" android:strokeColor="#80868b" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M566.5,352L566.5,365.9" android:strokeColor="#80868b" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M530.4,365.9h61.4v94.5h-61.4z" android:strokeColor="#bdc1c6" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#bdc1c6" android:pathData="M487.7,250.2l-30.4,0l-26.7,26.7l0,183.4l99.8,0l0,-94.4l-40.3,0l-25.9,-68.1l23.5,-23.4z" android:strokeColor="#bdc1c6" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M487.7,250.2h61.4v24.2h-61.4z" android:strokeColor="#bdc1c6" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M504,330.2c2.2,5.7 -0.7,10.4 -6.4,10.4s-12.3,-4.7 -14.5,-10.4c-2.2,-5.7 0.7,-10.4 6.4,-10.4C495.4,319.8 501.8,324.5 504,330.2z"/>
+    <path android:fillColor="#80868b" android:pathData="M498.2,330.2c0.9,2.6 -0.4,4.6 -2.8,4.6c-2.6,0 -5.4,-2.1 -6.3,-4.6c-0.9,-2.6 0.4,-4.6 2.8,-4.6S497.2,327.6 498.2,330.2z"/>
+    <path android:fillColor="#ffffff" android:pathData="M531.5,330.2c2.2,5.7 -0.7,10.4 -6.4,10.4s-12.3,-4.7 -14.5,-10.4c-2.2,-5.7 0.7,-10.4 6.4,-10.4C522.8,319.8 529.2,324.5 531.5,330.2z"/>
+    <path android:fillColor="#80868b" android:pathData="M525.6,330.2c0.9,2.6 -0.4,4.6 -2.8,4.6c-2.6,0 -5.4,-2.1 -6.3,-4.6c-0.9,-2.6 0.4,-4.6 2.8,-4.6C521.8,325.6 524.7,327.6 525.6,330.2z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M255.1,341.4m-93.9,0a93.9,93.9 0,1 1,187.8 0a93.9,93.9 0,1 1,-187.8 0"/>
+    <path android:fillColor="#e8eaed" android:pathData="M140.2,397.7m-56.6,0a56.6,56.6 0,1 1,113.2 0a56.6,56.6 0,1 1,-113.2 0"/>
+    <path android:fillColor="#e8eaed" android:pathData="M602.87,460.27a93.9,93.9 0,1 0,132.79 -132.79a93.9,93.9 0,1 0,-132.79 132.79z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M782,341.4m-93.9,0a93.9,93.9 0,1 1,187.8 0a93.9,93.9 0,1 1,-187.8 0"/>
+    <path android:fillColor="#e8eaed" android:pathData="M924.4,388.3m-71.5,0a71.5,71.5 0,1 1,143 0a71.5,71.5 0,1 1,-143 0"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M574,0.1H469c-24.3,16.7 -40.3,44.8 -40.3,76.5c0,51.3 41.5,92.8 92.8,92.8s92.8,-41.5 92.8,-92.8C614.3,44.8 598.3,16.8 574,0.1z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M345.6,499.9h58.9c37.4,-12.4 64.5,-47.6 64.5,-89.2c0,-51.9 -42,-93.9 -93.9,-93.9c-51.9,0 -93.9,42 -93.9,93.9C281.2,452.3 308.2,487.5 345.6,499.9z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M1023.9,499.9c0,-0.4 0,-0.9 0,-1.3c0,-53.1 -42.9,-96 -96,-96H641.5l-29.2,97.3H1023.9z"/>
+    <path android:fillColor="#e8eaed" android:pathData="M497.3,499.9c0,-0.4 0,-0.9 0,-1.3c0,-53.1 -42.9,-96 -96,-96H96c-53.1,0 -96,42.9 -96,96c0,0.4 0,0.9 0,1.3H497.3z"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M520.4,446.8m-47.7,0a47.7,47.7 0,1 1,95.4 0a47.7,47.7 0,1 1,-95.4 0"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M492.1,499.9c5.1,-10.3 7.9,-21.9 7.9,-34.2c0,-42.9 -34.8,-77.7 -77.7,-77.7s-77.7,34.8 -77.7,77.7c0,12.3 2.9,23.9 7.9,34.2H492.1z"/>
+    <path android:fillColor="#f8f9fa" android:pathData="M656.7,499.9c-8.6,-32.1 -37.9,-55.7 -72.6,-55.7H344.9c-34.8,0 -64,23.6 -72.6,55.7H656.7z"/>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/fragment_games_ui_layout.xml b/play-services-core/src/main/res/layout/fragment_games_ui_layout.xml
new file mode 100644
index 0000000000..5e2326a997
--- /dev/null
+++ b/play-services-core/src/main/res/layout/fragment_games_ui_layout.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_height="wrap_content">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_alignParentStart="true"
+            android:contentDescription="@null"
+            android:id="@+id/games_ui_player_logo"
+            android:src="@drawable/ic_google_logo" />
+
+        <TextView
+            android:id="@+id/games_ui_title"
+            android:layout_width="wrap_content"
+            android:textSize="18sp"
+            android:fontFamily="sans-serif-medium"
+            android:layout_centerInParent="true"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/games_ui_cancel"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_alignParentEnd="true"
+            android:contentDescription="@android:string/cancel"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_close_btn" />
+
+        <ImageView
+            android:id="@+id/games_ui_refresh"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_toStartOf="@id/games_ui_cancel"
+            android:layout_marginEnd="12dp"
+            android:scaleType="centerInside"
+            android:visibility="gone"
+            android:src="@drawable/ic_refresh" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:paddingHorizontal="12dp"
+        android:layout_height="wrap_content">
+
+        <ViewStub
+            android:id="@+id/games_ui_achievements_vb"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout="@layout/item_achievements_counter"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_below="@id/games_ui_achievements_vb"
+            android:id="@+id/games_ui_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:id="@+id/games_ui_loading"
+            android:layout_centerInParent="true"
+            android:layout_height="match_parent">
+
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"/>
+
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/games_ui_error_tips"
+            android:textColor="@android:color/black"
+            android:textSize="20sp"
+            android:gravity="center"
+            android:visibility="gone"
+            android:layout_alignBottom="@id/games_ui_loading"
+            android:layout_alignTop="@id/games_ui_loading"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/games_ui_action_button"
+            style="@style/Widget.Design.FloatingActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="12dp"
+            android:visibility="gone"
+            app:backgroundTint="#ffffffff"
+            android:src="@drawable/ic_add"
+            app:tint="#027e5a" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_achievement_data_layout.xml b/play-services-core/src/main/res/layout/item_achievement_data_layout.xml
new file mode 100644
index 0000000000..a1de563da7
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_achievement_data_layout.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/achievement_logo"
+        android:layout_marginTop="12dp"
+        android:layout_width="56dp"
+        android:layout_height="56dp" />
+
+    <TextView
+        android:id="@+id/achievement_title"
+        android:layout_alignTop="@id/achievement_logo"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/achievement_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/achievement_content"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/achievement_logo"
+        android:layout_alignBottom="@id/achievement_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="10sp"
+        android:textColor="@android:color/darker_gray" />
+
+    <TextView
+        android:id="@+id/achievement_desc"
+        android:layout_marginStart="12dp"
+        android:layout_below="@id/achievement_title"
+        android:layout_above="@id/achievement_content"
+        android:layout_toEndOf="@id/achievement_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:textColor="#808080" />
+
+    <View
+        android:layout_marginTop="12dp"
+        android:layout_alignStart="@id/achievement_title"
+        android:layout_below="@id/achievement_logo"
+        android:layout_width="match_parent"
+        android:background="#E6E6E6"
+        android:layout_height="1dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_achievement_header_layout.xml b/play-services-core/src/main/res/layout/item_achievement_header_layout.xml
new file mode 100644
index 0000000000..b3e046eef4
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_achievement_header_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:paddingVertical="10dp"
+    android:background="@android:color/white"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/achievements_header_title"
+        android:textSize="12sp"
+        android:textColor="#808080"
+        android:layout_width="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_achievements_counter.xml b/play-services-core/src/main/res/layout/item_achievements_counter.xml
new file mode 100644
index 0000000000..a3cbf2dd4d
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_achievements_counter.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/achievements_counter_llt"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    android:paddingVertical="10dp"
+    android:gravity="center"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="55dp"
+        android:src="@drawable/ic_achievement_logo"
+        android:layout_height="55dp"/>
+
+    <TextView
+        android:id="@+id/achievements_counter_text"
+        android:layout_marginStart="16dp"
+        android:textSize="22sp"
+        android:typeface="sans"
+        android:textColor="@android:color/black"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_leaderboard_data_layout.xml b/play-services-core/src/main/res/layout/item_leaderboard_data_layout.xml
new file mode 100644
index 0000000000..358c28373c
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_leaderboard_data_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:layout_width="match_parent"
+    android:paddingStart="18dp"
+    android:layout_height="wrap_content">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/leaderboard_logo"
+        android:layout_marginTop="12dp"
+        android:layout_width="42dp"
+        android:layout_height="42dp" />
+
+    <TextView
+        android:id="@+id/leaderboard_title"
+        android:layout_alignTop="@id/leaderboard_logo"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/leaderboard_logo"
+        android:layout_alignBottom="@id/leaderboard_logo"
+        android:gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp" />
+
+    <View
+        android:id="@+id/leaderboard_line"
+        android:layout_marginTop="12dp"
+        android:layout_alignStart="@id/leaderboard_title"
+        android:layout_below="@id/leaderboard_logo"
+        android:layout_width="match_parent"
+        android:background="#E6E6E6"
+        android:layout_height="1dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_leaderboard_score_data_layout.xml b/play-services-core/src/main/res/layout/item_leaderboard_score_data_layout.xml
new file mode 100644
index 0000000000..dcef85327d
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_leaderboard_score_data_layout.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:layout_width="match_parent"
+    android:paddingStart="18dp"
+    android:layout_height="wrap_content">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/leaderboard_player_logo"
+        android:layout_marginTop="12dp"
+        android:layout_width="42dp"
+        android:layout_height="42dp" />
+
+    <TextView
+        android:layout_marginTop="2dp"
+        android:id="@+id/leaderboard_player_name"
+        android:layout_alignTop="@id/leaderboard_player_logo"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/leaderboard_player_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="13sp" />
+
+    <TextView
+        android:id="@+id/leaderboard_player_score"
+        android:layout_below="@id/leaderboard_player_name"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/leaderboard_player_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="11sp" />
+
+    <TextView
+        android:id="@+id/leaderboard_player_rank"
+        android:layout_alignTop="@id/leaderboard_player_logo"
+        android:layout_alignBottom="@id/leaderboard_player_logo"
+        android:layout_alignParentEnd="true"
+        android:gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="11sp" />
+
+    <View
+        android:id="@+id/leaderboard_score_line"
+        android:layout_marginTop="12dp"
+        android:layout_alignStart="@id/leaderboard_player_name"
+        android:layout_below="@id/leaderboard_player_logo"
+        android:layout_width="match_parent"
+        android:background="#E6E6E6"
+        android:layout_height="1dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_leaderboard_score_header_layout.xml b/play-services-core/src/main/res/layout/item_leaderboard_score_header_layout.xml
new file mode 100644
index 0000000000..f9a830de57
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_leaderboard_score_header_layout.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingVertical="10dp"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:background="@android:color/white"
+    android:layout_height="wrap_content">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:contentDescription="@null"
+        android:id="@+id/leaderboard_header_logo" />
+
+    <TextView
+        android:layout_marginTop="10dp"
+        android:id="@+id/leaderboard_header_title"
+        android:layout_width="wrap_content"
+        android:textSize="18sp"
+        android:fontFamily="sans-serif-medium"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/item_snapshot_data_layout.xml b/play-services-core/src/main/res/layout/item_snapshot_data_layout.xml
new file mode 100644
index 0000000000..b96cbe9661
--- /dev/null
+++ b/play-services-core/src/main/res/layout/item_snapshot_data_layout.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:paddingVertical="10dp"
+    android:layout_height="wrap_content">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/snapshot_card"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintWidth_percent="0.65"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:cardCornerRadius="8dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/snapshot_image"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:scaleType="centerCrop"
+                app:layout_constraintDimensionRatio="H,1024:500"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/snapshot_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:textSize="12sp"
+                android:textColor="@android:color/darker_gray"
+                app:layout_constraintTop_toBottomOf="@id/snapshot_image"
+                app:layout_constraintStart_toStartOf="@id/snapshot_image"/>
+
+            <TextView
+                android:id="@+id/snapshot_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:textSize="14sp"
+                android:textColor="@android:color/black"
+                app:layout_constraintTop_toBottomOf="@id/snapshot_time"
+                app:layout_constraintStart_toStartOf="@id/snapshot_image"/>
+
+            <TextView
+                android:id="@+id/snapshot_choose_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:paddingVertical="4dp"
+                android:paddingHorizontal="20dp"
+                android:text="@string/games_snapshot_choose_btn_text"
+                android:textSize="13sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/ic_snapshot_choose_fill"
+                app:layout_constraintTop_toBottomOf="@id/snapshot_desc"
+                app:layout_constraintEnd_toEndOf="@id/snapshot_image"/>
+
+            <TextView
+                android:id="@+id/snapshot_delete_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:paddingVertical="4dp"
+                android:paddingHorizontal="20dp"
+                android:text="@string/games_snapshot_delete_btn_text"
+                android:textSize="13sp"
+                android:textColor="@android:color/holo_green_dark"
+                android:background="@drawable/ic_snapshot_choose_stroke"
+                app:layout_constraintTop_toBottomOf="@id/snapshot_desc"
+                app:layout_constraintEnd_toStartOf="@id/snapshot_choose_btn"/>
+
+            <View
+                app:layout_constraintTop_toBottomOf="@id/snapshot_choose_btn"
+                app:layout_constraintEnd_toEndOf="@id/snapshot_image"
+                app:layout_constraintStart_toStartOf="@id/snapshot_image"
+                android:layout_width="0dp"
+                android:layout_height="10dp"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+
+    <View
+        app:layout_constraintTop_toBottomOf="@id/snapshot_card"
+        app:layout_constraintEnd_toEndOf="@id/snapshot_card"
+        app:layout_constraintStart_toStartOf="@id/snapshot_card"
+        android:layout_width="0dp"
+        android:layout_height="2dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values-zh-rCN/strings.xml b/play-services-core/src/main/res/values-zh-rCN/strings.xml
index 036eb303d8..d2e77a490e 100644
--- a/play-services-core/src/main/res/values-zh-rCN/strings.xml
+++ b/play-services-core/src/main/res/values-zh-rCN/strings.xml
@@ -226,6 +226,24 @@ microG GmsCore 内置一套自由的 SafetyNet 实现，但是官方服务器要
     <string name="service_name_snet">Google SafetyNet</string>
     <string name="pref_safetynet_recent_recaptcha_summary">ReCaptcha: %s</string>
     <string name="pref_safetynet_recent_recaptcha_enterprise_summary">ReCaptcha Enterprise: %s</string>
+    <string name="games_achievement_list_title">成就</string>
+    <string name="games_achievements_empty_text">此游戏没有成就</string>
+    <string name="games_api_access_denied">此设备上没有可访问 Games API 的账号</string>
+    <string name="games_achievement_locked_content_description">未解锁</string>
+    <string name="games_achievement_unlocked_content_description">已解锁</string>
+    <string name="games_achievement_extra_text">%1$s XP</string>
+    <string name="games_leaderboard_empty_text">此游戏没有排行榜</string>
+    <string name="games_leaderboard_score_empty_text">不可思议！居然还没有人公开创下这个游戏的高分记录！</string>
+    <string name="games_leaderboard_list_title">排行榜</string>
+    <string name="games_leaderboards_score_label">得分：%1$s</string>
+    <string name="games_snapshot_empty_text">目前尚未保存任何游戏存档</string>
+    <string name="games_snapshot_choose_btn_text">选择</string>
+    <string name="games_snapshot_delete_btn_text">删除</string>
+    <string name="games_delete_snapshot_dialog_title">删除游戏存档</string>
+    <string name="games_delete_snapshot_dialog_message">确定要删除这个游戏存档吗?</string>
+    <string name="games_delete_snapshot_dialog_cancel">取消</string>
+    <string name="games_delete_snapshot_dialog_ok">确定</string>
+    <string name="games_delete_snapshot_error">删除失败，请稍后重试</string>
     <string name="credentials_assisted_cancel">取消</string>
     <string name="credentials_assisted_continue">继续</string>
     <string name="credentials_assisted_confirmation_header">正在登录</string>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index 8397fc68a0..1f5731a45f 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -315,4 +315,23 @@ Please set up a password, PIN, or pattern lock screen."</string>
     <string name="limited_services_dialog_information">You are using the microG Limited Services. Unlike the usual microG Services, this flavor only works with apps using microG libraries, not those on Google Play. This means that most applications will ignore these services.</string>
     <string name="limited_services_dialog_information_ack">I understand</string>
 
+    <string name="games_achievement_list_title">Achievements</string>
+    <string name="games_achievements_empty_text">No achievements for this game</string>
+    <string name="games_api_access_denied">No account on this device can access the Games APIs</string>
+    <string name="games_achievement_locked_content_description">locked</string>
+    <string name="games_achievement_unlocked_content_description">unlocked</string>
+    <string name="games_achievement_extra_text">%1$s XP</string>
+    <string name="games_leaderboard_empty_text">No leaderboards for this game</string>
+    <string name="games_leaderboard_score_empty_text">Unbelievable! There are no public high scores for this game.</string>
+    <string name="games_leaderboard_list_title">Rankings</string>
+    <string name="games_leaderboards_score_label">Score：%1$s</string>
+    <string name="games_snapshot_empty_text">No game saves have been saved yet</string>
+    <string name="games_snapshot_choose_btn_text">select</string>
+    <string name="games_snapshot_delete_btn_text">delete</string>
+    <string name="games_delete_snapshot_dialog_title">Delete saved game</string>
+    <string name="games_delete_snapshot_dialog_message">Are you sure you want to delete this saved game?</string>
+    <string name="games_delete_snapshot_dialog_cancel">Cancel</string>
+    <string name="games_delete_snapshot_dialog_ok">OK</string>
+    <string name="games_delete_snapshot_error">Deletion failed, please try again later</string>
+
 </resources>
diff --git a/play-services-drive/build.gradle b/play-services-drive/build.gradle
index 3c42374551..977786859b 100644
--- a/play-services-drive/build.gradle
+++ b/play-services-drive/build.gradle
@@ -39,4 +39,5 @@ dependencies {
     api project(':play-services-base')
     api project(':play-services-basement')
     api project(':play-services-tasks')
+    annotationProcessor project(':safe-parcel-processor')
 }
diff --git a/play-services-drive/src/main/aidl/com/google/android/gms/drive/Contents.aidl b/play-services-drive/src/main/aidl/com/google/android/gms/drive/Contents.aidl
new file mode 100644
index 0000000000..695b298ba9
--- /dev/null
+++ b/play-services-drive/src/main/aidl/com/google/android/gms/drive/Contents.aidl
@@ -0,0 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.drive;
+
+parcelable Contents;
diff --git a/play-services-drive/src/main/aidl/com/google/android/gms/drive/DriveId.aidl b/play-services-drive/src/main/aidl/com/google/android/gms/drive/DriveId.aidl
new file mode 100644
index 0000000000..dca5be51d2
--- /dev/null
+++ b/play-services-drive/src/main/aidl/com/google/android/gms/drive/DriveId.aidl
@@ -0,0 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.drive;
+
+parcelable DriveId;
diff --git a/play-services-drive/src/main/java/com/google/android/gms/drive/Contents.java b/play-services-drive/src/main/java/com/google/android/gms/drive/Contents.java
new file mode 100644
index 0000000000..01e5d95f5e
--- /dev/null
+++ b/play-services-drive/src/main/java/com/google/android/gms/drive/Contents.java
@@ -0,0 +1,81 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.drive;
+
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+@Hide
+@SafeParcelable.Class
+public class Contents extends AbstractSafeParcelable {
+
+    @Field(value = 2, getterName = "getParcelFileDescriptor")
+    private final ParcelFileDescriptor fileDescriptor;
+    @Field(value = 3, getterName = "getRequestId")
+    private final int requestId;
+    @Field(value = 4, getterName = "getMode")
+    private final int mode;
+    @Field(value = 5, getterName = "getDriveId")
+    private final DriveId driveId;
+    @Field(value = 7)
+    final boolean unknown7;
+    @Field(value = 8)
+    @Nullable
+    final String unknown8;
+
+    @Constructor
+    public Contents(@Param(value = 2) ParcelFileDescriptor fileDescriptor, @Param(value = 3) int requestId, @Param(value = 4) int mode, @Param(value = 5) DriveId driveId, @Param(value = 7) boolean unknown7, @Param(value = 8) @Nullable String unknown8) {
+        this.fileDescriptor = fileDescriptor;
+        this.requestId = requestId;
+        this.mode = mode;
+        this.driveId = driveId;
+        this.unknown7 = unknown7;
+        this.unknown8 = unknown8;
+    }
+
+    public ParcelFileDescriptor getParcelFileDescriptor() {
+        return this.fileDescriptor;
+    }
+
+    public final DriveId getDriveId() {
+        return this.driveId;
+    }
+
+    public final FileInputStream getInputStream() {
+        return new FileInputStream(this.fileDescriptor.getFileDescriptor());
+    }
+
+    public final OutputStream getOutputStream() {
+        return new FileOutputStream(this.fileDescriptor.getFileDescriptor());
+    }
+
+    public final int getMode() {
+        return this.mode;
+    }
+
+    public final int getRequestId() {
+        return this.requestId;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<Contents> CREATOR = findCreator(Contents.class);
+}
diff --git a/play-services-drive/src/main/java/com/google/android/gms/drive/DriveId.java b/play-services-drive/src/main/java/com/google/android/gms/drive/DriveId.java
new file mode 100644
index 0000000000..668ea095eb
--- /dev/null
+++ b/play-services-drive/src/main/java/com/google/android/gms/drive/DriveId.java
@@ -0,0 +1,120 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.drive;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+
+/**
+ * A canonical identifier for a Drive resource. The identifier can be converted to a String representation for storage using {@link #encodeToString()}
+ * and then later converted back to the ID representation using {@link #decodeFromString(String)}. {@link #equals(Object)} can be used to see if two
+ * different identifiers refer to the same resource.
+ */
+@SafeParcelable.Class
+public class DriveId extends AbstractSafeParcelable {
+    /**
+     * An unknown resource type, meaning the {@link DriveId} corresponds to either a file or a folder.
+     */
+    public static final int RESOURCE_TYPE_UNKNOWN = -1;
+    /**
+     * A file resource type, meaning the {@link DriveId} corresponds to a file.
+     */
+    public static final int RESOURCE_TYPE_FILE = 0;
+    /**
+     * A folder resource type, meaning the {@link DriveId} corresponds to a folder.
+     */
+    public static final int RESOURCE_TYPE_FOLDER = 1;
+
+    @Field(value = 2, getterName = "getResourceId")
+    @Nullable
+    private final String resourceId;
+    @Field(value = 3)
+    private final long unknown3;
+    @Field(value = 4)
+    private final long unknown4;
+    @Field(value = 5, getterName = "getResourceType", defaultValue = "com.google.android.gms.drive.DriveId.RESOURCE_TYPE_UNKNOWN")
+    private final int resourceType;
+
+    @Constructor
+    @Hide
+    public DriveId(@Param(value = 2) @Nullable String resourceId, @Param(value = 3) long unknown3, @Param(value = 4) long unknown4, @Param(value = 5) int resourceType) {
+        this.resourceId = resourceId;
+        this.unknown3 = unknown3;
+        this.unknown4 = unknown4;
+        this.resourceType = resourceType;
+    }
+
+    /**
+     * Returns a String representation of this {@link DriveId} that can be safely persisted, and from which an equivalent {@link DriveId} can later be
+     * reconstructed using {@link #decodeFromString(String)}.
+     * <p>
+     * The String representation is not guaranteed to be stable over time for a given resource so should never be compared for equality. Always
+     * use {@link #decodeFromString(String)} and then {@link #equals(Object)} to compare two identifiers to see if they refer to the same resource.
+     * Otherwise, {@link #toInvariantString()} is stable and can be safely used for {@link DriveId} comparison.
+     */
+    public final String encodeToString() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the remote Drive resource id associated with the resource. May be {@code null} for local resources that have not yet been synchronized to
+     * the Drive service.
+     */
+    @Nullable
+    public String getResourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Returns the resource type corresponding to this {@link DriveId}. Possible values are {@link #RESOURCE_TYPE_FILE}, {@link #RESOURCE_TYPE_FOLDER} or
+     * {@link #RESOURCE_TYPE_UNKNOWN}.
+     * <p>
+     * The {@link #RESOURCE_TYPE_UNKNOWN} will only be returned if the {@link DriveId} instance has been created using {@link #decodeFromString(String)}, with an
+     * old string that was generated and persisted by the client with an old version of Google Play Services. If the client is not encoding, persisting
+     * and decoding {@link DriveId}s, this method will always return either {@link #RESOURCE_TYPE_FILE} or {@link #RESOURCE_TYPE_FOLDER}.
+     */
+    public int getResourceType() {
+        return this.resourceType;
+    }
+
+    /**
+     * Returns an invariant string for this {@link DriveId}. This is stable over time, so for a given {@link DriveId}, this value will always remain the same, and is
+     * guaranteed to be unique for each {@link DriveId}. The client can use it directly to compare equality of {@link DriveId}s, since two {@link DriveId}s are equal
+     * if and only if its invariant string is equal.
+     * <p>
+     * Note: This value cannot be used to {@link #decodeFromString(String)}, since it's not meant to encode a {@link DriveId}, but can be useful for client-side
+     * string-based {@link DriveId} comparison, or for logging purposes.
+     */
+    public final String toInvariantString() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Decodes the result of {@link #encodeToString()} back into a {@link DriveId}.
+     * @throws IllegalArgumentException if the argument is not a valid result of {@link #encodeToString()}.
+     */
+    public static DriveId decodeFromString (String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<DriveId> CREATOR = findCreator(DriveId.class);
+}
+
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
index 08b60e8352..5e317c1f0a 100644
--- a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
@@ -2,6 +2,7 @@ package com.google.android.gms.games.internal;
 
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.common.data.DataHolder;
+import com.google.android.gms.drive.Contents;
 import com.google.android.gms.games.multiplayer.realtime.RealTimeMessage;
 
 interface IGamesCallbacks {
@@ -45,5 +46,7 @@ interface IGamesCallbacks {
   /* @deprecated */ void onGameMuteStatusLoaded(in DataHolder data) = 5037;
   /* @deprecated */ void onContactSettingsLoaded(in DataHolder data) = 5038;
   /* @deprecated */ void onContactSettingsUpdated(int statusCode) = 5039;
+  void onResolveSnapshotHead(in DataHolder data, in Contents contents) = 12003;
+  void commitSnapshotResult(in DataHolder data) = 12004;
   void onServerAuthCode(in Status status, String serverAuthCode) = 25002;
 }
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
index 64d3579ef8..f5e4b88e2d 100644
--- a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
@@ -5,10 +5,11 @@ import android.os.Bundle;
 import android.os.IBinder;
 
 import com.google.android.gms.common.data.DataHolder;
-//import com.google.android.gms.drive.Contents;
+import com.google.android.gms.drive.Contents;
 import com.google.android.gms.games.PlayerEntity;
 import com.google.android.gms.games.internal.IGamesCallbacks;
 import com.google.android.gms.games.internal.IGamesClient;
+import com.google.android.gms.games.snapshot.SnapshotMetadataChangeEntity;
 
 interface IGamesService {
     void clientDisconnecting(long clientId) = 5000;
@@ -91,21 +92,22 @@ interface IGamesService {
     Intent getAllLeaderboardsIntent() = 9002;
     Intent getAchievementsIntent() = 9004;
     Intent getPlayerSearchIntent() = 9009;
-
-//    void getSelectSnapshotIntent(String str, boolean z, boolean z2, int i) = 12001;
-//    void loadSnapshotsResult(IGamesCallbacks callbacks, boolean forceReload) = 12002;
+    Intent getSelectSnapshotIntent(String title, boolean allowAddButton, boolean allowDelete, int maxSnapshots) = 12000;
+    void loadSnapshots(IGamesCallbacks callbacks, boolean forceReload) = 12001;
+    void commitSnapshot(IGamesCallbacks callbacks, String str, in SnapshotMetadataChangeEntity change, in Contents contents) = 12006;
     void loadEvents(IGamesCallbacks callbacks, boolean forceReload) = 12015;
     void incrementEvent(String eventId, int incrementAmount) = 12016;
-//    void discardAndCloseSnapshot(in Contents contents) = 12018;
+    void discardAndCloseSnapshot(in Contents contents) = 12018;
     void loadEventsById(IGamesCallbacks callbacks, boolean forceReload, in String[] eventsIds) = 12030;
 //    void resolveSnapshotConflict(IGamesCallbacks callbacks, String conflictId, String snapshotId, in SnapshotMetadataChangeEntity metadata, in Contents contents) = 12032;
     int getMaxDataSize() = 12034;
     int getMaxCoverImageSize() = 12035;
-
+    void resolveSnapshotHead(IGamesCallbacks callbacks, String saveName, int i) = 15000;
     void registerEventClient(IGamesClient callback, long l) = 15500;
     Intent getCompareProfileIntentForPlayer(in PlayerEntity player) = 15502;
 
     void loadPlayerStats(IGamesCallbacks callbacks, boolean forceReload) = 17000;
+    Intent getLeaderboardsScoresIntent(String leaderboardId, int timeSpan, int collection) = 18000;
 
     Account getCurrentAccount() = 21000;
 
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.aidl
new file mode 100644
index 0000000000..c81f49016e
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.aidl
@@ -0,0 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.snapshot;
+
+parcelable SnapshotMetadataChangeEntity;
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.aidl
new file mode 100644
index 0000000000..917ed9915f
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.aidl
@@ -0,0 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.snapshot;
+
+parcelable SnapshotMetadataEntity;
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/Game.java b/play-services-games/src/main/java/com/google/android/gms/games/Game.java
new file mode 100644
index 0000000000..e68bcf5d87
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/Game.java
@@ -0,0 +1,169 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games;
+
+import android.database.CharArrayBuffer;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.data.Freezable;
+import com.google.android.gms.common.images.ImageManager;
+import org.microg.gms.common.Hide;
+
+/**
+ * Data interface for retrieving game information.
+ */
+public interface Game extends Freezable<Game> {
+    /**
+     * Indicates whether or not this game supports snapshots.
+     *
+     * @return Whether or not this game supports snapshots.
+     */
+    boolean areSnapshotsEnabled();
+
+    /**
+     * Retrieves the number of achievements registered for this game.
+     *
+     * @return The number of achievements registered for this game.
+     */
+    int getAchievementTotalCount();
+
+    /**
+     * Retrieves the application ID for this game.
+     *
+     * @return The application ID for this game.
+     */
+    @NonNull
+    String getApplicationId();
+
+    /**
+     * Retrieves the description of this game.
+     *
+     * @return The description of this game.
+     */
+    @NonNull
+    String getDescription();
+
+    /**
+     * Loads the description string into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    void getDescription(@NonNull CharArrayBuffer dataOut);
+
+    /**
+     * Retrieves the name of the developer of this game.
+     *
+     * @return The name of the developer of this game.
+     */
+    @NonNull
+    String getDeveloperName();
+
+    /**
+     * Loads the developer name into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    void getDeveloperName(@NonNull CharArrayBuffer dataOut);
+
+    /**
+     * Retrieves the display name for this game.
+     *
+     * @return The display name for this game.
+     */
+    @NonNull
+    String getDisplayName();
+
+    /**
+     * Loads the display name string into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    void getDisplayName(@NonNull CharArrayBuffer dataOut);
+
+    /**
+     * Retrieves an image URI that can be used to load the game's featured (banner) image from Google Play. Returns null if game has no featured image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's featured image, or null if the game has no featured image.
+     */
+    @Nullable
+    Uri getFeaturedImageUri();
+
+    @Hide
+    @Deprecated
+    String getFeaturedImageUrl();
+
+    /**
+     * Retrieves an image URI that can be used to load the game's hi-res image. Returns null if game has no hi-res image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's hi-res image, or null if the game has no hi-res image.
+     */
+    @Nullable
+    Uri getHiResImageUri();
+
+    @Hide
+    @Deprecated
+    String getHiResImageUrl();
+
+    /**
+     * Retrieves an image URI that can be used to load the game's icon. Returns null if game has no icon.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's icon, or null if the game has no icon.
+     */
+    @Nullable
+    Uri getIconImageUri();
+
+    @Hide
+    @Deprecated
+    String getIconImageUrl();
+
+    /**
+     * Gets the number of leaderboards registered for this game.
+     *
+     * @return The number of leaderboards registered for this game.
+     */
+    int getLeaderboardCount();
+
+    /**
+     * Retrieves the primary category of the game - this may be null.
+     *
+     * @return The primary category of the game.
+     */
+    @Nullable
+    String getPrimaryCategory();
+
+    /**
+     * Retrieves the secondary category of the game - this may be null.
+     *
+     * @return The secondary category of the game, or null if not provided.
+     */
+    @Nullable
+    String getSecondaryCategory();
+
+    /**
+     * Retrieves the theme color for this game. The theme color is used to configure the appearance of Play Games UIs.
+     *
+     * @return The color to use as an RGB hex triplet, e.g. "E0E0E0"
+     */
+    @NonNull
+    String getThemeColor();
+
+    /**
+     * Indicates whether or not this game is marked as supporting gamepads.
+     *
+     * @return Whether or not this game declares gamepad support.
+     */
+    boolean hasGamepadSupport();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/GameColumns.java b/play-services-games/src/main/java/com/google/android/gms/games/GameColumns.java
new file mode 100644
index 0000000000..2c40d736da
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/GameColumns.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.games;
+
+import org.microg.gms.common.Hide;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Hide
+public class GameColumns {
+    public static final String EXTERNAL_GAME_ID = "external_game_id";
+    public static final String DISPLAY_NAME = "display_name";
+    public static final String PRIMARY_CATEGORY = "primary_category";
+    public static final String SECONDARY_CATEGORY = "secondary_category";
+    public static final String GAME_DESCRIPTION = "game_description";
+    public static final String DEVELOPER_NAME = "developer_name";
+    public static final String GAME_ICON_IMAGE_URI = "game_icon_image_uri";
+    public static final String GAME_ICON_IMAGE_URL = "game_icon_image_url";
+    public static final String GAME_HI_RES_IMAGE_URI = "game_hi_res_image_uri";
+    public static final String GAME_HI_RES_IMAGE_URL = "game_hi_res_image_url";
+    public static final String FEATURED_IMAGE_URI = "featured_image_uri";
+    public static final String FEATURED_IMAGE_URL = "featured_image_url";
+    public static final String PLAY_ENABLED_GAME = "play_enabled_game";
+    public static final String MUTED = "muted";
+    public static final String IDENTITY_SHARING_CONFIRMED = "identity_sharing_confirmed";
+    public static final String INSTALLED = "installed";
+    public static final String PACKAGE_NAME = "package_name";
+    public static final String ACHIEVEMENT_TOTAL_COUNT = "achievement_total_count";
+    public static final String LEADERBOARD_COUNT = "leaderboard_count";
+    public static final String REAL_TIME_SUPPORT = "real_time_support";
+    public static final String TURN_BASED_SUPPORT = "turn_based_support";
+    public static final String SNAPSHOTS_ENABLED = "snapshots_enabled";
+    public static final String THEME_COLOR = "theme_color";
+    public static final String GAMEPAD_SUPPORT = "gamepad_support";
+
+    public static final List<String> CURRENT_GAME_COLUMNS = Collections.unmodifiableList(Arrays.asList(
+            EXTERNAL_GAME_ID, DISPLAY_NAME, PRIMARY_CATEGORY, SECONDARY_CATEGORY, GAME_DESCRIPTION, DEVELOPER_NAME, GAME_ICON_IMAGE_URI, GAME_ICON_IMAGE_URL,
+            GAME_HI_RES_IMAGE_URI, GAME_HI_RES_IMAGE_URL, FEATURED_IMAGE_URI, FEATURED_IMAGE_URL, PLAY_ENABLED_GAME, MUTED, IDENTITY_SHARING_CONFIRMED, INSTALLED,
+            PACKAGE_NAME, ACHIEVEMENT_TOTAL_COUNT, LEADERBOARD_COUNT, REAL_TIME_SUPPORT, TURN_BASED_SUPPORT, SNAPSHOTS_ENABLED, THEME_COLOR, GAMEPAD_SUPPORT
+    ));
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/GameEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/GameEntity.java
new file mode 100644
index 0000000000..b1b7a86bd9
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/GameEntity.java
@@ -0,0 +1,382 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games;
+
+import android.database.CharArrayBuffer;
+import android.net.Uri;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.images.ImageManager;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+
+/**
+ * Data object representing a set of Game data. This is immutable, and therefore safe to cache or store. Note, however, that the data it
+ * represents may grow stale.
+ * <p>
+ * This class exists solely to support parceling these objects and should not be used directly.
+ */
+@SafeParcelable.Class
+public class GameEntity extends AbstractSafeParcelable implements Game {
+    @Field(value = 1, getterName = "getApplicationId")
+    private final String applicationId;
+    @Field(value = 2, getterName = "getDisplayName")
+    private final String displayName;
+    @Field(value = 3, getterName = "getPrimaryCategory")
+    private final String primaryCategory;
+    @Field(value = 4, getterName = "getSecondaryCategory")
+    private final String secondaryCategory;
+    @Field(value = 5, getterName = "getDescription")
+    private final String description;
+    @Field(value = 6, getterName = "getDeveloperName")
+    private final String developerName;
+    @Field(value = 7, getterName = "getIconImageUri")
+    private final Uri iconImageUri;
+    @Field(value = 8, getterName = "getHiResImageUri")
+    private final Uri hiResImageUri;
+    @Field(value = 9, getterName = "getFeaturedImageUri")
+    private final Uri featuredImageUri;
+    @Field(value = 10, getterName = "isPlayEnabledGame")
+    private final boolean isPlayEnabledGame;
+    @Field(value = 11, getterName = "isInstanceInstalled")
+    private final boolean isInstanceInstalled;
+    @Field(value = 12, getterName = "getInstancePackageName")
+    private final String instancePackageName;
+    @Field(value = 13, getterName = "getGameplayAclStatus")
+    private final int gameplayAclStatus;
+    @Field(value = 14, getterName = "getAchievementTotalCount")
+    private final int achievementTotalCount;
+    @Field(value = 15, getterName = "getLeaderboardCount")
+    private final int leaderboardCount;
+    @Field(value = 16, getterName = "isRealTimeMultiplayerEnabled")
+    private final boolean isRealTimeMultiplayerEnabled;
+    @Field(value = 17, getterName = "isTurnBasedMultiplayerEnabled")
+    private final boolean isTurnBasedMultiplayerEnabled;
+    @Field(value = 18, getterName = "getIconImageUrl")
+    private final String iconImageUrl;
+    @Field(value = 19, getterName = "getHiResImageUrl")
+    private final String hiResImageUrl;
+    @Field(value = 20, getterName = "getFeaturedImageUrl")
+    private final String featuredImageUrl;
+    @Field(value = 21, getterName = "isMuted")
+    private final boolean isMuted;
+    @Field(value = 22, getterName = "isIdentitySharingConfirmed")
+    private final boolean isIdentitySharingConfirmed;
+    @Field(value = 23, getterName = "areSnapshotsEnabled")
+    private final boolean areSnapshotsEnabled;
+    @Field(value = 24, getterName = "getThemeColor")
+    private final String getThemeColor;
+    @Field(value = 25, getterName = "hasGamepadSupport")
+    private final boolean hasGamepadSupport;
+
+    @Hide
+    @Constructor
+    public GameEntity(@Param(value = 1) String applicationId, @Param(value = 2) String displayName, @Param(value = 3) String primaryCategory, @Param(value = 4) String secondaryCategory, @Param(value = 5) String description, @Param(value = 6) String developerName, @Param(value = 7) Uri iconImageUri, @Param(value = 8) Uri hiResImageUri, @Param(value = 9) Uri featuredImageUri, @Param(value = 10) boolean isPlayEnabledGame, @Param(value = 11) boolean isInstanceInstalled, @Param(value = 12) String instancePackageName, @Param(value = 13) int gameplayAclStatus, @Param(value = 14) int achievementTotalCount, @Param(value = 15) int leaderboardCount, @Param(value = 16) boolean isRealTimeMultiplayerEnabled, @Param(value = 17) boolean isTurnBasedMultiplayerEnabled, @Param(value = 18) String iconImageUrl, @Param(value = 19) String hiResImageUrl, @Param(value = 20) String featuredImageUrl, @Param(value = 21) boolean isMuted, @Param(value = 22) boolean isIdentitySharingConfirmed, @Param(value = 23) boolean areSnapshotsEnabled, @Param(value = 24) String getThemeColor, @Param(value = 25) boolean hasGamepadSupport) {
+        this.applicationId = applicationId;
+        this.displayName = displayName;
+        this.primaryCategory = primaryCategory;
+        this.secondaryCategory = secondaryCategory;
+        this.description = description;
+        this.developerName = developerName;
+        this.iconImageUri = iconImageUri;
+        this.iconImageUrl = iconImageUrl;
+        this.hiResImageUri = hiResImageUri;
+        this.hiResImageUrl = hiResImageUrl;
+        this.featuredImageUri = featuredImageUri;
+        this.featuredImageUrl = featuredImageUrl;
+        this.isPlayEnabledGame = isPlayEnabledGame;
+        this.isInstanceInstalled = isInstanceInstalled;
+        this.instancePackageName = instancePackageName;
+        this.gameplayAclStatus = gameplayAclStatus;
+        this.achievementTotalCount = achievementTotalCount;
+        this.leaderboardCount = leaderboardCount;
+        this.isRealTimeMultiplayerEnabled = isRealTimeMultiplayerEnabled;
+        this.isTurnBasedMultiplayerEnabled = isTurnBasedMultiplayerEnabled;
+        this.isMuted = isMuted;
+        this.isIdentitySharingConfirmed = isIdentitySharingConfirmed;
+        this.areSnapshotsEnabled = areSnapshotsEnabled;
+        this.getThemeColor = getThemeColor;
+        this.hasGamepadSupport = hasGamepadSupport;
+    }
+
+    /**
+     * Indicates whether or not this game supports snapshots.
+     *
+     * @return Whether or not this game supports snapshots.
+     */
+    @Override
+    public boolean areSnapshotsEnabled() {
+        return this.areSnapshotsEnabled;
+    }
+
+    @Override
+    public Game freeze() {
+        return this;
+    }
+
+    /**
+     * Retrieves the number of achievements registered for this game.
+     *
+     * @return The number of achievements registered for this game.
+     */
+    @Override
+    public int getAchievementTotalCount() {
+        return this.achievementTotalCount;
+    }
+
+    /**
+     * Retrieves the application ID for this game.
+     *
+     * @return The application ID for this game.
+     */
+    @Override
+    @NonNull
+    public String getApplicationId() {
+        return this.applicationId;
+    }
+
+    /**
+     * Retrieves the description of this game.
+     *
+     * @return The description of this game.
+     */
+    @Override
+    @NonNull
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * Loads the description string into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    @Override
+    public void getDescription(@NonNull CharArrayBuffer dataOut) {
+        copyStringToBuffer(this.description, dataOut);
+    }
+
+    /**
+     * Retrieves the name of the developer of this game.
+     *
+     * @return The name of the developer of this game.
+     */
+    @Override
+    @NonNull
+    public String getDeveloperName() {
+        return this.developerName;
+    }
+
+    /**
+     * Loads the developer name into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    @Override
+    public void getDeveloperName(@NonNull CharArrayBuffer dataOut) {
+        copyStringToBuffer(this.developerName, dataOut);
+    }
+
+    /**
+     * Retrieves the display name for this game.
+     *
+     * @return The display name for this game.
+     */
+    @Override
+    @NonNull
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Loads the display name string into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    @Override
+    public void getDisplayName(@NonNull CharArrayBuffer dataOut) {
+        copyStringToBuffer(this.displayName, dataOut);
+    }
+
+    /**
+     * Retrieves an image URI that can be used to load the game's featured (banner) image from Google Play. Returns null if game has no featured image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's featured image, or null if the game has no featured image.
+     */
+    @Override
+    @Nullable
+    public Uri getFeaturedImageUri() {
+        return this.featuredImageUri;
+    }
+
+    @Override
+    @Hide
+    @Deprecated
+    public String getFeaturedImageUrl() {
+        return this.featuredImageUrl;
+    }
+
+    /**
+     * Retrieves an image URI that can be used to load the game's hi-res image. Returns null if game has no hi-res image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's hi-res image, or null if the game has no hi-res image.
+     */
+    @Override
+    @Nullable
+    public Uri getHiResImageUri() {
+        return this.hiResImageUri;
+    }
+
+    @Override
+    @Hide
+    @Deprecated
+    public String getHiResImageUrl() {
+        return this.hiResImageUrl;
+    }
+
+    /**
+     * Retrieves an image URI that can be used to load the game's icon. Returns null if game has no icon.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load the game's icon, or null if the game has no icon.
+     */
+    @Override
+    public Uri getIconImageUri() {
+        return this.iconImageUri;
+    }
+
+    @Override
+    @Hide
+    @Deprecated
+    public String getIconImageUrl() {
+        return this.iconImageUrl;
+    }
+
+    /**
+     * Gets the number of leaderboards registered for this game.
+     *
+     * @return The number of leaderboards registered for this game.
+     */
+    @Override
+    public int getLeaderboardCount() {
+        return this.leaderboardCount;
+    }
+
+    /**
+     * Retrieves the primary category of the game - this is may be null.
+     *
+     * @return The primary category of the game.
+     */
+    @Override
+    @Nullable
+    public String getPrimaryCategory() {
+        return this.primaryCategory;
+    }
+
+    /**
+     * Retrieves the secondary category of the game - this may be null.
+     *
+     * @return The secondary category of the game, or null if not provided.
+     */
+    @Override
+    @Nullable
+    public String getSecondaryCategory() {
+        return this.secondaryCategory;
+    }
+
+    /**
+     * Retrieves the theme color for this game. The theme color is used to configure the appearance of Play Games UIs.
+     *
+     * @return The color to use as an RGB hex triplet, e.g. "E0E0E0"
+     */
+    @Override
+    @NonNull
+    public String getThemeColor() {
+        return this.getThemeColor;
+    }
+
+    /**
+     * Indicates whether or not this game is marked as supporting gamepads.
+     *
+     * @return Whether or not this game declares gamepad support.
+     */
+    @Override
+    public boolean hasGamepadSupport() {
+        return this.hasGamepadSupport;
+    }
+
+    @Override
+    public boolean isDataValid() {
+        return true;
+    }
+
+    int getGameplayAclStatus() {
+        return gameplayAclStatus;
+    }
+
+    String getInstancePackageName() {
+        return this.instancePackageName;
+    }
+
+    boolean isMuted() {
+        return this.isMuted;
+    }
+
+    boolean isIdentitySharingConfirmed() {
+        return this.isIdentitySharingConfirmed;
+    }
+
+    boolean isPlayEnabledGame() {
+        return this.isPlayEnabledGame;
+    }
+
+    boolean isInstanceInstalled() {
+        return this.isInstanceInstalled;
+    }
+
+    @Hide
+    boolean isRealTimeMultiplayerEnabled() {
+        return this.isRealTimeMultiplayerEnabled;
+    }
+
+    @Hide
+    boolean isTurnBasedMultiplayerEnabled() {
+        return this.isTurnBasedMultiplayerEnabled;
+    }
+
+    private static void copyStringToBuffer(@Nullable String toCopy, @NonNull CharArrayBuffer dataOut) {
+        if (toCopy == null || toCopy.isEmpty()) {
+            dataOut.sizeCopied = 0;
+            return;
+        }
+        if (dataOut.data == null || dataOut.data.length < toCopy.length()) {
+            dataOut.data = toCopy.toCharArray();
+        } else {
+            toCopy.getChars(0, toCopy.length(), dataOut.data, 0);
+        }
+        dataOut.sizeCopied = toCopy.length();
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<GameEntity> CREATOR = findCreator(GameEntity.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/GamesStatusCodes.java b/play-services-games/src/main/java/com/google/android/gms/games/GamesStatusCodes.java
new file mode 100644
index 0000000000..1d57466f96
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/GamesStatusCodes.java
@@ -0,0 +1,89 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games;
+
+import com.google.android.gms.common.api.Status;
+
+public enum GamesStatusCodes {
+    ACHIEVEMENT_NOT_INCREMENTAL(3002, "Achievement not incremental"),
+    ACHIEVEMENT_UNKNOWN(3001, "Achievement unknown"),
+    ACHIEVEMENT_UNLOCKED(3003, "Achievement unlocked"),
+    ACHIEVEMENT_UNLOCK_FAILURE(3000, "Achievement unlock failure"),
+    APP_MISCONFIGURED(8, "App misconfigured"),
+    CLIENT_RECONNECT_REQUIRED(2, "Client reconnect required"),
+    GAME_NOT_FOUND(9, "Game not found"),
+    INTERNAL_ERROR(1, "Internal error"),
+    INTERRUPTED(14, "Interrupted"),
+    INVALID_REAL_TIME_ROOM_ID(7002, "Invalid real time room ID"),
+    LICENSE_CHECK_FAILED(7, "License check failed"),
+    MATCH_ERROR_ALREADY_REMATCHED(6505, "Match error already rematched"),
+    MATCH_ERROR_INACTIVE_MATCH(6501, "Match error inactive match"),
+    MATCH_ERROR_INVALID_MATCH_RESULTS(6504, "Match error invalid match results"),
+    MATCH_ERROR_INVALID_MATCH_STATE(6502, "Match error invalid match state"),
+    MATCH_ERROR_INVALID_PARTICIPANT_STATE(6500, "Match error invalid participant state"),
+    MATCH_ERROR_LOCALLY_MODIFIED(6507, "Match error locally modified"),
+    MATCH_ERROR_OUT_OF_DATE_VERSION(6503, "Match error out of date version"),
+    MATCH_NOT_FOUND(6506, "Match not found"),
+    MILESTONE_CLAIMED_PREVIOUSLY(8000, "Milestone claimed previously"),
+    MILESTONE_CLAIM_FAILED(8001, "Milestone claim failed"),
+    MULTIPLAYER_DISABLED(6003, "Multiplayer disabled"),
+    MULTIPLAYER_ERROR_CREATION_NOT_ALLOWED(6000, "Multiplayer error creation not allowed"),
+    MULTIPLAYER_ERROR_INVALID_MULTIPLAYER_TYPE(6002, "Multiplayer error invalid multiplayer type"),
+    MULTIPLAYER_ERROR_INVALID_OPERATION(6004, "Multiplayer error invalid operation"),
+    MULTIPLAYER_ERROR_NOT_TRUSTED_TESTER(6001, "Multiplayer error not trusted tester"),
+    NETWORK_ERROR_NO_DATA(4, "Network error no data"),
+    NETWORK_ERROR_OPERATION_DEFERRED(5, "Network error operation deferred"),
+    NETWORK_ERROR_OPERATION_FAILED(6, "Network error operation failed"),
+    NETWORK_ERROR_STALE_DATA(3, "Network error stale data"),
+    OK(0, "OK"),
+    OPERATION_IN_FLIGHT(7007, "Operation in flight"),
+    PARTICIPANT_NOT_CONNECTED(7003, "Participant not connected"),
+    QUEST_NOT_STARTED(8003, "Quest not started"),
+    QUEST_NO_LONGER_AVAILABLE(8002, "Quest no longer available"),
+    REAL_TIME_CONNECTION_FAILED(7000, "Real time connection failed"),
+    REAL_TIME_INACTIVE_ROOM(7005, "Real time inactive room"),
+    REAL_TIME_MESSAGE_SEND_FAILED(7001, "Real time message send failed"),
+    REAL_TIME_ROOM_NOT_JOINED(7004, "Real time room not joined"),
+    REQUEST_TOO_MANY_RECIPIENTS(2002, "Request too many recipients"),
+    REQUEST_UPDATE_PARTIAL_SUCCESS(2000, "Request update partial success"),
+    REQUEST_UPDATE_TOTAL_FAILURE(2001, "Request update total failure"),
+    SNAPSHOT_COMMIT_FAILED(4003, "Snapshot commit failed"),
+    SNAPSHOT_CONFLICT(4004, "Snapshot conflict"),
+    SNAPSHOT_CONFLICT_MISSING(4006, "Snapshot conflict missing"),
+    SNAPSHOT_CONTENTS_UNAVAILABLE(4002, "Snapshot contents unavailable"),
+    SNAPSHOT_CREATION_FAILED(4001, "Snapshot creation failed"),
+    SNAPSHOT_FOLDER_UNAVAILABLE(4005, "Snapshot folder unavailable"),
+    SNAPSHOT_NOT_FOUND(4000, "Snapshot not found"),
+    TIMEOUT(15, "Timeout"),
+    VIDEO_ALREADY_CAPTURING(9006, "Video already capturing"),
+    VIDEO_NOT_ACTIVE(9000, "Video not active"),
+    VIDEO_OUT_OF_DISK_SPACE(9009, "Video out of disk space"),
+    VIDEO_PERMISSION_ERROR(9002, "Video permission error"),
+    VIDEO_STORAGE_ERROR(9003, "Video storage error"),
+    VIDEO_UNEXPECTED_CAPTURE_ERROR(9004, "Video unexpected capture error"),
+    VIDEO_UNSUPPORTED(9001, "Video unsupported");
+
+    private final int code;
+    private final String description;
+
+    GamesStatusCodes(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static Status createStatus(GamesStatusCodes gamesStatusCodes) {
+        return new Status(gamesStatusCodes.code, gamesStatusCodes.description);
+    }
+
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotColumns.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotColumns.java
new file mode 100644
index 0000000000..0e6c1d83a0
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotColumns.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.games.snapshot;
+
+import org.microg.gms.common.Hide;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Hide
+public class SnapshotColumns {
+    public static final String EXTERNAL_SNAPSHOT_ID = "external_snapshot_id";
+    public static final String COVER_ICON_IMAGE_URI = "cover_icon_image_uri";
+    public static final String COVER_ICON_IMAGE_URL = "cover_icon_image_url";
+    public static final String COVER_ICON_IMAGE_HEIGHT = "cover_icon_image_height";
+    public static final String COVER_ICON_IMAGE_WIDTH = "cover_icon_image_width";
+    public static final String UNIQUE_NAME = "unique_name";
+    public static final String TITLE = "title";
+    public static final String DESCRIPTION = "description";
+    public static final String LAST_MODIFIED_TIMESTAMP = "last_modified_timestamp";
+    public static final String DURATION = "duration";
+    public static final String PENDING_CHANGE_COUNT = "pending_change_count";
+    public static final String PROGRESS_VALUE = "progress_value";
+    public static final String DEVICE_NAME = "device_name";
+
+    public static final List<String> CURRENT_GAME_COLUMNS = Collections.unmodifiableList(Arrays.asList(
+            EXTERNAL_SNAPSHOT_ID, COVER_ICON_IMAGE_URI, COVER_ICON_IMAGE_URL, COVER_ICON_IMAGE_HEIGHT,
+            COVER_ICON_IMAGE_WIDTH, UNIQUE_NAME, TITLE, DESCRIPTION, LAST_MODIFIED_TIMESTAMP, DURATION,
+            PENDING_CHANGE_COUNT, PROGRESS_VALUE, DEVICE_NAME
+    ));
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadata.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadata.java
new file mode 100644
index 0000000000..95bafb79b4
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadata.java
@@ -0,0 +1,144 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games.snapshot;
+
+import android.database.CharArrayBuffer;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.data.Freezable;
+import com.google.android.gms.common.images.ImageManager;
+import com.google.android.gms.games.Game;
+import com.google.android.gms.games.Player;
+import org.microg.gms.common.Hide;
+
+/**
+ * Data interface for the metadata of a saved game.
+ */
+public interface SnapshotMetadata extends Freezable<SnapshotMetadata> {
+    /**
+     * Constant indicating that the played time of a snapshot is unknown.
+     */
+    long PLAYED_TIME_UNKNOWN = -1;
+    /**
+     * Constant indicating that the progress value of a snapshot is unknown.
+     */
+    long PROGRESS_VALUE_UNKNOWN = -1;
+
+    /**
+     * Retrieves the aspect ratio of the cover image for this snapshot, if any. This is the ratio of width to height, so a value > 1.0f indicates a
+     * landscape image while a value < 1.0f indicates a portrait image. If the snapshot has no cover image, this will return 0.0f.
+     *
+     * @return The aspect ratio of the cover image, or 0.0f if no image is present.
+     */
+    float getCoverImageAspectRatio();
+
+    /**
+     * Retrieves an image URI that can be used to load the snapshot's cover image. Returns null if the snapshot has no cover image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load this snapshot's cover image, if one is present.
+     */
+    @Nullable
+    Uri getCoverImageUri();
+
+    @Hide
+    @Deprecated
+    String getCoverImageUrl();
+
+    /**
+     * Retrieves the description of this snapshot.
+     *
+     * @return The description of this snapshot.
+     */
+    @NonNull
+    String getDescription();
+
+    /**
+     * Loads the snapshot description into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    void getDescription(@NonNull CharArrayBuffer dataOut);
+
+    /**
+     * Retrieves the name of the device that wrote this snapshot, if known.
+     *
+     * @return The name of the device that wrote this snapshot, or null if not known.
+     */
+    @Nullable
+    String getDeviceName();
+
+    /**
+     * Retrieves the game associated with this snapshot.
+     *
+     * @return The associated game.
+     */
+    @NonNull
+    Game getGame();
+
+    /**
+     * Retrieves the last time this snapshot was modified, in millis since epoch.
+     *
+     * @return The last modification time of this snapshot.
+     */
+    long getLastModifiedTimestamp();
+
+    /**
+     * Retrieves the player that owns this snapshot.
+     *
+     * @return The owning player.
+     */
+    @NonNull
+    Player getOwner();
+
+    /**
+     * Retrieves the played time of this snapshot in milliseconds. This value is specified during the update operation. If not known, returns
+     * {@link #PLAYED_TIME_UNKNOWN}.
+     *
+     * @return The played time of this snapshot in milliseconds, or {@link #PLAYED_TIME_UNKNOWN} if not known.
+     */
+    long getPlayedTime();
+
+    /**
+     * Retrieves the progress value for this snapshot. Can be used to provide automatic conflict resolution (see
+     * {@link SnapshotsClient#RESOLUTION_POLICY_HIGHEST_PROGRESS}). If not known, returns {@link #PROGRESS_VALUE_UNKNOWN}.
+     *
+     * @return Progress value for this snapshot, or {@link #PROGRESS_VALUE_UNKNOWN} if not known.
+     */
+    long getProgressValue();
+
+    /**
+     * Retrieves the ID of this snapshot.
+     *
+     * @return The ID of this snapshot.
+     */
+    @NonNull
+    String getSnapshotId();
+
+    /**
+     * Retrieves the unique identifier of this snapshot. This value can be passed to {@link SnapshotsClient#open(SnapshotMetadata)} to open the
+     * snapshot for modification.
+     * <p>
+     * This name should be unique within the scope of the application.
+     *
+     * @return Unique identifier of this snapshot.
+     */
+    @NonNull
+    String getUniqueName();
+
+    /**
+     * Indicates whether or not this snapshot has any changes pending that have not been uploaded to the server. Once all changes have been
+     * flushed to the server, this will return false.
+     *
+     * @return Whether or not this snapshot has any outstanding changes.
+     */
+    boolean hasChangePending();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChange.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChange.java
new file mode 100644
index 0000000000..e7be8fafb7
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChange.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games.snapshot;
+
+import android.graphics.Bitmap;
+import androidx.annotation.Nullable;
+
+/**
+ * A collection of changes to apply to the metadata of a snapshot. Fields that are not set will retain their current values.
+ */
+public interface SnapshotMetadataChange {
+    /**
+     * Returns the new cover image to set for the snapshot.
+     */
+    @Nullable
+    Bitmap getCoverImage();
+
+    /**
+     * Returns the new description to set for the snapshot.
+     */
+    @Nullable
+    String getDescription();
+
+    /**
+     * Returns the new played time to set for the snapshot.
+     */
+    @Nullable
+    Long getPlayedTimeMillis();
+
+    /**
+     * Returns the new progress value to set for the snapshot.
+     */
+    @Nullable
+    Long getProgressValue();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.java
new file mode 100644
index 0000000000..64bacb299b
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataChangeEntity.java
@@ -0,0 +1,116 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games.snapshot;
+
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.gms.common.data.BitmapTeleporter;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+
+@Hide
+@SafeParcelable.Class
+public class SnapshotMetadataChangeEntity extends AbstractSafeParcelable implements SnapshotMetadataChange {
+
+    @Field(value = 1, getterName = "getDescription")
+    @Nullable
+    private final String description;
+    @Field(value = 2, getterName = "getPlayedTimeMillis")
+    @Nullable
+    private final Long playedTimeMillis;
+    @Field(value = 4, getterName = "getCoverImageUri")
+    @Nullable
+    private final Uri coverImageUri;
+    @Field(value = 5, getterName = "getCoverImageTeleporter")
+    @Nullable
+    private final BitmapTeleporter coverImageTeleporter;
+    @Field(value = 6, getterName = "getProgressValue")
+    @Nullable
+    private final Long progressValue;
+
+    @Constructor
+    SnapshotMetadataChangeEntity(@Nullable @Param(value = 1) String description, @Nullable @Param(value = 2) Long playedTimeMillis, @Nullable @Param(value = 5) BitmapTeleporter coverImageTeleporter, @Nullable @Param(value = 4) Uri coverImageUri, @Nullable @Param(value = 6) Long progressValue) {
+        this.description = description;
+        this.playedTimeMillis = playedTimeMillis;
+        this.coverImageTeleporter = coverImageTeleporter;
+        this.coverImageUri = coverImageUri;
+        this.progressValue = progressValue;
+    }
+
+    /**
+     * Returns the new cover image to set for the snapshot.
+     */
+    @Override
+    @Nullable
+    public Bitmap getCoverImage() {
+        return this.coverImageTeleporter == null ? null : this.coverImageTeleporter.createTargetBitmap();
+    }
+
+    @Nullable
+    public BitmapTeleporter getCoverImageTeleporter() {
+        return this.coverImageTeleporter;
+    }
+
+    @Nullable
+    Uri getCoverImageUri() {
+        return coverImageUri;
+    }
+
+    /**
+     * Returns the new description to set for the snapshot.
+     */
+    @Override
+    @Nullable
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * Returns the new played time to set for the snapshot.
+     */
+    @Override
+    @Nullable
+    public Long getPlayedTimeMillis() {
+        return this.playedTimeMillis;
+    }
+
+    /**
+     * Returns the new progress value to set for the snapshot.
+     */
+    @Override
+    @Nullable
+    public Long getProgressValue() {
+        return this.progressValue;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<SnapshotMetadataChangeEntity> CREATOR = findCreator(SnapshotMetadataChangeEntity.class);
+
+    @Override
+    public String toString() {
+        return "SnapshotMetadataChangeEntity{" +
+                "description='" + description + '\'' +
+                ", playedTimeMillis=" + playedTimeMillis +
+                ", coverImageUri=" + coverImageUri +
+                ", coverImageTeleporter=" + coverImageTeleporter +
+                ", progressValue=" + progressValue +
+                '}';
+    }
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.java
new file mode 100644
index 0000000000..4a24ce3332
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/SnapshotMetadataEntity.java
@@ -0,0 +1,265 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.games.snapshot;
+
+import android.database.CharArrayBuffer;
+import android.net.Uri;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.gms.common.images.ImageManager;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import com.google.android.gms.games.GameEntity;
+import com.google.android.gms.games.PlayerEntity;
+import org.microg.gms.common.Hide;
+
+@SafeParcelable.Class
+public class SnapshotMetadataEntity extends AbstractSafeParcelable implements SnapshotMetadata {
+
+    @Field(value = 1, getterName = "getGame")
+    private final GameEntity game;
+    @Field(value = 2, getterName = "getOwner")
+    private final PlayerEntity player;
+    @Field(value = 3, getterName = "getSnapshotId")
+    private final String snapshotId;
+    @Field(value = 5, getterName = "getCoverImageUri")
+    @Nullable
+    private final Uri coverImageUri;
+    @Field(value = 6, getterName = "getCoverImageUrl")
+    @Nullable
+    private final String coverImageUrl;
+    @Field(value = 7, getterName = "getTitle")
+    private final String title;
+    @Field(value = 8, getterName = "getDescription")
+    private final String description;
+    @Field(value = 9, getterName = "getLastModifiedTimestamp")
+    private final long lastModifiedTimestamp;
+    @Field(value = 10, getterName = "getPlayedTime")
+    private final long playedTime;
+    @Field(value = 11, getterName = "getCoverImageAspectRatio")
+    private final float coverImageAspectRatio;
+    @Field(value = 12, getterName = "getUniqueName")
+    private final String uniqueName;
+    @Field(value = 13, getterName = "hasChangePending")
+    private final boolean hasChangePending;
+    @Field(value = 14, getterName = "getProgressValue")
+    private final long progressValue;
+    @Field(value = 15, getterName = "getDeviceName")
+    @Nullable
+    private final String deviceName;
+
+    @Hide
+    @Constructor
+    public SnapshotMetadataEntity(@Param(value = 1) GameEntity gameEntity, @Param(value = 2) PlayerEntity playerEntity, @Param(value = 3) String snapshotId, @Param(value = 5) @Nullable Uri coverImageUri,@Param(value = 6) @Nullable String coverImageUrl, @Param(value = 7) String title, @Param(value = 8) String description, @Param(value = 9) long lastModifiedTimestamp, @Param(value = 10) long playedTime, @Param(value = 11) float coverImageAspectRatio, @Param(value = 12) String uniqueName, @Param(value = 13) boolean hasChangePending, @Param(value = 14) long progressValue, @Param(value = 15) @Nullable String deviceName) {
+        this.game = gameEntity;
+        this.player = playerEntity;
+        this.snapshotId = snapshotId;
+        this.coverImageUri = coverImageUri;
+        this.coverImageUrl = coverImageUrl;
+        this.coverImageAspectRatio = coverImageAspectRatio;
+        this.title = title;
+        this.description = description;
+        this.lastModifiedTimestamp = lastModifiedTimestamp;
+        this.playedTime = playedTime;
+        this.uniqueName = uniqueName;
+        this.hasChangePending = hasChangePending;
+        this.progressValue = progressValue;
+        this.deviceName = deviceName;
+    }
+
+    @Override
+    public SnapshotMetadata freeze() {
+        return this;
+    }
+
+    /**
+     * Retrieves the aspect ratio of the cover image for this snapshot, if any. This is the ratio of width to height, so a value > 1.0f indicates a
+     * landscape image while a value < 1.0f indicates a portrait image. If the snapshot has no cover image, this will return 0.0f.
+     *
+     * @return The aspect ratio of the cover image, or 0.0f if no image is present.
+     */
+    @Override
+    public float getCoverImageAspectRatio() {
+        return this.coverImageAspectRatio;
+    }
+
+    /**
+     * Retrieves an image URI that can be used to load the snapshot's cover image. Returns null if the snapshot has no cover image.
+     * <p>
+     * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+     *
+     * @return A URI that can be used to load this snapshot's cover image, if one is present.
+     */
+    @Override
+    @Nullable
+    public Uri getCoverImageUri() {
+        return this.coverImageUri;
+    }
+
+    @Override
+    @Nullable
+    public String getCoverImageUrl() {
+        return this.coverImageUrl;
+    }
+
+    /**
+     * Retrieves the description of this snapshot.
+     *
+     * @return The description of this snapshot.
+     */
+    @Override
+    @NonNull
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * Loads the snapshot description into the given {@link CharArrayBuffer}.
+     *
+     * @param dataOut The buffer to load the data into.
+     */
+    @Override
+    public void getDescription(@NonNull CharArrayBuffer dataOut) {
+        copyStringToBuffer(this.description, dataOut);
+    }
+
+    /**
+     * Retrieves the name of the device that wrote this snapshot, if known.
+     *
+     * @return The name of the device that wrote this snapshot, or null if not known.
+     */
+    @Override
+    @Nullable
+    public String getDeviceName() {
+        return this.deviceName;
+    }
+
+    /**
+     * Retrieves the game associated with this snapshot.
+     *
+     * @return The associated game.
+     */
+    @Override
+    @NonNull
+    public GameEntity getGame() {
+        return this.game;
+    }
+
+    /**
+     * Retrieves the last time this snapshot was modified, in millis since epoch.
+     *
+     * @return The last modification time of this snapshot.
+     */
+    @Override
+    public long getLastModifiedTimestamp() {
+        return this.lastModifiedTimestamp;
+    }
+
+    /**
+     * Retrieves the player that owns this snapshot.
+     *
+     * @return The owning player.
+     */
+    @Override
+    @NonNull
+    public PlayerEntity getOwner() {
+        return this.player;
+    }
+
+    /**
+     * Retrieves the played time of this snapshot in milliseconds. This value is specified during the update operation. If not known, returns
+     * {@link #PLAYED_TIME_UNKNOWN}.
+     *
+     * @return The played time of this snapshot in milliseconds, or {@link #PLAYED_TIME_UNKNOWN} if not known.
+     */
+    @Override
+    public long getPlayedTime() {
+        return this.playedTime;
+    }
+
+    /**
+     * Retrieves the progress value for this snapshot. Can be used to provide automatic conflict resolution (see
+     * {@link SnapshotsClient#RESOLUTION_POLICY_HIGHEST_PROGRESS}). If not known, returns {@link #PROGRESS_VALUE_UNKNOWN}.
+     *
+     * @return Progress value for this snapshot, or {@link #PROGRESS_VALUE_UNKNOWN} if not known.
+     */
+    @Override
+    public long getProgressValue() {
+        return this.progressValue;
+    }
+
+    /**
+     * Retrieves the ID of this snapshot.
+     *
+     * @return The ID of this snapshot.
+     */
+    @Override
+    @NonNull
+    public String getSnapshotId() {
+        return this.snapshotId;
+    }
+
+    /**
+     * Retrieves the unique identifier of this snapshot. This value can be passed to {@link SnapshotsClient#open(SnapshotMetadata)} to open the
+     * snapshot for modification.
+     * <p>
+     * This name should be unique within the scope of the application.
+     *
+     * @return Unique identifier of this snapshot.
+     */
+    @Override
+    @NonNull
+    public String getUniqueName() {
+        return this.uniqueName;
+    }
+
+    /**
+     * Indicates whether or not this snapshot has any changes pending that have not been uploaded to the server. Once all changes have been
+     * flushed to the server, this will return false.
+     *
+     * @return Whether or not this snapshot has any outstanding changes.
+     */
+    @Override
+    public boolean hasChangePending() {
+        return this.hasChangePending;
+    }
+
+    String getTitle() {
+        return this.title;
+    }
+
+    @Override
+    public boolean isDataValid() {
+        return true;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    private static void copyStringToBuffer(@Nullable String toCopy, @NonNull CharArrayBuffer dataOut) {
+        if (toCopy == null || toCopy.isEmpty()) {
+            dataOut.sizeCopied = 0;
+            return;
+        }
+        if (dataOut.data == null || dataOut.data.length < toCopy.length()) {
+            dataOut.data = toCopy.toCharArray();
+        } else {
+            toCopy.getChars(0, toCopy.length(), dataOut.data, 0);
+        }
+        dataOut.sizeCopied = toCopy.length();
+    }
+
+    public static final SafeParcelableCreatorAndWriter<SnapshotMetadataEntity> CREATOR = findCreator(SnapshotMetadataEntity.class);
+}