Fix build

play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java

@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2020, 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.common.api;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+
+import org.microg.gms.common.PublicApi;
+
+/**
+ * Helper activity used by Google Play services APIs to display resolutions for connection errors.
+ */
+@PublicApi
+public class GoogleApiActivity extends Activity implements DialogInterface.OnCancelListener {
+    @Override
+    @PublicApi(exclude = true)
+    public void onCancel(DialogInterface dialog) {
+
+    }
+}

play-services-basement/src/main/java/org/microg/gms/common/Constants.java

@@ -17,7 +17,7 @@
 package org.microg.gms.common;
 
 public class Constants {
-    public static final int MAX_REFERENCE_VERSION = 203915 * 1000;
+    public static final int MAX_REFERENCE_VERSION = 204215 * 1000;
     public static final String GMS_PACKAGE_NAME = "com.google.android.gms";
     public static final String GSF_PACKAGE_NAME = "com.google.android.gsf";
     public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788";

play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml

@@ -17,11 +17,12 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:clipChildren="false"
-             android:layout_marginBottom="0.25dp"
-             android:clipToPadding="false">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="0.25dp"
+    android:clipChildren="false"
+    android:clipToPadding="false">
 
     <LinearLayout
         android:id="@+id/content"
@@ -32,8 +33,8 @@
         android:elevation="2dp"
         android:focusable="true"
         android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:paddingLeft="16dp">
 
         <LinearLayout
             android:id="@+id/collapsed_group"
@@ -44,12 +45,12 @@
 
             <ImageView
                 android:id="@android:id/icon"
-                android:src="@android:drawable/ic_dialog_alert"
                 android:layout_width="24dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="36dp"
                 android:layout_marginRight="36dp"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
+                android:src="@android:drawable/ic_dialog_alert"
+                app:tint="?android:attr/textColorPrimaryInverse" />
 
             <TextView
                 android:id="@android:id/title"
@@ -58,7 +59,7 @@
                 android:layout_weight="1"
                 android:text="Test Condition"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryInverse"/>
+                android:textColor="?android:attr/textColorPrimaryInverse" />
 
             <ImageView
                 android:id="@+id/expand_indicator"
@@ -69,7 +70,7 @@
                 android:focusable="true"
                 android:padding="16dp"
                 android:src="@drawable/ic_expand_more"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
+                app:tint="?android:attr/textColorPrimaryInverse" />
 
         </LinearLayout>
 
@@ -78,37 +79,37 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="60dp"
             android:paddingStart="60dp"
+            android:paddingLeft="60dp"
             android:visibility="gone">
 
             <TextView
                 android:id="@android:id/summary"
-                android:text="This condition just exists for testing. This is a summary describing it."
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:alpha=".7"
-                android:paddingBottom="16dp"
                 android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:paddingRight="?attr/listPreferredItemPaddingRight"
+                android:paddingBottom="16dp"
+                android:text="This condition just exists for testing. This is a summary describing it."
                 android:textAppearance="?attr/textAppearanceListItemSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse"/>
+                android:textColor="?android:attr/textColorPrimaryInverse" />
 
             <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="0.25dp"
-                android:background="@android:color/white"/>
+                android:background="@android:color/white" />
 
             <androidx.appcompat.widget.ButtonBarLayout
                 android:id="@+id/buttonBar"
                 style="?attr/buttonBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
                 android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:paddingRight="?attr/listPreferredItemPaddingRight"
-                android:paddingTop="8dp">
+                android:paddingBottom="8dp">
 
                 <Button
                     android:id="@+id/first_action"
@@ -116,10 +117,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:alpha="0.8"
-                    android:paddingLeft="0dp"
                     android:paddingStart="0dp"
+                    android:paddingLeft="0dp"
                     android:text="Fix it!"
-                    android:textColor="?android:attr/textColorPrimaryInverse"/>
+                    android:textColor="?android:attr/textColorPrimaryInverse" />
 
                 <Button
                     android:id="@+id/second_action"
@@ -127,8 +128,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:alpha="0.8"
-                    android:visibility="gone"
-                    android:textColor="?android:attr/textColorPrimaryInverse"/>
+                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:visibility="gone" />
 
             </androidx.appcompat.widget.ButtonBarLayout>
         </LinearLayout>

play-services-core/src/main/res/layout/ask_gcm.xml

@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clipChildren="false"
     android:clipToPadding="false">
 
@@ -49,7 +50,7 @@
                     android:layout_height="36dip"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_cloud_bell"
-                    android:tint="?attr/colorAccent">
+                    app:tint="?attr/colorAccent">
                 </ImageView>
 
                 <TextView