CREATOR = findCreator(AuthenticationExtensionsClientOutputs.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticationExtensionsCredPropsOutputs.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticationExtensionsCredPropsOutputs.java
new file mode 100644
index 0000000000000000000000000000000000000000..0dd5f6f648202ffde437e4f1ab5e53d5b8a32825
--- /dev/null
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticationExtensionsCredPropsOutputs.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.fido.fido2.api.common;
+
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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 java.util.Objects;
+
+/**
+ * Class that holds the result of the credProps extension.
+ *
+ * Since this extension only reports information, it is always included in registration responses and does not need to be requested.
+ */
+@SafeParcelable.Class
+public class AuthenticationExtensionsCredPropsOutputs extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getIsDiscoverableCredential")
+ private boolean rk;
+
+ @Constructor
+ public AuthenticationExtensionsCredPropsOutputs(@Param(1) boolean rk) {
+ this.rk = rk;
+ }
+
+ public boolean equals(Object other) {
+ return (other instanceof AuthenticationExtensionsCredPropsOutputs) && this.rk == ((AuthenticationExtensionsCredPropsOutputs) other).rk;
+ }
+
+ /**
+ * This value reflects the "rk" flag of the WebAuthn extension.
+ */
+ public boolean getIsDiscoverableCredential() {
+ return rk;
+ }
+
+ public int hashCode() {
+ return Objects.hashCode(new Object[]{this.rk});
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(AuthenticationExtensionsCredPropsOutputs.class);
+}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAssertionResponse.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAssertionResponse.java
index 2bbe0c0ee66d41d8b59958fc6a25771a71e8e946..e4da7b2288099e964fbea8d79e90ddd6e6835ae3 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAssertionResponse.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAssertionResponse.java
@@ -8,6 +8,11 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -19,21 +24,29 @@ import java.util.Arrays;
* of a private key as well as evidence of user consent to a specific transaction.
*/
@PublicApi
+@SafeParcelable.Class
public class AuthenticatorAssertionResponse extends AuthenticatorResponse {
- @Field(2)
+ @Field(value = 2, getterName = "getKeyHandle")
+ @NonNull
private byte[] keyHandle;
- @Field(3)
+ @Field(value = 3, getterName = "getClientDataJSON")
+ @NonNull
private byte[] clientDataJSON;
- @Field(4)
+ @Field(value = 4, getterName = "getAuthenticatorData")
+ @NonNull
private byte[] authenticatorData;
- @Field(5)
+ @Field(value = 5, getterName = "getSignature")
+ @NonNull
private byte[] signature;
- @Field(6)
+ @Field(value = 6, getterName = "getUserHandle")
+ @Nullable
private byte[] userHandle;
- private AuthenticatorAssertionResponse() {}
+ private AuthenticatorAssertionResponse() {
+ }
- public AuthenticatorAssertionResponse(byte[] keyHandle, byte[] clientDataJSON, byte[] authenticatorData, byte[] signature, byte[] userHandle) {
+ @Constructor
+ public AuthenticatorAssertionResponse(@Param(2) @NonNull byte[] keyHandle, @Param(3) @NonNull byte[] clientDataJSON, @Param(4) @NonNull byte[] authenticatorData, @Param(5) @NonNull byte[] signature, @Param(6) @Nullable byte[] userHandle) {
this.keyHandle = keyHandle;
this.clientDataJSON = clientDataJSON;
this.authenticatorData = authenticatorData;
@@ -41,11 +54,13 @@ public class AuthenticatorAssertionResponse extends AuthenticatorResponse {
this.userHandle = userHandle;
}
+ @NonNull
public byte[] getAuthenticatorData() {
return authenticatorData;
}
@Override
+ @NonNull
public byte[] getClientDataJSON() {
return clientDataJSON;
}
@@ -54,19 +69,23 @@ public class AuthenticatorAssertionResponse extends AuthenticatorResponse {
* @deprecated use {@link PublicKeyCredential#getRawId()} instead
*/
@Deprecated
+ @NonNull
public byte[] getKeyHandle() {
return keyHandle;
}
+ @NonNull
public byte[] getSignature() {
return signature;
}
+ @Nullable
public byte[] getUserHandle() {
return userHandle;
}
@Override
+ @NonNull
public byte[] serializeToBytes() {
return SafeParcelableSerializer.serializeToBytes(this);
}
@@ -91,6 +110,7 @@ public class AuthenticatorAssertionResponse extends AuthenticatorResponse {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("AuthenticatorAssertionResponse")
.field("keyHandle", keyHandle)
@@ -101,9 +121,15 @@ public class AuthenticatorAssertionResponse extends AuthenticatorResponse {
.end();
}
+ @NonNull
public static AuthenticatorAssertionResponse deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- public static final Creator CREATOR = new AutoCreator<>(AuthenticatorAssertionResponse.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(AuthenticatorAssertionResponse.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAttestationResponse.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAttestationResponse.java
index 33537104bb0f79b5c940602cbb705aba121f9e3b..4aeb1798f018bbd900361ed360050eb8484fa6c7 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAttestationResponse.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorAttestationResponse.java
@@ -8,7 +8,12 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -18,28 +23,40 @@ import java.util.Arrays;
* Represents a newly-created scoped credential, aka the response from a registration request.
*/
@PublicApi
+@SafeParcelable.Class
public class AuthenticatorAttestationResponse extends AuthenticatorResponse {
- @Field(2)
+ @Field(value = 2, getterName = "getKeyHandle")
+ @NonNull
private byte[] keyHandle;
- @Field(3)
+ @Field(value = 3, getterName = "getClientDataJSON")
+ @NonNull
private byte[] clientDataJSON;
- @Field(4)
+ @Field(value = 4, getterName = "getAttestationObject")
+ @NonNull
private byte[] attestationObject;
+ @Field(value = 5, getterName = "getTransports")
+ @NonNull
+ private String[] transports;
- private AuthenticatorAttestationResponse() {}
+ private AuthenticatorAttestationResponse() {
+ }
- @PublicApi(exclude = true)
- public AuthenticatorAttestationResponse(byte[] keyHandle, byte[] clientDataJSON, byte[] attestationObject) {
+ @Hide
+ @Constructor
+ public AuthenticatorAttestationResponse(@Param(2) @NonNull byte[] keyHandle, @Param(3) @NonNull byte[] clientDataJSON, @Param(4) @NonNull byte[] attestationObject, @Param(5) @NonNull String[] transports) {
this.keyHandle = keyHandle;
this.clientDataJSON = clientDataJSON;
this.attestationObject = attestationObject;
+ this.transports = transports;
}
+ @NonNull
public byte[] getAttestationObject() {
return attestationObject;
}
@Override
+ @NonNull
public byte[] getClientDataJSON() {
return clientDataJSON;
}
@@ -48,11 +65,18 @@ public class AuthenticatorAttestationResponse extends AuthenticatorResponse {
* @deprecated use {@link PublicKeyCredential#getRawId()} instead
*/
@Deprecated
+ @NonNull
public byte[] getKeyHandle() {
return keyHandle;
}
+ @NonNull
+ public String[] getTransports() {
+ return transports;
+ }
+
@Override
+ @NonNull
public byte[] serializeToBytes() {
return SafeParcelableSerializer.serializeToBytes(this);
}
@@ -66,26 +90,36 @@ public class AuthenticatorAttestationResponse extends AuthenticatorResponse {
if (!Arrays.equals(keyHandle, that.keyHandle)) return false;
if (!Arrays.equals(clientDataJSON, that.clientDataJSON)) return false;
- return Arrays.equals(attestationObject, that.attestationObject);
+ if (!Arrays.equals(attestationObject, that.attestationObject)) return false;
+ if (!Arrays.equals(transports, that.transports)) return false;
+ return true;
}
@Override
public int hashCode() {
- return Arrays.hashCode(new Object[]{Arrays.hashCode(keyHandle), Arrays.hashCode(clientDataJSON), Arrays.hashCode(attestationObject)});
+ return Arrays.hashCode(new Object[]{Arrays.hashCode(keyHandle), Arrays.hashCode(clientDataJSON), Arrays.hashCode(attestationObject), Arrays.hashCode(transports)});
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("AuthenticatorAttestationResponse")
.field("keyHandle", keyHandle)
.field("clientDataJSON", clientDataJSON)
.field("attestationObject", attestationObject)
+ .field("transports", transports)
.end();
}
+ @NonNull
public static AuthenticatorAttestationResponse deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- public static final Creator CREATOR = new AutoCreator<>(AuthenticatorAttestationResponse.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(AuthenticatorAttestationResponse.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorErrorResponse.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorErrorResponse.java
index 1c20bfc5c30a06737998b45b7f2504f2026f0cd8..981e939f6d6f6c0fc15e5ebe23c6c1051cb79e2f 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorErrorResponse.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorErrorResponse.java
@@ -8,7 +8,13 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -18,26 +24,40 @@ import java.util.Arrays;
* The response after an error occurred.
*/
@PublicApi
+@SafeParcelable.Class
public class AuthenticatorErrorResponse extends AuthenticatorResponse {
- @Field(2)
+ @Field(value = 2, getterName = "getErrorCode")
+ @NonNull
private ErrorCode errorCode;
- @Field(3)
+ @Field(value = 3, getterName = "getErrorMessage")
+ @Nullable
private String errorMessage;
+ @Field(value = 4, getterName = "getInternalErrorCode")
+ private int internalErrorCode;
private AuthenticatorErrorResponse() {
}
- @PublicApi(exclude = true)
- public AuthenticatorErrorResponse(ErrorCode errorCode, String errorMessage) {
+ @Hide
+ public AuthenticatorErrorResponse(@NonNull ErrorCode errorCode, @Nullable String errorMessage) {
this.errorCode = errorCode;
this.errorMessage = errorMessage;
}
+ @Constructor
+ AuthenticatorErrorResponse(@Param(2) @NonNull ErrorCode errorCode, @Param(3) @Nullable String errorMessage, @Param(4) int internalErrorCode) {
+ this.errorCode = errorCode;
+ this.errorMessage = errorMessage;
+ this.internalErrorCode = internalErrorCode;
+ }
+
@Override
+ @NonNull
public byte[] getClientDataJSON() {
throw new UnsupportedOperationException();
}
+ @NonNull
public ErrorCode getErrorCode() {
return errorCode;
}
@@ -46,11 +66,18 @@ public class AuthenticatorErrorResponse extends AuthenticatorResponse {
return errorCode.getCode();
}
+ @Nullable
public String getErrorMessage() {
return errorMessage;
}
+ @Hide
+ public int getInternalErrorCode() {
+ return internalErrorCode;
+ }
+
@Override
+ @NonNull
public byte[] serializeToBytes() {
return SafeParcelableSerializer.serializeToBytes(this);
}
@@ -63,15 +90,18 @@ public class AuthenticatorErrorResponse extends AuthenticatorResponse {
AuthenticatorErrorResponse that = (AuthenticatorErrorResponse) o;
if (errorCode != null ? !errorCode.equals(that.errorCode) : that.errorCode != null) return false;
- return errorMessage != null ? errorMessage.equals(that.errorMessage) : that.errorMessage == null;
+ if (errorMessage != null ? !errorMessage.equals(that.errorMessage) : that.errorMessage != null) return false;
+ if (internalErrorCode != that.internalErrorCode) return false;
+ return true;
}
@Override
public int hashCode() {
- return Arrays.hashCode(new Object[]{errorCode, errorMessage});
+ return Arrays.hashCode(new Object[]{errorCode, errorMessage, internalErrorCode});
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("AuthenticatorErrorResponse")
.value(errorCode.name())
@@ -79,9 +109,15 @@ public class AuthenticatorErrorResponse extends AuthenticatorResponse {
.end();
}
+ @NonNull
public static AuthenticatorErrorResponse deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- public static final Creator CREATOR = new AutoCreator<>(AuthenticatorErrorResponse.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(AuthenticatorErrorResponse.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorResponse.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorResponse.java
index 0a904f92ee1a6630a57d44051f023e8e507d63d0..24e2f3a48aea97a700907d45dc35608c549f1b5c 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorResponse.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorResponse.java
@@ -8,13 +8,16 @@
package com.google.android.gms.fido.fido2.api.common;
-import org.microg.safeparcel.AutoSafeParcelable;
+import androidx.annotation.NonNull;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
/**
* Authenticators respond to relying party requests by returning an object derived from this interface.
*/
-public abstract class AuthenticatorResponse extends AutoSafeParcelable {
+public abstract class AuthenticatorResponse extends AbstractSafeParcelable {
+ @NonNull
public abstract byte[] getClientDataJSON();
+ @NonNull
public abstract byte[] serializeToBytes();
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorSelectionCriteria.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorSelectionCriteria.java
index 8513762ed561a29915204a7c0f2f719389171009..9ad09bfaa247888f6c462619370735c954dc3a48 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorSelectionCriteria.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/AuthenticatorSelectionCriteria.java
@@ -8,9 +8,14 @@
package com.google.android.gms.fido.fido2.api.common;
-import org.microg.gms.common.PublicApi;
+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;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -18,30 +23,58 @@ import java.util.Arrays;
* Relying Parties may use {@link AuthenticatorSelectionCriteria} to specify their requirements regarding authenticator
* attributes.
*/
-public class AuthenticatorSelectionCriteria extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class AuthenticatorSelectionCriteria extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getAttachment")
+ @Nullable
private Attachment attachment;
- @Field(3)
+ @Field(value = 3, getterName = "getRequireResidentKey")
+ @Nullable
private Boolean requireResidentKey;
- @Field(4)
+ @Field(value = 4, getterName = "getRequireUserVerification")
+ @Nullable
private UserVerificationRequirement requireUserVerification;
+ @Field(value = 5, getterName = "getResidentKeyRequirement")
+ @Nullable
+ private ResidentKeyRequirement residentKeyRequirement;
+
+ @Constructor
+ AuthenticatorSelectionCriteria(@Param(2) @Nullable Attachment attachment, @Param(3) @Nullable Boolean requireResidentKey, @Param(4) @Nullable UserVerificationRequirement requireUserVerification, @Param(5) @Nullable ResidentKeyRequirement residentKeyRequirement) {
+ this.attachment = attachment;
+ this.requireResidentKey = requireResidentKey;
+ this.requireUserVerification = requireUserVerification;
+ this.residentKeyRequirement = residentKeyRequirement;
+ }
+ @Nullable
public Attachment getAttachment() {
return attachment;
}
+ @Nullable
public String getAttachmentAsString() {
- if (this.attachment == null) {
- return null;
- }
+ if (attachment == null) return null;
return attachment.toString();
}
+ @Nullable
public Boolean getRequireResidentKey() {
return requireResidentKey;
}
- @PublicApi(exclude = true)
+ @Nullable
+ public ResidentKeyRequirement getResidentKeyRequirement() {
+ return residentKeyRequirement;
+ }
+
+ @Nullable
+ public String getResidentKeyRequirementAsString() {
+ if (residentKeyRequirement == null) return null;
+ return residentKeyRequirement.toString();
+ }
+
+ @Hide
+ @Nullable
public UserVerificationRequirement getRequireUserVerification() {
return requireUserVerification;
}
@@ -54,9 +87,10 @@ public class AuthenticatorSelectionCriteria extends AutoSafeParcelable {
AuthenticatorSelectionCriteria that = (AuthenticatorSelectionCriteria) o;
if (attachment != that.attachment) return false;
- if (requireResidentKey != null ? !requireResidentKey.equals(that.requireResidentKey) : that.requireResidentKey != null)
- return false;
- return requireUserVerification == that.requireUserVerification;
+ if (requireResidentKey != null ? !requireResidentKey.equals(that.requireResidentKey) : that.requireResidentKey != null) return false;
+ if (requireUserVerification != that.requireUserVerification) return false;
+ if (residentKeyRequirement != that.residentKeyRequirement) return false;
+ return true;
}
@Override
@@ -65,11 +99,13 @@ public class AuthenticatorSelectionCriteria extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("AuthenticatorSelectionCriteria")
.field("attachment", attachment)
.field("requireResidentKey", requireResidentKey)
.field("requireUserVerification", requireUserVerification)
+ .field("residentKeyRequirement", residentKeyRequirement)
.end();
}
@@ -77,13 +113,17 @@ public class AuthenticatorSelectionCriteria extends AutoSafeParcelable {
* Builder for {@link AuthenticatorSelectionCriteria}.
*/
public static class Builder {
+ @Nullable
private Attachment attachment;
+ @Nullable
private Boolean requireResidentKey;
+ @Nullable
+ private ResidentKeyRequirement residentKeyRequirement;
/**
* Sets the attachment to use for this session.
*/
- public Builder setAttachment(Attachment attachment) {
+ public Builder setAttachment(@Nullable Attachment attachment) {
this.attachment = attachment;
return this;
}
@@ -91,18 +131,29 @@ public class AuthenticatorSelectionCriteria extends AutoSafeParcelable {
/**
* Sets whether the key created will be a resident key.
*/
- public Builder setRequireResidentKey(Boolean requireResidentKey) {
+ public Builder setRequireResidentKey(@Nullable Boolean requireResidentKey) {
this.requireResidentKey = requireResidentKey;
return this;
}
+ /**
+ * Sets residentKeyRequirement
+ */
+ public Builder setResidentKeyRequirement(@Nullable ResidentKeyRequirement residentKeyRequirement) {
+ this.residentKeyRequirement = residentKeyRequirement;
+ return this;
+ }
+
+ @NonNull
public AuthenticatorSelectionCriteria build() {
- AuthenticatorSelectionCriteria criteria = new AuthenticatorSelectionCriteria();
- criteria.attachment = attachment;
- criteria.requireResidentKey = requireResidentKey;
- return criteria;
+ return new AuthenticatorSelectionCriteria(attachment, requireResidentKey, null, residentKeyRequirement);
}
}
- public static final Creator CREATOR = new AutoCreator<>(AuthenticatorSelectionCriteria.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(AuthenticatorSelectionCriteria.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialCreationOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialCreationOptions.java
index a24b170456e4eca83a1ecfeb289e80e6f3d1ef91..707edcd6ad5dfbc2da3ce165a7d7beef1be9f4d0 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialCreationOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialCreationOptions.java
@@ -7,7 +7,13 @@ package com.google.android.gms.fido.fido2.api.common;
import android.net.Uri;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -17,49 +23,68 @@ import java.util.Arrays;
* Parameters to a make credential request from a Web browser.
*/
@PublicApi
+@SafeParcelable.Class
public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOptions {
- @Field(2)
+ @Field(value = 2, getterName = "getPublicKeyCredentialCreationOptions")
+ @NonNull
private PublicKeyCredentialCreationOptions delegate;
- @Field(3)
+ @Field(value = 3, getterName = "getOrigin")
+ @NonNull
private Uri origin;
- @Field(4)
+ @Field(value = 4, getterName = "getClientDataHash")
+ @Nullable
private byte[] clientDataHash;
+ @Constructor
+ BrowserPublicKeyCredentialCreationOptions(@Param(2) @NonNull PublicKeyCredentialCreationOptions delegate, @Param(3) @NonNull Uri origin, @Param(4) @Nullable byte[] clientDataHash) {
+ this.delegate = delegate;
+ this.origin = origin;
+ this.clientDataHash = clientDataHash;
+ }
+
@Override
+ @Nullable
public AuthenticationExtensions getAuthenticationExtensions() {
return delegate.getAuthenticationExtensions();
}
@Override
+ @NonNull
public byte[] getChallenge() {
return delegate.getChallenge();
}
@Override
+ @Nullable
public byte[] getClientDataHash() {
return clientDataHash;
}
@Override
+ @NonNull
public Uri getOrigin() {
return origin;
}
+ @NonNull
public PublicKeyCredentialCreationOptions getPublicKeyCredentialCreationOptions() {
return delegate;
}
@Override
+ @Nullable
public Integer getRequestId() {
return delegate.getRequestId();
}
@Override
+ @Nullable
public Double getTimeoutSeconds() {
return delegate.getTimeoutSeconds();
}
@Override
+ @Nullable
public TokenBinding getTokenBinding() {
return delegate.getTokenBinding();
}
@@ -94,8 +119,11 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
* Builder for {@link BrowserPublicKeyCredentialCreationOptions}.
*/
public static class Builder {
+ @NonNull
private PublicKeyCredentialCreationOptions delegate;
+ @NonNull
private Uri origin;
+ @Nullable
private byte[] clientDataHash;
/**
@@ -115,7 +143,7 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
*
* @return
*/
- public BrowserPublicKeyCredentialCreationOptions.Builder setClientDataHash(byte[] clientDataHash) {
+ public BrowserPublicKeyCredentialCreationOptions.Builder setClientDataHash(@NonNull byte[] clientDataHash) {
this.clientDataHash = clientDataHash;
return this;
}
@@ -123,7 +151,7 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
/**
* Sets the origin on whose behalf the calling browser is requesting a registration operation.
*/
- public BrowserPublicKeyCredentialCreationOptions.Builder setOrigin(Uri origin) {
+ public BrowserPublicKeyCredentialCreationOptions.Builder setOrigin(@NonNull Uri origin) {
this.origin = origin;
return this;
}
@@ -131,7 +159,7 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
/**
* Sets the parameters to dictate the client behavior during this registration session.
*/
- public BrowserPublicKeyCredentialCreationOptions.Builder setPublicKeyCredentialCreationOptions(PublicKeyCredentialCreationOptions publicKeyCredentialCreationOptions) {
+ public BrowserPublicKeyCredentialCreationOptions.Builder setPublicKeyCredentialCreationOptions(@NonNull PublicKeyCredentialCreationOptions publicKeyCredentialCreationOptions) {
this.delegate = publicKeyCredentialCreationOptions;
return this;
}
@@ -139,12 +167,9 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
/**
* Builds the {@link BrowserPublicKeyCredentialCreationOptions} object.
*/
+ @NonNull
public BrowserPublicKeyCredentialCreationOptions build() {
- BrowserPublicKeyCredentialCreationOptions options = new BrowserPublicKeyCredentialCreationOptions();
- options.delegate = delegate;
- options.origin = origin;
- options.clientDataHash = clientDataHash;
- return options;
+ return new BrowserPublicKeyCredentialCreationOptions(delegate, origin, clientDataHash);
}
}
@@ -152,5 +177,10 @@ public class BrowserPublicKeyCredentialCreationOptions extends BrowserRequestOpt
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- public static final Creator CREATOR = new AutoCreator<>(BrowserPublicKeyCredentialCreationOptions.class);
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(BrowserPublicKeyCredentialCreationOptions.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialRequestOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialRequestOptions.java
index be63a72ec639133271763f8c5f5228afa033192f..14d2af40a57ea81a54e8f1fc6f44b6d36c988fbb 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialRequestOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserPublicKeyCredentialRequestOptions.java
@@ -7,6 +7,11 @@ package com.google.android.gms.fido.fido2.api.common;
import android.net.Uri;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -17,49 +22,68 @@ import java.util.Arrays;
* Parameters for a signature request from a Web Browser.
*/
@PublicApi
+@SafeParcelable.Class
public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOptions {
- @Field(2)
+ @Field(value = 2, getterName = "getPublicKeyCredentialRequestOptions")
+ @NonNull
private PublicKeyCredentialRequestOptions delegate;
- @Field(3)
+ @Field(value = 3, getterName = "getOrigin")
+ @NonNull
private Uri origin;
- @Field(4)
+ @Field(value = 4, getterName = "getClientDataHash")
+ @Nullable
private byte[] clientDataHash;
+ @Constructor
+ BrowserPublicKeyCredentialRequestOptions(@Param(2) @NonNull PublicKeyCredentialRequestOptions delegate, @Param(3) @NonNull Uri origin, @Param(4) @Nullable byte[] clientDataHash) {
+ this.delegate = delegate;
+ this.origin = origin;
+ this.clientDataHash = clientDataHash;
+ }
+
@Override
+ @Nullable
public AuthenticationExtensions getAuthenticationExtensions() {
return delegate.getAuthenticationExtensions();
}
@Override
+ @NonNull
public byte[] getChallenge() {
return delegate.getChallenge();
}
@Override
+ @Nullable
public byte[] getClientDataHash() {
return clientDataHash;
}
@Override
+ @NonNull
public Uri getOrigin() {
return origin;
}
+ @NonNull
public PublicKeyCredentialRequestOptions getPublicKeyCredentialRequestOptions() {
return delegate;
}
@Override
+ @Nullable
public Integer getRequestId() {
return delegate.getRequestId();
}
@Override
+ @Nullable
public Double getTimeoutSeconds() {
return delegate.getTimeoutSeconds();
}
@Override
+ @Nullable
public TokenBinding getTokenBinding() {
return delegate.getTokenBinding();
}
@@ -82,6 +106,7 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("BrowserPublicKeyCredentialRequestOptions")
.value(delegate)
@@ -94,8 +119,11 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
* Builder for {@link BrowserPublicKeyCredentialRequestOptions}.
*/
public static class Builder {
+ @NonNull
private PublicKeyCredentialRequestOptions delegate;
+ @NonNull
private Uri origin;
+ @Nullable
private byte[] clientDataHash;
/**
@@ -115,7 +143,7 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
*
* @return
*/
- public Builder setClientDataHash(byte[] clientDataHash) {
+ public Builder setClientDataHash(@NonNull byte[] clientDataHash) {
this.clientDataHash = clientDataHash;
return this;
}
@@ -123,7 +151,7 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
/**
* Sets the origin on whose behalf the calling browser is requesting an authentication operation.
*/
- public Builder setOrigin(Uri origin) {
+ public Builder setOrigin(@NonNull Uri origin) {
this.origin = origin;
return this;
}
@@ -131,7 +159,7 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
/**
* Sets the parameters to dictate client behavior during this authentication session.
*/
- public Builder setPublicKeyCredentialRequestOptions(PublicKeyCredentialRequestOptions publicKeyCredentialRequestOptions) {
+ public Builder setPublicKeyCredentialRequestOptions(@NonNull PublicKeyCredentialRequestOptions publicKeyCredentialRequestOptions) {
this.delegate = publicKeyCredentialRequestOptions;
return this;
}
@@ -139,12 +167,9 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
/**
* Builds the {@link BrowserPublicKeyCredentialRequestOptions} object.
*/
+ @NonNull
public BrowserPublicKeyCredentialRequestOptions build() {
- BrowserPublicKeyCredentialRequestOptions options = new BrowserPublicKeyCredentialRequestOptions();
- options.delegate = delegate;
- options.origin = origin;
- options.clientDataHash = clientDataHash;
- return options;
+ return new BrowserPublicKeyCredentialRequestOptions(delegate, origin, clientDataHash);
}
}
@@ -152,5 +177,10 @@ public class BrowserPublicKeyCredentialRequestOptions extends BrowserRequestOpti
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- public static final Creator CREATOR = new AutoCreator<>(BrowserPublicKeyCredentialRequestOptions.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(BrowserPublicKeyCredentialRequestOptions.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserRequestOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserRequestOptions.java
index 407e9a785a94bbc1bda70893f1fd2c60cabb1e6e..232693e2a855a9ec3040ffa4357cb6d7f063f43b 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserRequestOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/BrowserRequestOptions.java
@@ -9,6 +9,7 @@
package com.google.android.gms.fido.fido2.api.common;
import android.net.Uri;
+import androidx.annotation.NonNull;
/**
* An abstract class representing browser-based request parameters.
@@ -17,7 +18,9 @@ public abstract class BrowserRequestOptions extends RequestOptions {
/**
* Gets value of the client data hash.
*/
+ @NonNull
public abstract byte[] getClientDataHash();
+ @NonNull
public abstract Uri getOrigin();
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/COSEAlgorithmIdentifier.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/COSEAlgorithmIdentifier.java
index 326d44bd7c4057b9adbd01f936e1050de2961ec7..5279801a3edc9d464416b5906f913d577b801749 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/COSEAlgorithmIdentifier.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/COSEAlgorithmIdentifier.java
@@ -11,6 +11,7 @@ package com.google.android.gms.fido.fido2.api.common;
import android.os.Parcel;
import android.os.Parcelable;
+import androidx.annotation.NonNull;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -25,6 +26,7 @@ public class COSEAlgorithmIdentifier implements Parcelable {
this.algorithm = algorithm;
}
+ @NonNull
public static COSEAlgorithmIdentifier fromCoseValue(int value) throws UnsupportedAlgorithmIdentifierException {
if (value == RSAAlgorithm.LEGACY_RS1.getAlgoValue()) return new COSEAlgorithmIdentifier(RSAAlgorithm.RS1);
for (RSAAlgorithm algorithm : RSAAlgorithm.values()) {
@@ -41,6 +43,7 @@ public class COSEAlgorithmIdentifier implements Parcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("COSEAlgorithmIdentifier")
.value(algorithm)
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationData.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationData.java
index 23a06cb88e45f7130f089deaef3bff76ec88f303..fc50849731f340d4d9686929c52f5b9530b05c9a 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationData.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationData.java
@@ -5,17 +5,30 @@
package com.google.android.gms.fido.fido2.api.common;
-import org.microg.safeparcel.AutoSafeParcelable;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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;
-public class CableAuthenticationData extends AutoSafeParcelable {
+@SafeParcelable.Class
+public class CableAuthenticationData extends AbstractSafeParcelable {
@Field(1)
- private long version;
+ long version;
@Field(2)
- private byte[] clientEid;
+ @NonNull
+ byte[] clientEid;
@Field(3)
- private byte[] authenticatorEid;
+ @NonNull
+ byte[] authenticatorEid;
@Field(4)
- private byte[] sessionPreKey;
+ @NonNull
+ byte[] sessionPreKey;
- public static final Creator CREATOR = new AutoCreator<>(CableAuthenticationData.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(CableAuthenticationData.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationExtension.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationExtension.java
index 58d85b6e5727d9366fa764500bd613bfd5ec299b..74b4434ea3b2e87c76f1f74e9df2a099b6321694 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationExtension.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/CableAuthenticationExtension.java
@@ -5,13 +5,24 @@
package com.google.android.gms.fido.fido2.api.common;
-import org.microg.safeparcel.AutoSafeParcelable;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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 java.util.List;
-public class CableAuthenticationExtension extends AutoSafeParcelable {
+@SafeParcelable.Class
+public class CableAuthenticationExtension extends AbstractSafeParcelable {
@Field(1)
- private List cableAuthentication;
+ @NonNull
+ List cableAuthentication;
- public static final Creator CREATOR = new AutoCreator<>(CableAuthenticationExtension.class);
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(CableAuthenticationExtension.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/DevicePublicKeyStringDef.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/DevicePublicKeyStringDef.java
new file mode 100644
index 0000000000000000000000000000000000000000..e645621fda151f1048e6122f6c0a536864e1e74d
--- /dev/null
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/DevicePublicKeyStringDef.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.fido.fido2.api.common;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Enum values to be passed into DevicePublicKeyExtension. This tells the authenticator what to return for the DPK extension object.
+ *
+ * These values are placeholders until the final spec is determined. For now,
+ *
+ * - NONE is to not request a DPK.
+ * - DIRECT is to request a DPK.
+ * - INDIRECT has no function at this time.
+ *
+ */
+public @interface DevicePublicKeyStringDef {
+ @NonNull
+ String NONE = "none";
+ @NonNull
+ String INDIRECT = "indirect";
+ @NonNull
+ String DIRECT = "direct";
+}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ErrorCode.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ErrorCode.java
index 6c5c1ec3af14ebcbfb66a87e1a21a4a22ab0782e..1f69dc773094becdc5b25e3992d67b4c8083055e 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ErrorCode.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ErrorCode.java
@@ -11,6 +11,7 @@ package com.google.android.gms.fido.fido2.api.common;
import android.os.Parcel;
import android.os.Parcelable;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
/**
@@ -74,7 +75,7 @@ public enum ErrorCode implements Parcelable {
this.code = code;
}
- @PublicApi(exclude = true)
+ @Hide
public int getCode() {
return code;
}
@@ -89,7 +90,7 @@ public enum ErrorCode implements Parcelable {
dest.writeInt(code);
}
- @PublicApi(exclude = true)
+ @Hide
public static ErrorCode toErrorCode(int errorCode) throws UnsupportedErrorCodeException {
for (ErrorCode value : values()) {
if (value.code == errorCode) return value;
@@ -109,7 +110,7 @@ public enum ErrorCode implements Parcelable {
}
}
- @PublicApi(exclude = true)
+ @Hide
public static final Creator CREATOR = new Creator() {
@Override
public ErrorCode createFromParcel(Parcel source) {
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoAppIdExtension.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoAppIdExtension.java
index 0abbd7b02b16a621b491f474083fa40b9b9b2e02..d19d9b5e1795cd49b08053a3fcfa768ded237c22 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoAppIdExtension.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoAppIdExtension.java
@@ -8,8 +8,12 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -23,17 +27,21 @@ import java.util.Arrays;
* Note that this extension is only valid if used during the get() call; other usage should result in client error.
*/
@PublicApi
-public class FidoAppIdExtension extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class FidoAppIdExtension extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getAppId")
+ @NonNull
private String appId;
private FidoAppIdExtension() {
}
- public FidoAppIdExtension(String appId) {
+ @Constructor
+ public FidoAppIdExtension(@Param(2) @NonNull String appId) {
this.appId = appId;
}
+ @NonNull
public String getAppId() {
return appId;
}
@@ -53,5 +61,10 @@ public class FidoAppIdExtension extends AutoSafeParcelable {
return Arrays.hashCode(new Object[]{appId});
}
- public static final Creator CREATOR = new AutoCreator<>(FidoAppIdExtension.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(FidoAppIdExtension.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoCredentialDetails.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoCredentialDetails.java
new file mode 100644
index 0000000000000000000000000000000000000000..61c25b9d7a29ff2618132d9a6492214283a40c07
--- /dev/null
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/FidoCredentialDetails.java
@@ -0,0 +1,140 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.fido.fido2.api.common;
+
+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 com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+
+import java.util.Objects;
+
+/**
+ * Contains the attributes of a single FIDO credential that are returned to the caller in response to a
+ * {@link Fido2PrivilegedApiClient#getCredentialList(String)} call.
+ */
+@SafeParcelable.Class
+public class FidoCredentialDetails extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getUserName")
+ @Nullable
+ private String userName;
+ @Field(value = 2, getterName = "getUserDisplayName")
+ @Nullable
+ private String userDisplayName;
+ @Field(value = 3, getterName = "getUserId")
+ @Nullable
+ private byte[] userId;
+ @Field(value = 4, getterName = "getCredentialId")
+ @NonNull
+ private byte[] credentialId;
+ @Field(value = 5, getterName = "getIsDiscoverable")
+ private boolean discoverable;
+ @Field(value = 6, getterName = "getIsPaymentCredential")
+ private boolean paymentCredential;
+
+ private FidoCredentialDetails() {
+ }
+
+ @Constructor
+ FidoCredentialDetails(@Nullable @Param(1) String userName, @Nullable @Param(2) String userDisplayName, @Nullable @Param(3) byte[] userId, @NonNull @Param(4) byte[] credentialId, @Param(5) boolean discoverable, @Param(6) boolean paymentCredential) {
+ this.userName = userName;
+ this.userDisplayName = userDisplayName;
+ this.userId = userId;
+ this.credentialId = credentialId;
+ this.discoverable = discoverable;
+ this.paymentCredential = paymentCredential;
+ }
+
+ /**
+ * De-serializes the {@link FidoCredentialDetails} from bytes, reversing {@link #serializeToBytes()}.
+ *
+ * @return The deserialized {@link FidoCredentialDetails}.
+ */
+ @NonNull
+ public static FidoCredentialDetails deserializeFromBytes(@NonNull byte[] serializedBytes) {
+ return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
+ }
+
+ /**
+ * Returns the credential's credential ID.
+ */
+ @NonNull
+ public byte[] getCredentialId() {
+ return credentialId;
+ }
+
+ /**
+ * Returns true if the credential is discoverable.
+ */
+ public boolean getIsDiscoverable() {
+ return discoverable;
+ }
+
+ /**
+ * Returns true if the credential is for payments.
+ */
+ public boolean getIsPaymentCredential() {
+ return paymentCredential;
+ }
+
+ /**
+ * Returns the last used time in Unix Epoch Millis.
+ */
+ public long getLastUsedTime() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns the credential's user display name.
+ */
+ @Nullable
+ public String getUserDisplayName() {
+ return userDisplayName;
+ }
+
+ /**
+ * Returns the credential's user ID.
+ */
+ @Nullable
+ public byte[] getUserId() {
+ return userId;
+ }
+
+ /**
+ * Returns the credential's user name.
+ */
+ @Nullable
+ public String getUserName() {
+ return this.userName;
+ }
+
+ public int hashCode() {
+ return Objects.hashCode(new Object[]{this.userName, this.userDisplayName, this.userId, this.credentialId, this.discoverable, this.paymentCredential});
+ }
+
+ /**
+ * Serializes the {@link FidoCredentialDetails} to bytes. Use {@link #deserializeFromBytes(byte[])} to deserialize.
+ *
+ * @return the serialized byte array.
+ */
+ @NonNull
+ public byte[] serializeToBytes() {
+ return SafeParcelableSerializer.serializeToBytes(this);
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ CREATOR.writeToParcel(this, out, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(FidoCredentialDetails.class);
+}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredential.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredential.java
index f9d657b37c7be3b860bb7dc000bae8918f0cedb7..d7738066b81448940e5a48dbfea709c6003ed80a 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredential.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredential.java
@@ -8,9 +8,15 @@
package com.google.android.gms.fido.fido2.api.common;
+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 com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -19,30 +25,68 @@ import java.util.Arrays;
* assertion is requested.
*/
@PublicApi
-public class PublicKeyCredential extends AutoSafeParcelable {
- @Field(1)
+@SafeParcelable.Class
+public class PublicKeyCredential extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getId")
+ @NonNull
private String id;
- @Field(2)
+ @Field(value = 2, getterName = "getType")
+ @NonNull
private String type;
- @Field(3)
+ @Field(value = 3, getterName = "getRawId")
+ @NonNull
private byte[] rawId;
- @Field(4)
+ @Field(value = 4, getter = "$object.getResponse() instanceof $type ? ($type) $object.getResponse() : null")
+ @Nullable
private AuthenticatorAttestationResponse registerResponse;
- @Field(5)
+ @Field(value = 5, getter = "$object.getResponse() instanceof $type ? ($type) $object.getResponse() : null")
+ @Nullable
private AuthenticatorAssertionResponse signResponse;
- @Field(6)
+ @Field(value = 6, getter = "$object.getResponse() instanceof $type ? ($type) $object.getResponse() : null")
+ @Nullable
private AuthenticatorErrorResponse errorResponse;
- @Field(7)
+ @Field(value = 7, getterName = "getClientExtensionResults")
+ @Nullable
private AuthenticationExtensionsClientOutputs clientExtensionResults;
+ @Field(value = 8, getterName = "getAuthenticatorAttachment")
+ @Nullable
+ private String authenticatorAttachment;
+ PublicKeyCredential(@NonNull String id, @NonNull String type, @NonNull byte[] rawId, @NonNull AuthenticatorResponse response, @Nullable AuthenticationExtensionsClientOutputs clientExtensionResults, @Nullable String authenticatorAttachment) {
+ this(id, type, rawId, response instanceof AuthenticatorAttestationResponse ? (AuthenticatorAttestationResponse) response : null, response instanceof AuthenticatorAssertionResponse ? (AuthenticatorAssertionResponse) response : null, response instanceof AuthenticatorErrorResponse ? (AuthenticatorErrorResponse) response : null, clientExtensionResults, authenticatorAttachment);
+ }
+
+ @Constructor
+ PublicKeyCredential(@Param(1) @NonNull String id, @Param(2) @NonNull String type, @Param(3) @NonNull byte[] rawId, @Param(4) @Nullable AuthenticatorAttestationResponse registerResponse, @Param(5) @Nullable AuthenticatorAssertionResponse signResponse, @Param(6) @Nullable AuthenticatorErrorResponse errorResponse, @Param(7) @Nullable AuthenticationExtensionsClientOutputs clientExtensionResults, @Param(8) @Nullable String authenticatorAttachment) {
+ this.id = id;
+ this.type = type;
+ this.rawId = rawId;
+ this.registerResponse = registerResponse;
+ this.signResponse = signResponse;
+ this.errorResponse = errorResponse;
+ this.clientExtensionResults = clientExtensionResults;
+ this.authenticatorAttachment = authenticatorAttachment;
+ }
+
+ /**
+ * Returns the authenticator attachment of this credential.
+ */
+ @Nullable
+ public String getAuthenticatorAttachment() {
+ return authenticatorAttachment;
+ }
+
+ @Nullable
public AuthenticationExtensionsClientOutputs getClientExtensionResults() {
return clientExtensionResults;
}
+ @NonNull
public String getId() {
return id;
}
+ @NonNull
public byte[] getRawId() {
return rawId;
}
@@ -54,6 +98,7 @@ public class PublicKeyCredential extends AutoSafeParcelable {
throw new IllegalStateException("No response set.");
}
+ @NonNull
public String getType() {
return type;
}
@@ -62,10 +107,15 @@ public class PublicKeyCredential extends AutoSafeParcelable {
* Builder for {@link PublicKeyCredential}.
*/
public static class Builder {
+ @NonNull
private String id;
+ @NonNull
private byte[] rawId;
private AuthenticatorResponse response;
+ @Nullable
private AuthenticationExtensionsClientOutputs extensionsClientOutputs;
+ @Nullable
+ private String authenticatorAttachment;
/**
* The constructor of {@link PublicKeyCredential.Builder}.
@@ -76,15 +126,23 @@ public class PublicKeyCredential extends AutoSafeParcelable {
/**
* Sets the output produced by the client's processing of the extensions requested by the relying party.
*/
- public PublicKeyCredential.Builder setAuthenticationExtensionsClientOutputs(AuthenticationExtensionsClientOutputs extensionsClientOutputs) {
+ public Builder setAuthenticationExtensionsClientOutputs(@Nullable AuthenticationExtensionsClientOutputs extensionsClientOutputs) {
this.extensionsClientOutputs = extensionsClientOutputs;
return this;
}
+ /**
+ * Sets the authenticator attachment of the credential.
+ */
+ public Builder setAuthenticatorAttachment(@NonNull String authenticatorAttachment) {
+ this.authenticatorAttachment = authenticatorAttachment;
+ return this;
+ }
+
/**
* Sets the base64url encoding of the credential identifier.
*/
- public Builder setId(String id) {
+ public Builder setId(@NonNull String id) {
this.id = id;
return this;
}
@@ -92,7 +150,7 @@ public class PublicKeyCredential extends AutoSafeParcelable {
/**
* Sets the raw value of the credential identifier.
*/
- public Builder setRawId(byte[] rawId) {
+ public Builder setRawId(@NonNull byte[] rawId) {
this.rawId = rawId;
return this;
}
@@ -106,7 +164,7 @@ public class PublicKeyCredential extends AutoSafeParcelable {
* otherwise, the {@link PublicKeyCredential} was created in response to a sign request, and this attribute’s
* value will be an {@link AuthenticatorAssertionResponse}.
*/
- public Builder setResponse(AuthenticatorResponse response) {
+ public Builder setResponse(@NonNull AuthenticatorResponse response) {
this.response = response;
return this;
}
@@ -115,19 +173,7 @@ public class PublicKeyCredential extends AutoSafeParcelable {
* Builds the {@link PublicKeyCredential} object.
*/
public PublicKeyCredential build() {
- PublicKeyCredential credential = new PublicKeyCredential();
- credential.id = id;
- credential.type = PublicKeyCredentialType.PUBLIC_KEY.toString();
- credential.rawId = rawId;
- credential.clientExtensionResults = extensionsClientOutputs;
- if (response instanceof AuthenticatorAttestationResponse) {
- credential.registerResponse = (AuthenticatorAttestationResponse) response;
- } else if (response instanceof AuthenticatorAssertionResponse) {
- credential.signResponse = (AuthenticatorAssertionResponse) response;
- } else if (response instanceof AuthenticatorErrorResponse) {
- credential.errorResponse = (AuthenticatorErrorResponse) response;
- }
- return credential;
+ return new PublicKeyCredential(id, PublicKeyCredentialType.PUBLIC_KEY.toString(), rawId, response, extensionsClientOutputs, authenticatorAttachment);
}
}
@@ -141,17 +187,18 @@ public class PublicKeyCredential extends AutoSafeParcelable {
if (id != null ? !id.equals(that.id) : that.id != null) return false;
if (type != null ? !type.equals(that.type) : that.type != null) return false;
if (!Arrays.equals(rawId, that.rawId)) return false;
- if (registerResponse != null ? !registerResponse.equals(that.registerResponse) : that.registerResponse != null)
- return false;
+ if (registerResponse != null ? !registerResponse.equals(that.registerResponse) : that.registerResponse != null) return false;
if (signResponse != null ? !signResponse.equals(that.signResponse) : that.signResponse != null) return false;
- if (errorResponse != null ? !errorResponse.equals(that.errorResponse) : that.errorResponse != null)
+ if (errorResponse != null ? !errorResponse.equals(that.errorResponse) : that.errorResponse != null) return false;
+ if (clientExtensionResults != null ? !clientExtensionResults.equals(that.clientExtensionResults) : that.clientExtensionResults != null) return false;
+ if (authenticatorAttachment != null ? !authenticatorAttachment.equals(that.authenticatorAttachment) : that.authenticatorAttachment != null)
return false;
- return clientExtensionResults != null ? clientExtensionResults.equals(that.clientExtensionResults) : that.clientExtensionResults == null;
+ return true;
}
@Override
public int hashCode() {
- return Arrays.hashCode(new Object[]{id, type, rawId, signResponse, registerResponse, errorResponse, clientExtensionResults});
+ return Arrays.hashCode(new Object[]{id, type, rawId, signResponse, registerResponse, errorResponse, clientExtensionResults, authenticatorAttachment});
}
/**
@@ -159,6 +206,7 @@ public class PublicKeyCredential extends AutoSafeParcelable {
*
* @return the serialized byte array.
*/
+ @NonNull
public byte[] serializeToBytes() {
return SafeParcelableSerializer.serializeToBytes(this);
}
@@ -169,10 +217,16 @@ public class PublicKeyCredential extends AutoSafeParcelable {
* @param serializedBytes The serialized bytes.
* @return The deserialized {@link PublicKeyCredential}.
*/
+ @NonNull
public static PublicKeyCredential deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredential.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredential.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialCreationOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialCreationOptions.java
index 0b8096a6dbf40270cad2391969d7570afe05961b..13ab9ef951e72021d4ab2d47a2dfd23f406d5301 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialCreationOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialCreationOptions.java
@@ -5,7 +5,13 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -16,79 +22,119 @@ import java.util.List;
* This class is used to supply options when creating a new credential.
*/
@PublicApi
+@SafeParcelable.Class
public class PublicKeyCredentialCreationOptions extends RequestOptions {
- @Field(2)
+ @Field(value = 2, getterName = "getRp")
+ @NonNull
private PublicKeyCredentialRpEntity rp;
- @Field(3)
+ @Field(value = 3, getterName = "getUser")
+ @NonNull
private PublicKeyCredentialUserEntity user;
- @Field(4)
+ @Field(value = 4, getterName = "getChallenge")
+ @NonNull
private byte[] challenge;
- @Field(5)
+ @Field(value = 5, getterName = "getParameters")
+ @NonNull
private List parameters;
- @Field(6)
+ @Field(value = 6, getterName = "getTimeoutSeconds")
+ @Nullable
private Double timeoutSeconds;
- @Field(7)
+ @Field(value = 7, getterName = "getExcludeList")
+ @Nullable
private List excludeList;
- @Field(8)
+ @Field(value = 8, getterName = "getAuthenticatorSelection")
+ @Nullable
private AuthenticatorSelectionCriteria authenticatorSelection;
- @Field(9)
+ @Field(value = 9, getterName = "getRequestId")
+ @Nullable
private Integer requestId;
- @Field(10)
+ @Field(value = 10, getterName = "getTokenBinding")
+ @Nullable
private TokenBinding tokenBinding;
- @Field(11)
+ @Field(value = 11, getterName = "getAttestationConveyancePreference")
+ @Nullable
private AttestationConveyancePreference attestationConveyancePreference;
- @Field(12)
+ @Field(value = 12, getterName = "getAuthenticationExtensions")
+ @Nullable
private AuthenticationExtensions authenticationExtensions;
+ @Constructor
+ PublicKeyCredentialCreationOptions(@Param(2) @NonNull PublicKeyCredentialRpEntity rp, @Param(3) @NonNull PublicKeyCredentialUserEntity user, @Param(4) @NonNull byte[] challenge, @Param(5) @NonNull List parameters, @Param(6) @Nullable Double timeoutSeconds, @Param(7) @Nullable List excludeList, @Param(8) @Nullable AuthenticatorSelectionCriteria authenticatorSelection, @Param(9) @Nullable Integer requestId, @Param(10) @Nullable TokenBinding tokenBinding, @Param(11) @Nullable AttestationConveyancePreference attestationConveyancePreference, @Param(12) @Nullable AuthenticationExtensions authenticationExtensions) {
+ this.rp = rp;
+ this.user = user;
+ this.challenge = challenge;
+ this.parameters = parameters;
+ this.timeoutSeconds = timeoutSeconds;
+ this.excludeList = excludeList;
+ this.authenticatorSelection = authenticatorSelection;
+ this.requestId = requestId;
+ this.tokenBinding = tokenBinding;
+ this.attestationConveyancePreference = attestationConveyancePreference;
+ this.authenticationExtensions = authenticationExtensions;
+ }
+
+ @Nullable
public AttestationConveyancePreference getAttestationConveyancePreference() {
return attestationConveyancePreference;
}
+ @Nullable
public String getAttestationConveyancePreferenceAsString() {
+ if (attestationConveyancePreference == null) return null;
return attestationConveyancePreference.toString();
}
+ @Nullable
@Override
public AuthenticationExtensions getAuthenticationExtensions() {
return authenticationExtensions;
}
+ @Nullable
public AuthenticatorSelectionCriteria getAuthenticatorSelection() {
return authenticatorSelection;
}
+ @NonNull
@Override
public byte[] getChallenge() {
return challenge;
}
+ @Nullable
public List getExcludeList() {
return excludeList;
}
+ @NonNull
public List getParameters() {
return parameters;
}
+ @Nullable
@Override
public Integer getRequestId() {
return requestId;
}
+ @NonNull
public PublicKeyCredentialRpEntity getRp() {
return rp;
}
+ @Nullable
@Override
public Double getTimeoutSeconds() {
return timeoutSeconds;
}
+ @Nullable
@Override
public TokenBinding getTokenBinding() {
return tokenBinding;
}
+ @NonNull
public PublicKeyCredentialUserEntity getUser() {
return user;
}
@@ -141,16 +187,27 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* Builder for {@link PublicKeyCredentialCreationOptions}.
*/
public static class Builder {
+ @NonNull
private PublicKeyCredentialRpEntity rp;
+ @NonNull
private PublicKeyCredentialUserEntity user;
+ @NonNull
private byte[] challenge;
+ @NonNull
private List parameters;
+ @Nullable
private Double timeoutSeconds;
+ @Nullable
private List excludeList;
+ @Nullable
private AuthenticatorSelectionCriteria authenticatorSelection;
+ @Nullable
private Integer requestId;
+ @Nullable
private TokenBinding tokenBinding;
+ @Nullable
private AttestationConveyancePreference attestationConveyancePreference;
+ @Nullable
private AuthenticationExtensions authenticationExtensions;
/**
@@ -162,7 +219,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets the preference for obfuscation level of the returned attestation data.
*/
- public Builder setAttestationConveyancePreference(AttestationConveyancePreference attestationConveyancePreference) {
+ public Builder setAttestationConveyancePreference(@Nullable AttestationConveyancePreference attestationConveyancePreference) {
this.attestationConveyancePreference = attestationConveyancePreference;
return this;
}
@@ -171,7 +228,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* Sets additional extensions that may dictate some client behavior during an exchange with a connected
* authenticator.
*/
- public Builder setAuthenticationExtensions(AuthenticationExtensions authenticationExtensions) {
+ public Builder setAuthenticationExtensions(@Nullable AuthenticationExtensions authenticationExtensions) {
this.authenticationExtensions = authenticationExtensions;
return this;
}
@@ -179,7 +236,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets constraints on the type of authenticator that is acceptable for this session.
*/
- public Builder setAuthenticatorSelection(AuthenticatorSelectionCriteria authenticatorSelection) {
+ public Builder setAuthenticatorSelection(@Nullable AuthenticatorSelectionCriteria authenticatorSelection) {
this.authenticatorSelection = authenticatorSelection;
return this;
}
@@ -187,7 +244,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets the challenge to sign when generating the attestation for this request.
*/
- public Builder setChallenge(byte[] challenge) {
+ public Builder setChallenge(@NonNull byte[] challenge) {
this.challenge = challenge;
return this;
}
@@ -197,7 +254,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* authenticator with the relying party. This is often set to prevent re-registration of authenticators that
* the relying party has already registered on behalf of the user.
*/
- public Builder setExcludeList(List excludeList) {
+ public Builder setExcludeList(@Nullable List excludeList) {
this.excludeList = excludeList;
return this;
}
@@ -205,7 +262,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets the {@link PublicKeyCredentialParameters} that constrain the type of credential to generate.
*/
- public Builder setParameters(List parameters) {
+ public Builder setParameters(@NonNull List parameters) {
this.parameters = parameters;
return this;
}
@@ -214,7 +271,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* Sets the request id in order to link together events into a single session (the span of events between the
* time that the server initiates a single FIDO2 request to the client and receives reply) on a single device.
*/
- public Builder setRequestId(Integer requestId) {
+ public Builder setRequestId(@Nullable Integer requestId) {
this.requestId = requestId;
return this;
}
@@ -226,7 +283,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* context (aka https connection). Apps-facing API needs to check the package signature against Digital Asset
* Links, whose resource is the RP ID with prepended "//". Privileged (browser) API doesn't need the check.
*/
- public Builder setRp(PublicKeyCredentialRpEntity rp) {
+ public Builder setRp(@NonNull PublicKeyCredentialRpEntity rp) {
this.rp = rp;
return this;
}
@@ -234,7 +291,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets a timeout that limits the duration of the registration session provided to the user.
*/
- public Builder setTimeoutSeconds(Double timeoutSeconds) {
+ public Builder setTimeoutSeconds(@Nullable Double timeoutSeconds) {
this.timeoutSeconds = timeoutSeconds;
return this;
}
@@ -242,7 +299,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets the {@link TokenBinding} associated with the calling origin.
*/
- public Builder setTokenBinding(TokenBinding tokenBinding) {
+ public Builder setTokenBinding(@Nullable TokenBinding tokenBinding) {
this.tokenBinding = tokenBinding;
return this;
}
@@ -250,7 +307,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
/**
* Sets information about the user on whose behalf the relying party is registering a credential.
*/
- public Builder setUser(PublicKeyCredentialUserEntity user) {
+ public Builder setUser(@NonNull PublicKeyCredentialUserEntity user) {
this.user = user;
return this;
}
@@ -259,13 +316,7 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* Builds the {@link PublicKeyCredentialCreationOptions} object.
*/
public PublicKeyCredentialCreationOptions build() {
- PublicKeyCredentialCreationOptions options = new PublicKeyCredentialCreationOptions();
- options.challenge = challenge;
- options.timeoutSeconds = timeoutSeconds;
- options.requestId = requestId;
- options.tokenBinding = tokenBinding;
- options.authenticationExtensions = authenticationExtensions;
- return options;
+ return new PublicKeyCredentialCreationOptions(rp, user, challenge, parameters, timeoutSeconds, excludeList, authenticatorSelection, requestId, tokenBinding, attestationConveyancePreference, authenticationExtensions);
}
}
@@ -275,10 +326,16 @@ public class PublicKeyCredentialCreationOptions extends RequestOptions {
* @param serializedBytes The serialized bytes.
* @return The deserialized {@link PublicKeyCredentialCreationOptions}.
*/
+ @NonNull
public static PublicKeyCredentialCreationOptions deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialCreationOptions.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialCreationOptions.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialDescriptor.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialDescriptor.java
index e2d2f66b7787f84d097c95be8d9d27aad1454af6..5067145fa1bc1b581846134aabf527a1e21e9975 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialDescriptor.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialDescriptor.java
@@ -8,11 +8,15 @@
package com.google.android.gms.fido.fido2.api.common;
+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 com.google.android.gms.fido.common.Transport;
-
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
import java.util.List;
@@ -22,18 +26,22 @@ import java.util.List;
* parameter to the registration or authentication method.
*/
@PublicApi
-public class PublicKeyCredentialDescriptor extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class PublicKeyCredentialDescriptor extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getType")
+ @NonNull
private PublicKeyCredentialType type;
- @Field(3)
+ @Field(value = 3, getterName = "getId")
+ @NonNull
private byte[] id;
- @Field(4)
+ @Field(value = 4, getterName = "getTransports")
+ @Nullable
private List transports;
private PublicKeyCredentialDescriptor() {
}
- public PublicKeyCredentialDescriptor(String type, byte[] id, List transports) {
+ public PublicKeyCredentialDescriptor(@NonNull String type, @NonNull byte[] id, @Nullable List transports) {
try {
this.type = PublicKeyCredentialType.fromString(type);
} catch (PublicKeyCredentialType.UnsupportedPublicKeyCredTypeException e) {
@@ -43,18 +51,29 @@ public class PublicKeyCredentialDescriptor extends AutoSafeParcelable {
this.transports = transports;
}
+ @Constructor
+ PublicKeyCredentialDescriptor(@Param(2) @NonNull PublicKeyCredentialType type, @Param(3) @NonNull byte[] id, @Param(4) @Nullable List transports) {
+ this.type = type;
+ this.id = id;
+ this.transports = transports;
+ }
+
+ @NonNull
public byte[] getId() {
return id;
}
+ @Nullable
public List getTransports() {
return transports;
}
+ @NonNull
public PublicKeyCredentialType getType() {
return type;
}
+ @NonNull
public String getTypeAsString() {
return type.toString();
}
@@ -77,6 +96,7 @@ public class PublicKeyCredentialDescriptor extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("PublicKeyCredentialDescriptor")
.value(id)
@@ -98,5 +118,10 @@ public class PublicKeyCredentialDescriptor extends AutoSafeParcelable {
}
}
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialDescriptor.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialDescriptor.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialParameters.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialParameters.java
index e0914c570bf411ba7293ccb7540bfc84e2f010a5..0f4c6603014a847576297dd0bb53135a7ad31b3b 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialParameters.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialParameters.java
@@ -8,9 +8,14 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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 org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -18,16 +23,19 @@ import java.util.Arrays;
* This class supplies additional parameters when creating a new credential.
*/
@PublicApi
-public class PublicKeyCredentialParameters extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class PublicKeyCredentialParameters extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getType")
+ @NonNull
private PublicKeyCredentialType type;
- @Field(3)
+ @Field(value = 3, getterName = "getAlgorithm")
+ @NonNull
private COSEAlgorithmIdentifier algorithm;
private PublicKeyCredentialParameters() {
}
- public PublicKeyCredentialParameters(String type, int algorithm) {
+ public PublicKeyCredentialParameters(@NonNull String type, int algorithm) {
try {
this.type = PublicKeyCredentialType.fromString(type);
} catch (PublicKeyCredentialType.UnsupportedPublicKeyCredTypeException e) {
@@ -40,6 +48,13 @@ public class PublicKeyCredentialParameters extends AutoSafeParcelable {
}
}
+ @Constructor
+ PublicKeyCredentialParameters(@Param(2) @NonNull PublicKeyCredentialType type, @Param(3) @NonNull COSEAlgorithmIdentifier algorithm) {
+ this.type = type;
+ this.algorithm = algorithm;
+ }
+
+ @NonNull
public COSEAlgorithmIdentifier getAlgorithm() {
return algorithm;
}
@@ -48,10 +63,12 @@ public class PublicKeyCredentialParameters extends AutoSafeParcelable {
return algorithm.toCoseValue();
}
+ @NonNull
public PublicKeyCredentialType getType() {
return type;
}
+ @NonNull
public String getTypeAsString() {
return type.toString();
}
@@ -73,6 +90,7 @@ public class PublicKeyCredentialParameters extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("PublicKeyCredentialParameters")
.field("type", type)
@@ -80,6 +98,11 @@ public class PublicKeyCredentialParameters extends AutoSafeParcelable {
.end();
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialParameters.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialParameters.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRequestOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRequestOptions.java
index 267043b007c11bdd06d736f6e57a36ed590883cb..df3069c2883a0c15e348f27180313a2af23d8dac 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRequestOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRequestOptions.java
@@ -8,7 +8,13 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
@@ -19,58 +25,90 @@ import java.util.List;
* This class is used to supply an authentication request with the data it needs to generate an assertion.
*/
@PublicApi
+@SafeParcelable.Class
public class PublicKeyCredentialRequestOptions extends RequestOptions {
- @Field(2)
+ @Field(value = 2, getterName = "getChallenge")
+ @NonNull
private byte[] challenge;
- @Field(3)
+ @Field(value = 3, getterName = "getTimeoutSeconds")
+ @Nullable
private Double timeoutSeconds;
- @Field(4)
+ @Field(value = 4, getterName = "getRpId")
+ @NonNull
private String rpId;
- @Field(5)
+ @Field(value = 5, getterName = "getAllowList")
+ @Nullable
private List allowList;
- @Field(6)
+ @Field(value = 6, getterName = "getRequestId")
+ @Nullable
private Integer requestId;
- @Field(7)
+ @Field(value = 7, getterName = "getTokenBinding")
+ @Nullable
private TokenBinding tokenBinding;
- @Field(8)
+ @Field(value = 8, getterName = "getRequireUserVerification")
+ @Nullable
private UserVerificationRequirement requireUserVerification;
- @Field(9)
+ @Field(value = 9, getterName = "getAuthenticationExtensions")
+ @Nullable
private AuthenticationExtensions authenticationExtensions;
+ @Field(10)
+ @Nullable
+ Long longRequestId;
+ @Constructor
+ public PublicKeyCredentialRequestOptions(@Param(2)@NonNull byte[] challenge,@Param(3) @Nullable Double timeoutSeconds, @Param(4)@NonNull String rpId, @Param(5)@Nullable List allowList,@Param(6) @Nullable Integer requestId,@Param(7) @Nullable TokenBinding tokenBinding,@Param(8) @Nullable UserVerificationRequirement requireUserVerification, @Param(9)@Nullable AuthenticationExtensions authenticationExtensions) {
+ this.challenge = challenge;
+ this.timeoutSeconds = timeoutSeconds;
+ this.rpId = rpId;
+ this.allowList = allowList;
+ this.requestId = requestId;
+ this.tokenBinding = tokenBinding;
+ this.requireUserVerification = requireUserVerification;
+ this.authenticationExtensions = authenticationExtensions;
+ }
+
+ @Nullable
public List getAllowList() {
return allowList;
}
@Override
+ @Nullable
public AuthenticationExtensions getAuthenticationExtensions() {
return authenticationExtensions;
}
- @PublicApi(exclude = true)
+ @Hide
+ @Nullable
public UserVerificationRequirement getRequireUserVerification() {
return requireUserVerification;
}
@Override
+ @NonNull
public byte[] getChallenge() {
return challenge;
}
@Override
+ @Nullable
public Integer getRequestId() {
return requestId;
}
+ @NonNull
public String getRpId() {
return rpId;
}
@Override
+ @Nullable
public Double getTimeoutSeconds() {
return timeoutSeconds;
}
@Override
+ @Nullable
public TokenBinding getTokenBinding() {
return tokenBinding;
}
@@ -99,6 +137,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("PublicKeyCredentialRequestOptions")
.field("challenge", challenge)
@@ -116,12 +155,19 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* Builder for {@link PublicKeyCredentialRequestOptions}.
*/
public static class Builder {
+ @NonNull
private byte[] challenge;
+ @Nullable
private Double timeoutSeconds;
+ @NonNull
private String rpId;
+ @Nullable
private List allowList;
+ @Nullable
private Integer requestId;
+ @Nullable
private TokenBinding tokenBinding;
+ @Nullable
private AuthenticationExtensions authenticationExtensions;
/**
@@ -134,7 +180,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* Sets a list of public key credentials which constrain authentication to authenticators that contain a
* private key for at least one of the supplied public keys.
*/
- public Builder setAllowList(List allowList) {
+ public Builder setAllowList(@Nullable List allowList) {
this.allowList = allowList;
return this;
}
@@ -143,7 +189,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* Sets additional extensions that may dictate some client behavior during an exchange with a connected
* authenticator.
*/
- public Builder setAuthenticationExtensions(AuthenticationExtensions authenticationExtensions) {
+ public Builder setAuthenticationExtensions(@Nullable AuthenticationExtensions authenticationExtensions) {
this.authenticationExtensions = authenticationExtensions;
return this;
}
@@ -152,7 +198,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* Sets the nonce value that the authenticator should sign using a private key corresponding to a public key
* credential that is acceptable for this authentication session.
*/
- public Builder setChallenge(byte[] challenge) {
+ public Builder setChallenge(@NonNull byte[] challenge) {
this.challenge = challenge;
return this;
}
@@ -162,7 +208,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* time that the server initiates a single FIDO2 request to the client and receives reply) on a single device.
* This field is optional.
*/
- public Builder setRequestId(Integer requestId) {
+ public Builder setRequestId(@Nullable Integer requestId) {
this.requestId = requestId;
return this;
}
@@ -176,12 +222,12 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* context (aka https connection). Apps-facing API needs to check the package signature against Digital Asset
* Links, whose resource is the RP ID with prepended "//". Privileged (browser) API doesn't need the check.
*/
- public Builder setRpId(String rpId) {
+ public Builder setRpId(@NonNull String rpId) {
this.rpId = rpId;
return this;
}
- public Builder setTimeoutSeconds(Double timeoutSeconds) {
+ public Builder setTimeoutSeconds(@Nullable Double timeoutSeconds) {
this.timeoutSeconds = timeoutSeconds;
return this;
}
@@ -189,7 +235,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
/**
* Sets the {@link TokenBinding} associated with the calling origin.
*/
- public Builder setTokenBinding(TokenBinding tokenBinding) {
+ public Builder setTokenBinding(@Nullable TokenBinding tokenBinding) {
this.tokenBinding = tokenBinding;
return this;
}
@@ -198,15 +244,7 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* Builds the {@link PublicKeyCredentialRequestOptions} object.
*/
public PublicKeyCredentialRequestOptions build() {
- PublicKeyCredentialRequestOptions options = new PublicKeyCredentialRequestOptions();
- options.challenge = challenge;
- options.timeoutSeconds = timeoutSeconds;
- options.rpId = rpId;
- options.allowList = allowList;
- options.requestId = requestId;
- options.tokenBinding = tokenBinding;
- options.authenticationExtensions = authenticationExtensions;
- return options;
+ return new PublicKeyCredentialRequestOptions(challenge, timeoutSeconds, rpId, allowList, requestId, tokenBinding, null, authenticationExtensions);
}
}
@@ -216,10 +254,16 @@ public class PublicKeyCredentialRequestOptions extends RequestOptions {
* @param serializedBytes The serialized bytes.
* @return The deserialized {@link PublicKeyCredentialRequestOptions}.
*/
+ @NonNull
public static PublicKeyCredentialRequestOptions deserializeFromBytes(byte[] serializedBytes) {
return SafeParcelableSerializer.deserializeFromBytes(serializedBytes, CREATOR);
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialRequestOptions.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialRequestOptions.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRpEntity.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRpEntity.java
index e1a98009016fe012b6cd94782945cec59cf58aed..4f83728910ebd736aaf1366d5a2b3f3844ff4474 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRpEntity.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialRpEntity.java
@@ -5,9 +5,15 @@
package com.google.android.gms.fido.fido2.api.common;
+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;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -15,31 +21,39 @@ import java.util.Arrays;
* Represents the information about a relying party with which a credential is associated.
*/
@PublicApi
-public class PublicKeyCredentialRpEntity extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class PublicKeyCredentialRpEntity extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getId")
+ @NonNull
private String id;
- @Field(3)
+ @Field(value = 3, getterName = "getName")
+ @NonNull
private String name;
- @Field(4)
+ @Field(value = 4, getterName = "getIcon")
+ @Nullable
private String icon;
private PublicKeyCredentialRpEntity() {
}
- public PublicKeyCredentialRpEntity(String id, String name, String icon) {
+ @Constructor
+ public PublicKeyCredentialRpEntity(@Param(2)@NonNull String id, @Param(3)@NonNull String name, @Param(4)@Nullable String icon) {
this.id = id;
this.name = name;
this.icon = icon;
}
+ @Nullable
public String getIcon() {
return icon;
}
+ @NonNull
public String getId() {
return id;
}
+ @NonNull
public String getName() {
return name;
}
@@ -62,6 +76,7 @@ public class PublicKeyCredentialRpEntity extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("PublicKeyCredentialRpEntity")
.value(id)
@@ -70,6 +85,11 @@ public class PublicKeyCredentialRpEntity extends AutoSafeParcelable {
.end();
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialRpEntity.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialRpEntity.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialType.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialType.java
index d3bd336d6f721720921437b24e8c299ac184958d..1d68e875512ffc1bcfbe433198fd66f5c1a77c33 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialType.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialType.java
@@ -11,6 +11,8 @@ package com.google.android.gms.fido.fido2.api.common;
import android.os.Parcel;
import android.os.Parcelable;
+import androidx.annotation.NonNull;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
/**
@@ -26,6 +28,7 @@ public enum PublicKeyCredentialType implements Parcelable {
}
@Override
+ @NonNull
public String toString() {
return value;
}
@@ -40,7 +43,7 @@ public enum PublicKeyCredentialType implements Parcelable {
dest.writeString(toString());
}
- @PublicApi(exclude = true)
+ @Hide
public static PublicKeyCredentialType fromString(String type) throws UnsupportedPublicKeyCredTypeException {
for (PublicKeyCredentialType value : values()) {
if (value.value.equals(type)) return value;
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialUserEntity.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialUserEntity.java
index 93b88efb538a570df812589520dea80535038e6a..0470ea279afcc624706603987086d4912288c38c 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialUserEntity.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/PublicKeyCredentialUserEntity.java
@@ -8,9 +8,15 @@
package com.google.android.gms.fido.fido2.api.common;
+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;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -18,38 +24,48 @@ import java.util.Arrays;
* This class is used to supply additional parameters about the user account when creating a new Credential.
*/
@PublicApi
-public class PublicKeyCredentialUserEntity extends AutoSafeParcelable {
- @Field(2)
+@SafeParcelable.Class
+public class PublicKeyCredentialUserEntity extends AbstractSafeParcelable {
+ @Field(value = 2, getterName = "getId")
+ @NonNull
private byte[] id;
- @Field(3)
+ @Field(value = 3, getterName = "getName")
+ @NonNull
private String name;
- @Field(4)
+ @Field(value = 4, getterName = "getIcon")
+ @Nullable
private String icon;
- @Field(5)
+ @Field(value = 5, getterName = "getDisplayName")
+ @NonNull
private String displayName;
private PublicKeyCredentialUserEntity() {
}
- public PublicKeyCredentialUserEntity(byte[] id, String name, String icon, String displayName) {
+ @Constructor
+ public PublicKeyCredentialUserEntity(@Param(2) @NonNull byte[] id, @Param(3) @NonNull String name, @Param(4) @Nullable String icon, @Param(5) @NonNull String displayName) {
this.id = id;
this.name = name;
this.icon = icon;
this.displayName = displayName;
}
+ @NonNull
public String getDisplayName() {
return displayName;
}
+ @Nullable
public String getIcon() {
return icon;
}
+ @NonNull
public byte[] getId() {
return id;
}
+ @NonNull
public String getName() {
return name;
}
@@ -73,6 +89,7 @@ public class PublicKeyCredentialUserEntity extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("PublicKeyCredentialUserEntity")
.value(id)
@@ -82,6 +99,11 @@ public class PublicKeyCredentialUserEntity extends AutoSafeParcelable {
.end();
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(PublicKeyCredentialUserEntity.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PublicKeyCredentialUserEntity.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RSAAlgorithm.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RSAAlgorithm.java
index d3a9f729105957007d0ea62ea0cb739f43b5e610..da4feb37ac23c7d1fd2ef66f6d908739fa9f86a7 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RSAAlgorithm.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RSAAlgorithm.java
@@ -14,7 +14,7 @@ import org.microg.gms.common.PublicApi;
* Algorithm names and COSE identifiers for RSA (public) keys.
*/
@PublicApi
-public enum RSAAlgorithm implements Algorithm{
+public enum RSAAlgorithm implements Algorithm {
/**
* RSASSA-PKCS1-v1_5 w/ SHA-256
*/
@@ -29,6 +29,7 @@ public enum RSAAlgorithm implements Algorithm{
RS512(-259),
/**
* The legacy value for "RSASSA-PKCS1-v1_5 w/ SHA-1"
+ *
* @deprecated please use {@link #RS1} instead.
*/
@Deprecated
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RequestOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RequestOptions.java
index 94bd9190432dee6358467fe449cc112f0c2c2c25..98785c03968fd27d08db9573a262da30f84ec97c 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RequestOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/RequestOptions.java
@@ -8,24 +8,32 @@
package com.google.android.gms.fido.fido2.api.common;
+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.SafeParcelableSerializer;
import org.microg.gms.common.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
/**
* An abstract class representing FIDO2 request options.
*/
@PublicApi
-public abstract class RequestOptions extends AutoSafeParcelable {
+public abstract class RequestOptions extends AbstractSafeParcelable {
+ @NonNull
public abstract byte[] getChallenge();
+ @Nullable
public abstract Double getTimeoutSeconds();
+ @Nullable
public abstract Integer getRequestId();
+ @Nullable
public abstract TokenBinding getTokenBinding();
+ @Nullable
public abstract AuthenticationExtensions getAuthenticationExtensions();
/**
* Serializes the {@link RequestOptions} to bytes. Use deserializeFromBytes(byte[]) to deserialize.
*/
+ @NonNull
public byte[] serializeToBytes() {
return SafeParcelableSerializer.serializeToBytes(this);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ResidentKeyRequirement.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ResidentKeyRequirement.java
new file mode 100644
index 0000000000000000000000000000000000000000..84dfa5e2785f151311e367adeb88abfc0b4bb8fb
--- /dev/null
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/ResidentKeyRequirement.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.fido.fido2.api.common;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+
+/**
+ * An enum that describes the Resident Key (Discoverable Credential) requirements.
+ *
+ * According to WebAuthn, this structure describes the Relying Party's requirements for client-side discoverable credentials
+ * (formerly known as resident credentials or resident keys):
+ *
+ * If the resident key requirement is set to "required", then the Relying Party requires a client-side discoverable credential
+ * and is prepared to receive an error if it can't be created. If the resident key requirement is set to "preferred", the Relying
+ * party strongly prefers a client-side discoverable credential but will accept a server-side credential. If the resident key
+ * requirement is set to "discouraged" then a server-side credential is preferable, but will accept a client-side discoverable
+ * credential.
+ */
+public enum ResidentKeyRequirement implements Parcelable {
+ RESIDENT_KEY_DISCOURAGED("discouraged"),
+ RESIDENT_KEY_PREFERRED("preferred"),
+ RESIDENT_KEY_REQUIRED("required");
+
+ private final String requirement;
+
+ ResidentKeyRequirement(String requirement) {
+ this.requirement = requirement;
+ }
+
+ @NonNull
+ public static ResidentKeyRequirement fromString(@NonNull String requirement) throws UnsupportedResidentKeyRequirementException {
+ for (ResidentKeyRequirement value : values()) {
+ if (requirement.equals(value.requirement)) return value;
+ }
+ throw new UnsupportedResidentKeyRequirementException(requirement);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return requirement;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeString(requirement);
+ }
+
+ public static Creator CREATOR = new Creator() {
+ @Override
+ public ResidentKeyRequirement createFromParcel(Parcel source) {
+ try {
+ return ResidentKeyRequirement.fromString(source.readString());
+ } catch (UnsupportedResidentKeyRequirementException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public ResidentKeyRequirement[] newArray(int size) {
+ return new ResidentKeyRequirement[size];
+ }
+ };
+
+ /**
+ * Exception thrown when an unsupported or unrecognized resident key requirement is encountered.
+ */
+ public static class UnsupportedResidentKeyRequirementException extends Exception {
+ public UnsupportedResidentKeyRequirementException(@NonNull String requirement) {
+ super("Resident key requirement " + requirement + " not supported");
+ }
+ }
+}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/TokenBinding.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/TokenBinding.java
index bd35485e5f76699b17f5fcbd6db6504049b967e3..3cfc0a3fbb7079ae395742def66134bc0f3140e9 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/TokenBinding.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/TokenBinding.java
@@ -10,12 +10,16 @@ package com.google.android.gms.fido.fido2.api.common;
import android.os.Parcel;
import android.os.Parcelable;
-
+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.json.JSONException;
import org.json.JSONObject;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
import org.microg.gms.utils.ToStringHelper;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -23,19 +27,24 @@ import java.util.Arrays;
* Represents the Token binding information provided by the relying party.
*/
@PublicApi
-public class TokenBinding extends AutoSafeParcelable {
+@SafeParcelable.Class
+public class TokenBinding extends AbstractSafeParcelable {
/**
* A singleton instance representing that token binding is not supported by the client.
*/
+ @NonNull
public static final TokenBinding NOT_SUPPORTED = new TokenBinding(TokenBindingStatus.NOT_SUPPORTED, null);
/**
* A singleton instance representing that token binding is supported by the client, but unused by the relying party.
*/
+ @NonNull
public static final TokenBinding SUPPORTED = new TokenBinding(TokenBindingStatus.SUPPORTED, null);
- @Field(2)
+ @Field(value = 2, getterName = "getTokenBindingStatus")
+ @NonNull
private TokenBindingStatus status;
- @Field(3)
+ @Field(value = 3, getterName = "getTokenBindingId")
+ @Nullable
private String tokenBindingId;
private TokenBinding() {
@@ -44,12 +53,13 @@ public class TokenBinding extends AutoSafeParcelable {
/**
* Constructs an instance of a {@link TokenBinding} for a provided token binding id.
*/
- public TokenBinding(String tokenBindingId) {
+ public TokenBinding(@Nullable String tokenBindingId) {
status = TokenBindingStatus.PRESENT;
this.tokenBindingId = tokenBindingId;
}
- private TokenBinding(TokenBindingStatus status, String tokenBindingId) {
+ @Constructor
+ TokenBinding(@Param(2) @NonNull TokenBindingStatus status, @Param(3) @Nullable String tokenBindingId) {
this.status = status;
this.tokenBindingId = tokenBindingId;
}
@@ -57,13 +67,21 @@ public class TokenBinding extends AutoSafeParcelable {
/**
* Returns the token binding ID if the token binding status is {@code PRESENT}, otherwise returns null.
*/
+ @Nullable
public String getTokenBindingId() {
return tokenBindingId;
}
+ @Hide
+ @NonNull
+ public TokenBindingStatus getTokenBindingStatus() {
+ return status;
+ }
+
/**
* Returns the stringified {@link TokenBinding.TokenBindingStatus} associated with this instance.
*/
+ @NonNull
public String getTokenBindingStatusAsString() {
return status.toString();
}
@@ -96,6 +114,7 @@ public class TokenBinding extends AutoSafeParcelable {
}
@Override
+ @NonNull
public String toString() {
return ToStringHelper.name("TokenBinding")
.value(tokenBindingId)
@@ -119,13 +138,15 @@ public class TokenBinding extends AutoSafeParcelable {
* The client does not support token binding.
*/
NOT_SUPPORTED("not-supported");
- private String value;
- TokenBindingStatus(String value) {
+ @NonNull
+ private final String value;
+
+ TokenBindingStatus(@NonNull String value) {
this.value = value;
}
- @PublicApi(exclude = true)
+ @Hide
public static TokenBindingStatus fromString(String str) throws UnsupportedTokenBindingStatusException {
for (TokenBindingStatus value : values()) {
if (value.value.equals(str)) return value;
@@ -160,6 +181,7 @@ public class TokenBinding extends AutoSafeParcelable {
};
@Override
+ @NonNull
public String toString() {
return value;
}
@@ -174,6 +196,11 @@ public class TokenBinding extends AutoSafeParcelable {
}
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(TokenBinding.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(TokenBinding.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationMethodExtension.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationMethodExtension.java
index d537142fd0e707be4a96e7913c7ac1ee70ef1850..7a5b62428872c95b676be3b654170e8cff9c42fc 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationMethodExtension.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationMethodExtension.java
@@ -8,8 +8,12 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -22,10 +26,18 @@ import java.util.Arrays;
* Note that this extension can be used in only sign calls.
*/
@PublicApi
-public class UserVerificationMethodExtension extends AutoSafeParcelable {
- @Field(1)
+@SafeParcelable.Class
+public class UserVerificationMethodExtension extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getUvm")
+ @NonNull
private boolean uvm;
+ @Constructor
+ UserVerificationMethodExtension(@Param(1) boolean uvm) {
+ this.uvm = uvm;
+ }
+
+ @NonNull
public boolean getUvm() {
return uvm;
}
@@ -45,5 +57,10 @@ public class UserVerificationMethodExtension extends AutoSafeParcelable {
return Arrays.hashCode(new Object[]{uvm});
}
- public static final Creator CREATOR = new AutoCreator<>(UserVerificationMethodExtension.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(UserVerificationMethodExtension.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationRequirement.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationRequirement.java
index 1bba395c9731c72a8aa263ef4c251c898f280b7b..6fda81b5004714dec806667fbe33f1801b372583 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationRequirement.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UserVerificationRequirement.java
@@ -8,6 +8,7 @@ package com.google.android.gms.fido.fido2.api.common;
import android.os.Parcel;
import android.os.Parcelable;
+import org.microg.gms.common.Hide;
import org.microg.gms.common.PublicApi;
public enum UserVerificationRequirement implements Parcelable {
@@ -36,7 +37,7 @@ public enum UserVerificationRequirement implements Parcelable {
dest.writeString(toString());
}
- @PublicApi(exclude = true)
+ @Hide
public static UserVerificationRequirement fromString(String attachment) throws UnsupportedUserVerificationRequirementException {
for (UserVerificationRequirement value : values()) {
if (value.value.equals(attachment)) return value;
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntries.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntries.java
index 5a6d41bf48353191022cede90b6dd3e9782340ec..ab6f2fdfdf390370f7a5da57657f1a2fd63ee0bb 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntries.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntries.java
@@ -8,8 +8,14 @@
package com.google.android.gms.fido.fido2.api.common;
+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;
import org.microg.gms.common.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -20,14 +26,22 @@ import java.util.List;
* Represents up to three user verification methods used by the authenticator.
*/
@PublicApi
-public class UvmEntries extends AutoSafeParcelable {
- @Field(1)
+@SafeParcelable.Class
+public class UvmEntries extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getUvmEntryList")
+ @Nullable
private List uvmEntryList;
+ @Nullable
public List getUvmEntryList() {
return uvmEntryList;
}
+ @Constructor
+ UvmEntries(@Param(1) @Nullable List uvmEntryList) {
+ this.uvmEntryList = uvmEntryList;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -57,25 +71,29 @@ public class UvmEntries extends AutoSafeParcelable {
public Builder() {
}
- public Builder addAll(List uvmEntryList) {
+ public Builder addAll(@NonNull List uvmEntryList) {
if (this.uvmEntryList.size() + uvmEntryList.size() > 3) throw new IllegalStateException();
this.uvmEntryList.addAll(uvmEntryList);
return this;
}
- public Builder addUvmEntry(UvmEntry uvmEntry) {
+ public Builder addUvmEntry(@Nullable UvmEntry uvmEntry) {
if (uvmEntryList.size() >= 3) throw new IllegalStateException();
uvmEntryList.add(uvmEntry);
return this;
}
+ @NonNull
public UvmEntries build() {
- UvmEntries uvmEntries = new UvmEntries();
- uvmEntries.uvmEntryList = new ArrayList<>(uvmEntryList);
- return uvmEntries;
+ return new UvmEntries(new ArrayList<>(uvmEntryList));
}
}
- @PublicApi(exclude = true)
- public static Creator CREATOR = new AutoCreator<>(UvmEntries.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static SafeParcelableCreatorAndWriter CREATOR = findCreator(UvmEntries.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntry.java b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntry.java
index 1f8e5d3d26e0478397bba70672e499ba018db5dd..f933048318d3744cb5324c7ba00ea7a6f529b092 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntry.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/fido2/api/common/UvmEntry.java
@@ -8,8 +8,13 @@
package com.google.android.gms.fido.fido2.api.common;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+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 org.microg.gms.common.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
import java.util.Arrays;
@@ -17,14 +22,22 @@ import java.util.Arrays;
* Represents a single User Verification Method Entry
*/
@PublicApi
-public class UvmEntry extends AutoSafeParcelable {
- @Field(1)
+@SafeParcelable.Class
+public class UvmEntry extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getUserVerificationMethod")
private int userVerificationMethod;
- @Field(2)
+ @Field(value = 2, getterName = "getKeyProtectionType")
private short keyProtectionType;
- @Field(3)
+ @Field(value = 3, getterName = "getMatcherProtectionType")
private short matcherProtectionType;
+ @Constructor
+ UvmEntry(@Param(1) int userVerificationMethod, @Param(2) short keyProtectionType, @Param(3) short matcherProtectionType) {
+ this.userVerificationMethod = userVerificationMethod;
+ this.keyProtectionType = keyProtectionType;
+ this.matcherProtectionType = matcherProtectionType;
+ }
+
public int getUserVerificationMethod() {
return userVerificationMethod;
}
@@ -78,14 +91,15 @@ public class UvmEntry extends AutoSafeParcelable {
}
public UvmEntry build() {
- UvmEntry entry = new UvmEntry();
- entry.userVerificationMethod = userVerificationMethod;
- entry.keyProtectionType = keyProtectionType;
- entry.matcherProtectionType = matcherProtectionType;
- return entry;
+ return new UvmEntry(userVerificationMethod, keyProtectionType, matcherProtectionType);
}
}
- @PublicApi(exclude = true)
- public static final Creator CREATOR = new AutoCreator<>(UvmEntry.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ @Hide
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(UvmEntry.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceDirectTransferResult.java b/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceDirectTransferResult.java
index 4ab8c58a457950a42329c5687ae3496439c5a3a5..ae8aa5973cc272df3491a00b2a421822a4e0d45d 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceDirectTransferResult.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceDirectTransferResult.java
@@ -10,24 +10,28 @@ package com.google.android.gms.fido.sourcedevice;
import android.app.Activity;
import android.content.Intent;
-
+import android.os.Parcel;
+import androidx.annotation.NonNull;
import com.google.android.gms.common.api.Status;
-
+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.PublicApi;
-import org.microg.safeparcel.AutoSafeParcelable;
/**
* Result returned from the UI activity in {@link Activity#onActivityResult(int, int, Intent)} after the direct transfer finishes.
*/
@PublicApi
-public class SourceDirectTransferResult extends AutoSafeParcelable {
- @Field(1)
+@SafeParcelable.Class
+public class SourceDirectTransferResult extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getStatus")
private Status status;
private SourceDirectTransferResult() {
}
- public SourceDirectTransferResult(Status status) {
+ @Constructor
+ public SourceDirectTransferResult(@Param(1) Status status) {
this.status = status;
}
@@ -38,5 +42,10 @@ public class SourceDirectTransferResult extends AutoSafeParcelable {
return status;
}
- public static final Creator CREATOR = new AutoCreator<>(SourceDirectTransferResult.class);
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(SourceDirectTransferResult.class);
}
diff --git a/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceStartDirectTransferOptions.java b/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceStartDirectTransferOptions.java
index 50aaf81ec30f90bf6c1a7983c723e933fe1c5096..11ae1f3d48570ae2b39f6cd20659d6ead5ae5dcf 100644
--- a/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceStartDirectTransferOptions.java
+++ b/play-services-fido/src/main/java/com/google/android/gms/fido/sourcedevice/SourceStartDirectTransferOptions.java
@@ -8,12 +8,15 @@
package com.google.android.gms.fido.sourcedevice;
-import org.microg.safeparcel.AutoSafeParcelable;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
/**
* Customized options to start direct transfer.
*/
-public class SourceStartDirectTransferOptions extends AutoSafeParcelable {
+public class SourceStartDirectTransferOptions extends AbstractSafeParcelable {
/**
* Value of the callerType if the caller is unknown.
*/
@@ -23,7 +26,7 @@ public class SourceStartDirectTransferOptions extends AutoSafeParcelable {
*/
public static final int CALLER_TYPE_BROWSER = 2;
- @Field(1)
+ @Field(value = 1, getterName = "getCallerType")
private int callerType;
private SourceStartDirectTransferOptions() {
@@ -32,9 +35,18 @@ public class SourceStartDirectTransferOptions extends AutoSafeParcelable {
/**
* Constructor for the {@link SourceStartDirectTransferOptions}.
*/
- public SourceStartDirectTransferOptions(int callerType) {
+ public SourceStartDirectTransferOptions(@Param(1) int callerType) {
this.callerType = callerType;
}
- public static final Creator CREATOR = new AutoCreator<>(SourceStartDirectTransferOptions.class);
+ public int getCallerType() {
+ return callerType;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(SourceStartDirectTransferOptions.class);
}
diff --git a/play-services-fido/src/main/java/org/microg/gms/fido/fido2/Fido2PrivilegedGmsClient.java b/play-services-fido/src/main/java/org/microg/gms/fido/fido2/Fido2PrivilegedGmsClient.java
index 1044f94ed74bf3f654fe4f3b0daae52df91774b1..c52f2202f357c6309ef666b9ede1af8ce7355ba4 100644
--- a/play-services-fido/src/main/java/org/microg/gms/fido/fido2/Fido2PrivilegedGmsClient.java
+++ b/play-services-fido/src/main/java/org/microg/gms/fido/fido2/Fido2PrivilegedGmsClient.java
@@ -10,6 +10,7 @@ import android.os.IBinder;
import android.os.RemoteException;
import com.google.android.gms.fido.fido2.api.IBooleanCallback;
+import com.google.android.gms.fido.fido2.api.ICredentialListCallback;
import com.google.android.gms.fido.fido2.api.common.BrowserPublicKeyCredentialCreationOptions;
import com.google.android.gms.fido.fido2.api.common.BrowserPublicKeyCredentialRequestOptions;
import com.google.android.gms.fido.fido2.internal.privileged.IFido2PrivilegedCallbacks;
@@ -26,18 +27,22 @@ public class Fido2PrivilegedGmsClient extends GmsClient
serviceId = GmsService.FIDO2_PRIVILEGED.SERVICE_ID;
}
- public void register(IFido2PrivilegedCallbacks callbacks, BrowserPublicKeyCredentialCreationOptions options) throws RemoteException {
- getServiceInterface().register(callbacks, options);
+ public void getRegisterPendingIntent(IFido2PrivilegedCallbacks callbacks, BrowserPublicKeyCredentialCreationOptions options) throws RemoteException {
+ getServiceInterface().getRegisterPendingIntent(callbacks, options);
}
- public void sign(IFido2PrivilegedCallbacks callbacks, BrowserPublicKeyCredentialRequestOptions options) throws RemoteException {
- getServiceInterface().sign(callbacks, options);
+ public void getSignPendingIntent(IFido2PrivilegedCallbacks callbacks, BrowserPublicKeyCredentialRequestOptions options) throws RemoteException {
+ getServiceInterface().getSignPendingIntent(callbacks, options);
}
public void isUserVerifyingPlatformAuthenticatorAvailable(IBooleanCallback callback) throws RemoteException {
getServiceInterface().isUserVerifyingPlatformAuthenticatorAvailable(callback);
}
+ public void getCredentialList(ICredentialListCallback callbacks, String rpId) throws RemoteException {
+ getServiceInterface().getCredentialList(callbacks, rpId);
+ }
+
@Override
protected IFido2PrivilegedService interfaceFromBinder(IBinder binder) {
return IFido2PrivilegedService.Stub.asInterface(binder);
diff --git a/play-services-games/build.gradle b/play-services-games/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e1659236f248f7a010d7ac68cec1169b300f5be3
--- /dev/null
+++ b/play-services-games/build.gradle
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+android {
+ namespace "com.google.android.gms.games"
+
+ compileSdkVersion androidCompileSdk
+ buildToolsVersion "$androidBuildVersionTools"
+
+ buildFeatures {
+ aidl = true
+ }
+
+ defaultConfig {
+ versionName version
+ minSdkVersion androidMinSdk
+ targetSdkVersion androidTargetSdk
+ }
+
+ compileOptions {
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ }
+}
+
+apply from: '../gradle/publish-android.gradle'
+
+description = 'microG implementation of play-services-games'
+
+dependencies {
+ // Dependencies from play-services-games:23.1.0
+ api project(':play-services-base')
+ api project(':play-services-basement')
+ api project(':play-services-drive')
+ api project(':play-services-tasks')
+
+ annotationProcessor project(':safe-parcel-processor')
+}
diff --git a/play-services-games/src/main/AndroidManifest.xml b/play-services-games/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..115884d0b0e651ac95a4eb76f1d9ffecb3d1bea9
--- /dev/null
+++ b/play-services-games/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/PlayerEntity.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/PlayerEntity.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..b5670783fb92a9ba8de4dd603f5cac590d6e03bb
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/PlayerEntity.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.games;
+
+parcelable PlayerEntity;
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesCallbacks.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesCallbacks.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..649717be8dbbd6ab33f1444e375754a06b9824aa
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesCallbacks.aidl
@@ -0,0 +1,9 @@
+package com.google.android.gms.games.client;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.data.DataHolder;
+
+interface IPlayGamesCallbacks {
+ void onData(in DataHolder dataHolder) = 1000;
+ void onStatus5028(in Status status) = 5027;
+}
\ No newline at end of file
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesService.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesService.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..90331abbfe1e4f638764c7f909c0cda6c25ceb21
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/client/IPlayGamesService.aidl
@@ -0,0 +1,14 @@
+package com.google.android.gms.games.client;
+
+import com.google.android.gms.games.client.IPlayGamesCallbacks;
+import com.google.android.gms.games.client.PlayGamesConsistencyTokens;
+
+interface IPlayGamesService {
+ void getGameCollection(IPlayGamesCallbacks callbacks, int maxResults, int gameCollectionType, boolean z, boolean forceReload) = 1000;
+ void loadGames(IPlayGamesCallbacks callbacks, String playerId, int maxResults, boolean z, boolean forceReload) = 1002;
+
+ PlayGamesConsistencyTokens getConsistencyTokens() = 5027;
+ void updateConsistencyTokens(in PlayGamesConsistencyTokens tokens) = 5028;
+
+ void fun5041(IPlayGamesCallbacks callbacks) = 5040;
+}
\ No newline at end of file
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/client/PlayGamesConsistencyTokens.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/client/PlayGamesConsistencyTokens.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..629ce58b6295916485d5ef27146a2cc01d99d7bf
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/client/PlayGamesConsistencyTokens.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.games.client;
+
+parcelable PlayGamesConsistencyTokens;
\ No newline at end of file
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
new file mode 100644
index 0000000000000000000000000000000000000000..08b60e83529b4e4870e34048271fdff4e28c8f40
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
@@ -0,0 +1,49 @@
+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.games.multiplayer.realtime.RealTimeMessage;
+
+interface IGamesCallbacks {
+ /* @deprecated */ void onAuthTokenLoaded(int statusCode, String authToken) = 5000;
+ void onAchievementsLoaded(in DataHolder data) = 5001;
+ void onAchievementUpdated(int statusCode, String achievementId) = 5002;
+ void onLeaderboardsLoaded(in DataHolder data) = 5003;
+ void onLeaderboardScoresLoaded(in DataHolder leaderboard, in DataHolder scores) = 5004;
+ void onScoreSubmitted(in DataHolder data) = 5005;
+ void onPlayersLoaded(in DataHolder data) = 5006;
+ void onExtendedPlayersLoaded(in DataHolder data) = 5007;
+ /* @deprecated */ void onGamesLoaded(in DataHolder data) = 5008;
+ /* @deprecated */ void onExtendedGamesLoaded(in DataHolder data) = 5009;
+ /* @deprecated */ void onGameInstancesLoaded(in DataHolder data) = 5010;
+ /* @deprecated */ void onGameplayAclLoaded(in DataHolder data) = 5011;
+ /* @deprecated */ void onGameplayAclUpdated(int statusCode) = 5012;
+ /* @deprecated */ void onFAclLoaded(in DataHolder data) = 5013;
+ /* @deprecated */ void onFAclUpdated(int statusCode) = 5014;
+ void onSignOutComplete() = 5015;
+ /* @deprecated */ void onInvitationsLoaded(in DataHolder data) = 5016;
+ /* @deprecated */ void onRoomCreated(in DataHolder data) = 5017;
+ /* @deprecated */ void onJoinedRoom(in DataHolder data) = 5018;
+ /* @deprecated */ void onLeftRoom(int statusCode, String roomId) = 5019;
+ /* @deprecated */ void onRoomConnecting(in DataHolder data) = 5020;
+ /* @deprecated */ void onRoomAutoMatching(in DataHolder data) = 5021;
+ /* @deprecated */ void onRoomConnected(in DataHolder data) = 5022;
+ /* @deprecated */ void onConnectedToRoom(in DataHolder data) = 5023;
+ /* @deprecated */ void onDisconnectedFromRoom(in DataHolder data) = 5024;
+ /* @deprecated */ void onPeerInvitedToRoom(in DataHolder data, in String[] participantIds) = 5025;
+ /* @deprecated */ void onPeerJoinedRoom(in DataHolder data, in String[] participantIds) = 5026;
+ /* @deprecated */ void onPeerLeftRoom(in DataHolder data, in String[] participantIds) = 5027;
+ /* @deprecated */ void onPeerDeclined(in DataHolder data, in String[] participantIds) = 5028;
+ /* @deprecated */ void onPeerConnected(in DataHolder data, in String[] participantIds) = 5029;
+ /* @deprecated */ void onPeerDisconnected(in DataHolder data, in String[] participantIds) = 5030;
+ /* @deprecated */ void onRealTimeMessageReceived(in RealTimeMessage message) = 5031;
+ /* @deprecated */ void onMessageSent(int statusCode, int messageId, String recipientParticipantId) = 5032;
+ /* @deprecated */ void onGameMuteStatusChanged(int statusCode, String externalGameId, boolean isMuted) = 5033;
+ /* @deprecated */ void onNotifyAclLoaded(in DataHolder data) = 5034;
+ /* @deprecated */ void onNotifyAclUpdated(int statusCode) = 5035;
+ /* @deprecated */ void onInvitationReceived(in DataHolder data) = 5036;
+ /* @deprecated */ void onGameMuteStatusLoaded(in DataHolder data) = 5037;
+ /* @deprecated */ void onContactSettingsLoaded(in DataHolder data) = 5038;
+ /* @deprecated */ void onContactSettingsUpdated(int statusCode) = 5039;
+ void onServerAuthCode(in Status status, String serverAuthCode) = 25002;
+}
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesClient.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesClient.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..24c61c3af86262a4aba9c807fece8b1e71219c62
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesClient.aidl
@@ -0,0 +1,4 @@
+package com.google.android.gms.games.internal;
+
+interface IGamesClient {
+}
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
new file mode 100644
index 0000000000000000000000000000000000000000..010978f624ef78f1d1ef780791d4a63baefc7cbd
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
@@ -0,0 +1,116 @@
+package com.google.android.gms.games.internal;
+
+import android.net.Uri;
+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.games.PlayerEntity;
+import com.google.android.gms.games.internal.IGamesCallbacks;
+import com.google.android.gms.games.internal.IGamesClient;
+
+interface IGamesService {
+ void clientDisconnecting(long clientId) = 5000;
+ void signOut(IGamesCallbacks callbacks) = 5001;
+ String getAppId() = 5002;
+ Bundle getConnectionHint() = 5003;
+ void showWelcomePopup(IBinder windowToken, in Bundle extras) = 5004;
+ void cancelPopups() = 5005;
+ String getCurrentAccountName() = 5006;
+ void loadGameplayAclInternal(IGamesCallbacks callbacks, String gameId) = 5007;
+ void updateGameplayAclInternal(IGamesCallbacks callbacks, String gameId, String aclData) = 5008;
+ void loadFAclInternal(IGamesCallbacks callbacks, String gameId) = 5009;
+ void updateFAclInternal(IGamesCallbacks callbacks, String gameId, boolean allCirclesVisible, in long[] circleIds) = 5010;
+ String getCurrentPlayerId() = 5011;
+ DataHolder getCurrentPlayer() = 5012;
+ void loadPlayer(IGamesCallbacks callbacks, String playerId) = 5013;
+ void loadInvitablePlayers(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5014;
+ void submitScore(IGamesCallbacks callbacks, String leaderboardId, long score) = 5015;
+ void loadLeaderboards(IGamesCallbacks callbacks) = 5016;
+ void loadLeaderboard(IGamesCallbacks callbacks, String leaderboardId) = 5017;
+ void loadTopScores(IGamesCallbacks callbacks, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5018;
+ void loadPlayerCenteredScores(IGamesCallbacks callbacks, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5019;
+ void loadMoreScores(IGamesCallbacks callbacks, in Bundle previousheader, int maxResults, int pageDirection) = 5020;
+ void loadAchievements(IGamesCallbacks callbacks) = 5021;
+ void revealAchievement(IGamesCallbacks callbacks, String achievementId, IBinder windowToken, in Bundle extras) = 5022;
+ void unlockAchievement(IGamesCallbacks callbacks, String achievementId, IBinder windowToken, in Bundle extras) = 5023;
+ void incrementAchievement(IGamesCallbacks callbacks, String achievementId, int numSteps, IBinder windowToken, in Bundle extras) = 5024;
+ void loadGame(IGamesCallbacks callbacks) = 5025;
+ void loadInvitations(IGamesCallbacks callbacks) = 5026;
+ void declineInvitation(String invitationId, int invitationType) = 5027;
+ void dismissInvitation(String invitationId, int invitationType) = 5028;
+ void createRoom(IGamesCallbacks callbacks, IBinder processBinder, int variant, in String[] invitedPlayerIds, in Bundle autoMatchCriteria, boolean enableSockets, long clientId) = 5029;
+ void joinRoom(IGamesCallbacks callbacks, IBinder processBinder, String matchId, boolean enableSockets, long clientId) = 5030;
+ void leaveRoom(IGamesCallbacks callbacks, String matchId) = 5031;
+ int sendReliableMessage(IGamesCallbacks callbacks, in byte[] messageData, String matchId, String recipientParticipantId) = 5032;
+ int sendUnreliableMessage(in byte[] messageData, String matchId, in String[] recipientParticipantIds) = 5033;
+ String createSocketConnection(String participantId) = 5034;
+ void clearNotifications(int notificationTypes) = 5035;
+ void loadLeaderboardsFirstParty(IGamesCallbacks callbacks, String gameId) = 5036;
+ void loadLeaderboardFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId) = 5037;
+ void loadTopScoresFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5038;
+ void loadPlayerCenteredScoresFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5039;
+ void loadAchievementsFirstParty(IGamesCallbacks callbacks, String playerId, String gameId) = 5040;
+ void loadGameFirstParty(IGamesCallbacks callbacks, String gameId) = 5041;
+ void loadGameInstancesFirstParty(IGamesCallbacks callbacks, String gameId) = 5042;
+ void loadGameCollectionFirstParty(IGamesCallbacks callbacks, int pageSize, int collectionType, boolean expandCachedData, boolean forceReload) = 5043;
+ void loadRecentlyPlayedGamesFirstParty(IGamesCallbacks callbacks, String externalPlayerId, int pageSize, boolean expandCachedData, boolean forceReload) = 5044;
+ void loadInvitablePlayersFirstParty(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5045;
+ void loadRecentPlayersFirstParty(IGamesCallbacks callbacks) = 5046;
+ void loadCircledPlayersFirstParty(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5047;
+ void loadSuggestedPlayersFirstParty(IGamesCallbacks callbacks) = 5048;
+ void dismissPlayerSuggestionFirstParty(String playerIdToDismiss) = 5049;
+ void declineInvitationFirstParty(String gameId, String invitationId, int invitationType) = 5050;
+ void loadInvitationsFirstParty(IGamesCallbacks callbacks, String gameId) = 5051;
+ int registerWaitingRoomListenerRestricted(IGamesCallbacks callbacks, String roomId) = 5052;
+ void setGameMuteStatusInternal(IGamesCallbacks callbacks, String gameId, boolean muted) = 5053;
+ void clearNotificationsFirstParty(String gameId, int notificationTypes) = 5054;
+ void loadNotifyAclInternal(IGamesCallbacks callbacks) = 5055;
+ void updateNotifyAclInternal(IGamesCallbacks callbacks, String aclData) = 5056;
+ void registerInvitationListener(IGamesCallbacks callbacks, long clientId) = 5057;
+ void unregisterInvitationListener(long clientId) = 5058;
+ int unregisterWaitingRoomListenerRestricted(String roomId) = 5059;
+ void isGameMutedInternal(IGamesCallbacks callbacks, String gameId) = 5060;
+ void loadContactSettingsInternal(IGamesCallbacks callbacks) = 5061;
+ void updateContactSettingsInternal(IGamesCallbacks callbacks, boolean enableMobileNotifications) = 5062;
+ String getSelectedAccountForGameFirstParty(String gamePackageName) = 5063;
+ void updateSelectedAccountForGameFirstParty(String gamePackageName, String accountName) = 5064;
+ Uri getGamesContentUriRestricted(String gameId) = 5065;
+ boolean shouldUseNewPlayerNotificationsFirstParty() = 5066;
+ void setUseNewPlayerNotificationsFirstParty(boolean newPlayerStyle) = 5067;
+
+ void searchForPlayersFirstParty(IGamesCallbacks callbacks, String query, int pageSize, boolean expandCachedData, boolean forceReload) = 5500;
+ DataHolder getCurrentGame() = 5501;
+
+ void loadAchievementsV2(IGamesCallbacks callbacks, boolean forceReload) = 6000;
+
+ void submitLeaderboardScore(IGamesCallbacks callbacks, String leaderboardId, long score, @nullable String scoreTag) = 7001;
+ void setAchievementSteps(IGamesCallbacks callbacks, String id, int numSteps, IBinder windowToken, in Bundle extras) = 7002;
+
+ Intent getAllLeaderboardsIntent() = 9002;
+ Intent getAchievementsIntent() = 9004;
+ Intent getPlayerSearchIntent() = 9009;
+
+ void loadEvents(IGamesCallbacks callbacks, boolean forceReload) = 12015;
+ void incrementEvent(String eventId, int incrementAmount) = 12016;
+// 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 registerEventClient(IGamesClient callback, long l) = 15500;
+ Intent getCompareProfileIntentForPlayer(in PlayerEntity player) = 15502;
+
+ void loadPlayerStats(IGamesCallbacks callbacks, boolean forceReload) = 17000;
+
+ Account getCurrentAccount() = 21000;
+
+ boolean isTelevision() = 22029;
+
+ Intent getCompareProfileIntentWithAlternativeNameHints(String otherPlayerId, String otherPlayerInGameName, String currentPlayerInGameName) = 25015;
+
+ void requestServerSideAccess(IGamesCallbacks callbacks, String serverClientId, boolean forceRefreshToken) = 27002;
+
+}
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInRequest.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInRequest.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..a3b015357d4b7a4f35a495cdabc92f182c75ceb8
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInRequest.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.games.internal.connect;
+
+parcelable GamesSignInRequest;
\ No newline at end of file
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInResponse.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInResponse.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..e60e1b93f63bda9ed8179afa77ca0fe92a6b7bdb
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/GamesSignInResponse.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.games.internal.connect;
+
+parcelable GamesSignInResponse;
\ No newline at end of file
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectCallbacks.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectCallbacks.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..4f2a16c1c171a3dbc3656c60bb193f5621384b18
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectCallbacks.aidl
@@ -0,0 +1,8 @@
+package com.google.android.gms.games.internal.connect;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.games.internal.connect.GamesSignInResponse;
+
+interface IGamesConnectCallbacks {
+ void onSignIn(in Status status, in GamesSignInResponse response) = 1;
+}
\ No newline at end of file
diff --git a/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectService.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectService.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..3c8b37f35cf22c976d80a66a2d7c6830bdfae5a1
--- /dev/null
+++ b/play-services-games/src/main/aidl/com/google/android/gms/games/internal/connect/IGamesConnectService.aidl
@@ -0,0 +1,8 @@
+package com.google.android.gms.games.internal.connect;
+
+import com.google.android.gms.games.internal.connect.GamesSignInRequest;
+import com.google.android.gms.games.internal.connect.IGamesConnectCallbacks;
+
+interface IGamesConnectService {
+ void signIn(IGamesConnectCallbacks callback, in GamesSignInRequest request) = 1;
+}
\ No newline at end of file
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl b/play-services-games/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl
similarity index 100%
rename from play-services-api/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl
rename to play-services-games/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/AnnotatedData.java b/play-services-games/src/main/java/com/google/android/gms/games/AnnotatedData.java
new file mode 100644
index 0000000000000000000000000000000000000000..a39e04b3e76fd4f2e776579caed837a6ada542a6
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/AnnotatedData.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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 org.microg.gms.common.Hide;
+
+/**
+ * Class to return annotated data. Currently, the only annotation is whether the data is stale or not.
+ */
+public class AnnotatedData {
+ private final T value;
+ private final boolean stale;
+
+ @Hide
+ public AnnotatedData(T value, boolean stale) {
+ this.value = value;
+ this.stale = stale;
+ }
+
+ /**
+ * Returns the data that is annotated by this class.
+ */
+ public T get() {
+ return value;
+ }
+
+ /**
+ * Returns {@code true} if the data returned by {@link #get()} is stale. This usually indicates that there was a network error and data was
+ * returned from the local cache.
+ */
+ public boolean isStale() {
+ return stale;
+ }
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfo.java b/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..191956881675f9a0304d7d3656630e963852bf16
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfo.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.os.Parcelable;
+import com.google.android.gms.common.data.Freezable;
+
+/**
+ * Data object representing the information related only to the signed in user.
+ */
+public interface CurrentPlayerInfo extends Freezable, Parcelable {
+ /**
+ * Retrieves if the user has shared the friends list with the game. The possible output can be found in {@link Player.FriendsListVisibilityStatus}.
+ */
+ @Player.FriendsListVisibilityStatus
+ int getFriendsListVisibilityStatus();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfoEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfoEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..dfd7f6a85bde15ab5c3cfb732c6c9338d2d499e7
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/CurrentPlayerInfoEntity.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games;
+
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+@Hide
+public class CurrentPlayerInfoEntity extends AutoSafeParcelable implements CurrentPlayerInfo {
+ @Field(1)
+ @Player.FriendsListVisibilityStatus
+ private int friendsListVisibilityStatus;
+
+ public CurrentPlayerInfoEntity() {
+ }
+
+ public CurrentPlayerInfoEntity(CurrentPlayerInfo copy) {
+ friendsListVisibilityStatus = copy.getFriendsListVisibilityStatus();
+ }
+
+ public CurrentPlayerInfoEntity(int friendsListVisibilityStatus) {
+ this.friendsListVisibilityStatus = friendsListVisibilityStatus;
+ }
+
+ @Override
+ @Player.FriendsListVisibilityStatus
+ public int getFriendsListVisibilityStatus() {
+ return friendsListVisibilityStatus;
+ }
+
+ @Override
+ public CurrentPlayerInfo freeze() {
+ return this;
+ }
+
+ @Override
+ public boolean isDataValid() {
+ return true;
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(CurrentPlayerInfoEntity.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/Player.java b/play-services-games/src/main/java/com/google/android/gms/games/Player.java
new file mode 100644
index 0000000000000000000000000000000000000000..c9c1d1e86c01a2dcf12b5f7bef41ac666bf6ecdc
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/Player.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.Parcelable;
+import androidx.annotation.IntDef;
+import com.google.android.gms.common.data.Freezable;
+import com.google.android.gms.common.images.ImageManager;
+
+/**
+ * Data interface for retrieving player information.
+ */
+public interface Player extends Freezable, Parcelable {
+ /**
+ * Friends list visibility statuses.
+ */
+ @IntDef({FriendsListVisibilityStatus.UNKNOWN, FriendsListVisibilityStatus.VISIBLE, FriendsListVisibilityStatus.REQUEST_REQUIRED, FriendsListVisibilityStatus.FEATURE_UNAVAILABLE})
+ @interface FriendsListVisibilityStatus {
+ /**
+ * Constant indicating that currently it's unknown if the friends list is visible to the game, or whether the game can ask for
+ * access from the user. Use {@link PlayersClient#getCurrentPlayer(boolean)} to force reload the latest status.
+ */
+ int UNKNOWN = 0;
+ /**
+ * Constant indicating that the friends list is currently visible to the game.
+ */
+ int VISIBLE = 1;
+ /**
+ * Constant indicating that the friends list is not visible to the game, but the game can ask for access.
+ */
+ int REQUEST_REQUIRED = 2;
+ /**
+ * Constant indicating that the friends list is currently unavailable for the game. You cannot request access at this time,
+ * either because the user has permanently declined or the friends feature is not available to them. In this state, any
+ * attempts to request access to the friends list will be unsuccessful.
+ */
+ int FEATURE_UNAVAILABLE = 3;
+ }
+
+ /**
+ * Player friend statuses.
+ */
+ @IntDef({PlayerFriendStatus.UNKNOWN, PlayerFriendStatus.NO_RELATIONSHIP, PlayerFriendStatus.FRIEND})
+ @interface PlayerFriendStatus {
+ /**
+ * Constant indicating that the currently signed-in player's friend status with this player is unknown. This may happen if the
+ * user has not shared the friends list with the game.
+ */
+ int UNKNOWN = -1;
+ /**
+ * Constant indicating that the currently signed-in player is not a friend of this player, and there are no pending invitations
+ * between them.
+ */
+ int NO_RELATIONSHIP = 0;
+ /**
+ * Constant indicating that the currently signed-in player and this player are friends.
+ */
+ int FRIEND = 4;
+ }
+
+ /**
+ * Constant indicating that the current XP total for a player is not known.
+ */
+ long CURRENT_XP_UNKNOWN = -1;
+ /**
+ * Constant indicating that a timestamp for a player is not known.
+ */
+ long TIMESTAMP_UNKNOWN = -1;
+
+ /**
+ * Retrieves the URI for loading this player's landscape banner image. Returns null if the player has no landscape banner image.
+ *
+ * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+ *
+ * @return The image URI for the player's landscape banner image, or null if the player has none.
+ */
+ Uri getBannerImageLandscapeUri();
+
+ /**
+ * Retrieves the URI for loading this player's portrait banner image. Returns null if the player has no portrait banner image.
+ *
+ * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+ *
+ * @return The image URI for the player's portrait banner image, or null if the player has none.
+ */
+ Uri getBannerImagePortraitUri();
+
+ /**
+ * Returns information only available for the signed-in user. The method will return {@code null} for other players.
+ */
+ CurrentPlayerInfo getCurrentPlayerInfo();
+
+ /**
+ * Loads the player's display name into the given {@link CharArrayBuffer}.
+ *
+ * @param dataOut The buffer to load the data into.
+ */
+ void getDisplayName(CharArrayBuffer dataOut);
+
+ /**
+ * Retrieves the display name for this player.
+ *
+ * @return The player's display name.
+ */
+ String getDisplayName();
+
+ /**
+ * Retrieves the URI for loading this player's hi-res profile image. Returns null if the player has no profile image.
+ *
+ * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+ *
+ * @return The image URI for the player's hi-res profile image, or null if the player has none.
+ */
+ Uri getHiResImageUri();
+
+ /**
+ * Retrieves the URI for loading this player's icon-size profile image. Returns null if the player has no profile image.
+ *
+ * To retrieve the Image from the {@link Uri}, use {@link ImageManager}.
+ *
+ * @return The image URI for the player's icon-size profile image, or null if the player has none.
+ */
+ Uri getIconImageUri();
+
+ /**
+ * Retrieves the timestamp at which this player last played a multiplayer game with the currently signed in user. If the
+ * timestamp is not found, this method returns {@link #TIMESTAMP_UNKNOWN}.
+ *
+ * @return The timestamp (in ms since epoch) at which the player last played a multiplayer game with the currently signed in user.
+ * @deprecated Real-time multiplayer and Turn-based multiplayer support is being shut down on March 31, 2020.
+ */
+ @Deprecated
+ long getLastPlayedWithTimestamp();
+
+ /**
+ * Retrieves the player level associated information if any exists. If no level information exists for this player, this method will return {@code null}.
+ *
+ * @return The {@link PlayerLevelInfo} associated with this player, if any.
+ */
+ PlayerLevelInfo getLevelInfo();
+
+ /**
+ * Retrieves the ID of this player.
+ *
+ * @return The player ID.
+ */
+ String getPlayerId();
+
+ /**
+ * Returns relationship information of this player. If no relationship information exists for this player, this method will return {@code null}.
+ */
+ PlayerRelationshipInfo getRelationshipInfo();
+
+ /**
+ * Retrieves the timestamp at which this player record was last updated locally.
+ *
+ * @return The timestamp (in ms since epoch) at which the player data was last updated locally.
+ */
+ long getRetrievedTimestamp();
+
+ /**
+ * Retrieves the title of the player. This is based on the player's gameplay activity in apps using Google Play Games
+ * services. Note that not all players have titles, and that a player's title may change over time.
+ *
+ * @return The player's title, or {@code null} if this player has no title.
+ */
+ String getTitle();
+
+ /**
+ * Loads the player's title into the given {@link CharArrayBuffer}.
+ *
+ * @param dataOut The buffer to load the data into.
+ */
+ void getTitle(CharArrayBuffer dataOut);
+
+ /**
+ * Indicates whether this player has a hi-res profile image to display.
+ *
+ * @return Whether the player has a hi-res profile image to display.
+ */
+ boolean hasHiResImage();
+
+ /**
+ * Indicates whether this player has an icon-size profile image to display.
+ *
+ * @return Whether the player has an icon-size profile image to display.
+ */
+ boolean hasIconImage();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerBuffer.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerBuffer.java
new file mode 100644
index 0000000000000000000000000000000000000000..3295e6944e6b05d7c55818100d10c7971c2adde8
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerBuffer.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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 com.google.android.gms.common.data.AbstractDataBuffer;
+import com.google.android.gms.common.data.DataHolder;
+import org.microg.gms.common.Hide;
+
+/**
+ * Data structure providing access to a list of players.
+ */
+public class PlayerBuffer extends AbstractDataBuffer {
+ @Hide
+ public PlayerBuffer(DataHolder dataHolder) {
+ super(dataHolder);
+ }
+
+ public Player get(int position) {
+ throw new UnsupportedOperationException();
+ //return new PlayerRef(dataHolder, position);
+ }
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerColumns.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerColumns.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d08957bab15e5cd52f0240f56e88f11b3400666
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerColumns.java
@@ -0,0 +1,80 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class PlayerColumns {
+ public static final String externalPlayerId = "external_player_id";
+ public static final String profileName = "profile_name";
+ public static final String profileIconImageId = "profile_icon_image_id";
+ public static final String profileIconImageUri = "profile_icon_image_uri";
+ public static final String profileIconImageUrl = "profile_icon_image_url";
+ public static final String profileHiResImageId = "profile_hi_res_image_id";
+ public static final String profileHiResImageUri = "profile_hi_res_image_uri";
+ public static final String profileHiResImageUrl = "profile_hi_res_image_url";
+ public static final String lastUpdated = "last_updated";
+ public static final String isInCircles = "is_in_circles";
+ public static final String playedWithTimestamp = "played_with_timestamp";
+ public static final String currentXpTotal = "current_xp_total";
+ public static final String currentLevel = "current_level";
+ public static final String currentLevelMinXp = "current_level_min_xp";
+ public static final String currentLevelMaxXp = "current_level_max_xp";
+ public static final String nextLevel = "next_level";
+ public static final String nextLevelMaxXp = "next_level_max_xp";
+ public static final String lastLevelUpTimestamp = "last_level_up_timestamp";
+ public static final String playerTitle = "player_title";
+ public static final String hasAllPublicAcls = "has_all_public_acls";
+ public static final String isProfileVisible = "is_profile_visible";
+ public static final String mostRecentExternalGameId = "most_recent_external_game_id";
+ public static final String mostRecentGameName = "most_recent_game_name";
+ public static final String mostRecentActivityTimestamp = "most_recent_activity_timestamp";
+ public static final String mostRecentGameIconId = "most_recent_game_icon_id";
+ public static final String mostRecentGameIconUri = "most_recent_game_icon_uri";
+ public static final String mostRecentGameHiResId = "most_recent_game_hi_res_id";
+ public static final String mostRecentGameHiResUri = "most_recent_game_hi_res_uri";
+ public static final String mostRecentGameFeaturedId = "most_recent_game_featured_id";
+ public static final String mostRecentGameFeaturedUri = "most_recent_game_featured_uri";
+ public static final String hasDebugAccess = "has_debug_access";
+ public static final String gamerTag = "gamer_tag";
+ public static final String realName = "real_name";
+ public static final String bannerImageLandscapeId = "banner_image_landscape_id";
+ public static final String bannerImageLandscapeUri = "banner_image_landscape_uri";
+ public static final String bannerImageLandscapeUrl = "banner_image_landscape_url";
+ public static final String bannerImagePortraitId = "banner_image_portrait_id";
+ public static final String bannerImagePortraitUri = "banner_image_portrait_uri";
+ public static final String bannerImagePortraitUrl = "banner_image_portrait_url";
+ public static final String gamerFriendStatus = "gamer_friend_status";
+ public static final String gamerFriendUpdateTimestamp = "gamer_friend_update_timestamp";
+ public static final String isMuted = "is_muted";
+ public static final String totalUnlockedAchievements = "total_unlocked_achievements";
+ public static final String playTogetherFriendStatus = "play_together_friend_status";
+ public static final String playTogetherNickname = "play_together_nickname";
+ public static final String playTogetherInvitationNickname = "play_together_invitation_nickname";
+ public static final String nicknameAbuseReportToken = "nickname_abuse_report_token";
+ public static final String friendsListVisibility = "friends_list_visibility";
+ public static final String alwaysAutoSignIn = "always_auto_sign_in";
+ public static final String profileCreationTimestamp = "profile_creation_timestamp";
+ public static final String gamePlayerId = "game_player_id";
+
+ public static final List CURRENT_PLAYER_COLUMNS = Collections.unmodifiableList(Arrays.asList(
+ externalPlayerId,
+ profileIconImageId, profileHiResImageId, profileIconImageUri, profileIconImageUrl, profileHiResImageUri, profileHiResImageUrl,
+ profileName, lastUpdated, isInCircles, hasAllPublicAcls, hasDebugAccess, isProfileVisible,
+ currentXpTotal, currentLevel, currentLevelMinXp, currentLevelMaxXp, nextLevel, nextLevelMaxXp, lastLevelUpTimestamp,
+ playerTitle,
+ mostRecentExternalGameId, mostRecentGameName, mostRecentActivityTimestamp, mostRecentGameIconId, mostRecentGameIconUri, mostRecentGameHiResId, mostRecentGameHiResUri, mostRecentGameFeaturedId, mostRecentGameFeaturedUri,
+ gamerTag, realName,
+ bannerImageLandscapeId, bannerImageLandscapeUri, bannerImageLandscapeUrl, bannerImagePortraitId, bannerImagePortraitUri, bannerImagePortraitUrl,
+ totalUnlockedAchievements,
+ playTogetherFriendStatus, playTogetherNickname, playTogetherInvitationNickname,
+ profileCreationTimestamp, nicknameAbuseReportToken, friendsListVisibility, alwaysAutoSignIn,
+ gamerFriendStatus, gamerFriendUpdateTimestamp,
+ isMuted, gamePlayerId
+ ));
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..64204d4b039e29cadfacc25367f360f7b2b45a1a
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerEntity.java
@@ -0,0 +1,276 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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 com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import com.google.android.gms.games.internal.player.MostRecentGameInfoEntity;
+import org.microg.gms.common.Hide;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+/**
+ * Data object representing a set of Player data. This is immutable, and therefore safe to cache or store. Note, however, that
+ * the data it represents may grow stale.
+ *
+ * This class exists solely to support parceling these objects and should not be used directly.
+ */
+public class PlayerEntity extends AutoSafeParcelable implements Player {
+ @Field(1)
+ private String playerId;
+ @Field(2)
+ private String displayName;
+ @Field(3)
+ private Uri iconImageUri;
+ @Field(4)
+ private Uri hiResImageUri;
+ @Field(5)
+ private long retrievedTimestamp;
+ @Field(6)
+ private int isInCircles;
+ @Field(7)
+ private long lastPlayedWithTimestamp;
+ @Field(8)
+ private String iconImageUrl;
+ @Field(9)
+ private String hiResImageUrl;
+ @Field(14)
+ private String title;
+ @Field(15)
+ private MostRecentGameInfoEntity mostRecentGameInfo;
+ @Field(16)
+ private PlayerLevelInfo levelInfo;
+ @Field(18)
+ private boolean profileVisible;
+ @Field(19)
+ private boolean hasDebugAccess;
+ @Field(20)
+ private String gamerTag;
+ @Field(21)
+ private String name;
+ @Field(22)
+ private Uri bannerImageLandscapeUri;
+ @Field(23)
+ private String bannerImageLandscapeUrl;
+ @Field(24)
+ private Uri bannerImagePortraitUri;
+ @Field(25)
+ private String bannerImagePortraitUrl;
+ @Field(29)
+ private long totalUnlockedAchievement = -1;
+ @Field(33)
+ private PlayerRelationshipInfoEntity relationshipInfo;
+ @Field(35)
+ private CurrentPlayerInfoEntity currentPlayerInfo;
+ @Field(36)
+ private boolean alwaysAutoSignIn;
+ @Field(37)
+ private String gamePlayerId;
+
+ @Hide
+ public PlayerEntity() {
+ }
+
+ @Hide
+ public PlayerEntity(Player copy) {
+ bannerImageLandscapeUri = copy.getBannerImageLandscapeUri();
+ bannerImagePortraitUri = copy.getBannerImagePortraitUri();
+ currentPlayerInfo = new CurrentPlayerInfoEntity(copy.getCurrentPlayerInfo());
+ displayName = copy.getDisplayName();
+ hiResImageUri = copy.getHiResImageUri();
+ iconImageUri = copy.getIconImageUri();
+ lastPlayedWithTimestamp = copy.getLastPlayedWithTimestamp();
+ levelInfo = copy.getLevelInfo();
+ playerId = copy.getPlayerId();
+ relationshipInfo = new PlayerRelationshipInfoEntity(copy.getRelationshipInfo());
+ retrievedTimestamp = copy.getRetrievedTimestamp();
+ title = copy.getTitle();
+ }
+
+ @Hide
+ public PlayerEntity(String playerId, String displayName, Uri iconImageUri, Uri hiResImageUri, long retrievedTimestamp, int isInCircles, long lastPlayedWithTimestamp, String iconImageUrl, String hiResImageUrl, String title, MostRecentGameInfoEntity mostRecentGameInfo, PlayerLevelInfo levelInfo, boolean profileVisible, boolean hasDebugAccess, String gamerTag, String name, Uri bannerImageLandscapeUri, String bannerImageLandscapeUrl, Uri bannerImagePortraitUri, String bannerImagePortraitUrl, long totalUnlockedAchievement, PlayerRelationshipInfoEntity relationshipInfo, CurrentPlayerInfoEntity currentPlayerInfo, boolean alwaysAutoSignIn, String gamePlayerId) {
+ this.playerId = playerId;
+ this.displayName = displayName;
+ this.iconImageUri = iconImageUri;
+ this.hiResImageUri = hiResImageUri;
+ this.retrievedTimestamp = retrievedTimestamp;
+ this.isInCircles = isInCircles;
+ this.lastPlayedWithTimestamp = lastPlayedWithTimestamp;
+ this.iconImageUrl = iconImageUrl;
+ this.hiResImageUrl = hiResImageUrl;
+ this.title = title;
+ this.mostRecentGameInfo = mostRecentGameInfo;
+ this.levelInfo = levelInfo;
+ this.profileVisible = profileVisible;
+ this.hasDebugAccess = hasDebugAccess;
+ this.gamerTag = gamerTag;
+ this.name = name;
+ this.bannerImageLandscapeUri = bannerImageLandscapeUri;
+ this.bannerImageLandscapeUrl = bannerImageLandscapeUrl;
+ this.bannerImagePortraitUri = bannerImagePortraitUri;
+ this.bannerImagePortraitUrl = bannerImagePortraitUrl;
+ this.totalUnlockedAchievement = totalUnlockedAchievement;
+ this.relationshipInfo = relationshipInfo;
+ this.currentPlayerInfo = currentPlayerInfo;
+ this.alwaysAutoSignIn = alwaysAutoSignIn;
+ this.gamePlayerId = gamePlayerId;
+ }
+
+ @Override
+ public Uri getBannerImageLandscapeUri() {
+ return bannerImageLandscapeUri;
+ }
+
+ @Override
+ public Uri getBannerImagePortraitUri() {
+ return bannerImagePortraitUri;
+ }
+
+ @Override
+ public CurrentPlayerInfo getCurrentPlayerInfo() {
+ return currentPlayerInfo;
+ }
+
+ @Override
+ public void getDisplayName(CharArrayBuffer dataOut) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ @Override
+ public Uri getHiResImageUri() {
+ return hiResImageUri;
+ }
+
+ @Override
+ public Uri getIconImageUri() {
+ return iconImageUri;
+ }
+
+ @Override
+ public long getLastPlayedWithTimestamp() {
+ return lastPlayedWithTimestamp;
+ }
+
+ @Override
+ public PlayerLevelInfo getLevelInfo() {
+ return levelInfo;
+ }
+
+ @Override
+ public String getPlayerId() {
+ return playerId;
+ }
+
+ @Override
+ public PlayerRelationshipInfo getRelationshipInfo() {
+ return relationshipInfo;
+ }
+
+ @Override
+ public long getRetrievedTimestamp() {
+ return retrievedTimestamp;
+ }
+
+ @Override
+ public String getTitle() {
+ return title;
+ }
+
+ @Override
+ public void getTitle(CharArrayBuffer dataOut) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean hasHiResImage() {
+ return hiResImageUri != null;
+ }
+
+ @Override
+ public boolean hasIconImage() {
+ return iconImageUri != null;
+ }
+
+ @Override
+ public boolean isDataValid() {
+ return true;
+ }
+
+ @Override
+ public Player freeze() {
+ return this;
+ }
+
+ @Hide
+ public String getGamerTag() {
+ return gamerTag;
+ }
+
+ @Hide
+ public String getName() {
+ return name;
+ }
+
+ @Hide
+ public String getIconImageUrl() {
+ return iconImageUrl;
+ }
+
+ @Hide
+ public String getHiResImageUrl() {
+ return hiResImageUrl;
+ }
+
+ @Hide
+ public String getBannerImageLandscapeUrl() {
+ return bannerImageLandscapeUrl;
+ }
+
+ @Hide
+ public String getBannerImagePortraitUrl() {
+ return bannerImagePortraitUrl;
+ }
+
+ @Hide
+ public int getIsInCircles() {
+ return isInCircles;
+ }
+
+ @Hide
+ public boolean isProfileVisible() {
+ return profileVisible;
+ }
+
+ @Hide
+ public boolean getHasDebugAccess() {
+ return hasDebugAccess;
+ }
+
+ @Hide
+ public long getTotalUnlockedAchievement() {
+ return totalUnlockedAchievement;
+ }
+
+ @Hide
+ public boolean isAlwaysAutoSignIn() {
+ return alwaysAutoSignIn;
+ }
+
+ @Hide
+ public MostRecentGameInfoEntity getMostRecentGameInfo() {
+ return mostRecentGameInfo;
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PlayerEntity.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevel.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevel.java
new file mode 100644
index 0000000000000000000000000000000000000000..8aebb833e9c1ea67b9882ba2d9f30a8069e2d470
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevel.java
@@ -0,0 +1,73 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.os.Parcel;
+import androidx.annotation.NonNull;
+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 level a player can obtain in the metagame.
+ *
+ * A {@code PlayerLevel} has three components: a numeric value, and a range of XP totals it represents. A player is considered a
+ * given level if they have at least {@link #getMinXp()} and less than {@link #getMaxXp()}.
+ */
+@SafeParcelable.Class
+public class PlayerLevel extends AbstractSafeParcelable {
+ @Field(value = 1, getterName = "getLevelNumber")
+ private final int levelNumber;
+ @Field(value = 2, getterName = "getMinXp")
+ private final long minXp;
+ @Field(value = 3, getterName = "getMaxXp")
+ private final long maxXp;
+
+ @Constructor
+ @Hide
+ public PlayerLevel(@Param(1) int levelNumber, @Param(2) long minXp, @Param(3) long maxXp) {
+ this.levelNumber = levelNumber;
+ this.minXp = minXp;
+ this.maxXp = maxXp;
+ }
+
+ /**
+ * Returns the number for this level, e.g. "level 10".
+ *
+ * This is the level that this object represents. For a player to be considered as being of this level, the value given by
+ * {@link PlayerLevelInfo#getCurrentXpTotal()} must fall in the range [{@link #getMinXp()}, {@link #getMaxXp()}).
+ *
+ * @return The level number for this level.
+ */
+ public int getLevelNumber() {
+ return levelNumber;
+ }
+
+ /**
+ * @return The maximum XP value represented by this level, exclusive.
+ */
+ public long getMaxXp() {
+ return maxXp;
+ }
+
+ /**
+ * @return The minimum XP value needed to attain this level, inclusive.
+ */
+ public long getMinXp() {
+ return minXp;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ CREATOR.writeToParcel(this, dest, flags);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PlayerLevel.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevelInfo.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevelInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1c0dc794ba9b61e62f8fb80b1558c72a247e6ae
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerLevelInfo.java
@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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 com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+/**
+ * Data object representing the current level information of a player in the metagame.
+ *
+ * A {@code PlayerLevelInfo} has four components: the player's current XP, the timestamp of the player's last level-up, the
+ * player's current level, and the player's next level.
+ */
+public class PlayerLevelInfo extends AutoSafeParcelable {
+ @Field(1)
+ private long currentXpTotal;
+ @Field(2)
+ private long lastLevelUpTimestamp;
+ @Field(3)
+ private PlayerLevel currentLevel;
+ @Field(4)
+ private PlayerLevel nextLevel;
+
+ @Hide
+ public PlayerLevelInfo() {
+ }
+
+ @Hide
+ public PlayerLevelInfo(long currentXpTotal, long lastLevelUpTimestamp, PlayerLevel currentLevel, PlayerLevel nextLevel) {
+ this.currentXpTotal = currentXpTotal;
+ this.lastLevelUpTimestamp = lastLevelUpTimestamp;
+ this.currentLevel = currentLevel;
+ this.nextLevel = nextLevel;
+ }
+
+ /**
+ * Getter for the player's current level object. This object will be the same as the one returned from {@link #getNextLevel()} if the
+ * player reached the maximum level.
+ *
+ * @return The player's current level object.
+ * @see #isMaxLevel()
+ */
+ public PlayerLevel getCurrentLevel() {
+ return currentLevel;
+ }
+
+ /**
+ * @return The player's current XP value.
+ */
+ public long getCurrentXpTotal() {
+ return currentXpTotal;
+ }
+
+ /**
+ * @return The timestamp of the player's last level-up.
+ */
+ public long getLastLevelUpTimestamp() {
+ return lastLevelUpTimestamp;
+ }
+
+ /**
+ * Getter for the player's next level object. This object will be the same as the one returned from {@link #getCurrentLevel()} if the
+ * player reached the maximum level.
+ *
+ * @return The player's next level object.
+ * @see #isMaxLevel()
+ */
+ public PlayerLevel getNextLevel() {
+ return nextLevel;
+ }
+
+ /**
+ * @return {@code true} if the player reached the maximum level ({@link #getCurrentLevel()} is the same as {@link #getNextLevel()}.
+ */
+ public boolean isMaxLevel() {
+ return currentLevel.equals(nextLevel);
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PlayerLevelInfo.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerRef.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRef.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee6d899534e250cbb8c6cd991440927bcf2315f7
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRef.java
@@ -0,0 +1,133 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games;
+
+import android.database.CharArrayBuffer;
+import android.net.Uri;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import com.google.android.gms.common.data.DataBufferRef;
+import com.google.android.gms.common.data.DataHolder;
+import org.microg.gms.common.Hide;
+
+@Hide
+public class PlayerRef extends DataBufferRef implements Player {
+ public PlayerRef(DataHolder dataHolder, int position) {
+ super(dataHolder, position);
+ }
+
+ private Uri toUri(String str) {
+ if (str == null) return null;
+ return Uri.parse(str);
+ }
+
+ @Override
+ public Uri getBannerImageLandscapeUri() {
+ return toUri(getString(PlayerColumns.bannerImageLandscapeUri));
+ }
+
+ @Override
+ public Uri getBannerImagePortraitUri() {
+ return toUri(getString(PlayerColumns.bannerImagePortraitUri));
+ }
+
+ @Override
+ public CurrentPlayerInfo getCurrentPlayerInfo() {
+ return null;
+ }
+
+ @Override
+ public void getDisplayName(CharArrayBuffer dataOut) {
+ copyToBuffer(PlayerColumns.profileName, dataOut);
+ }
+
+ @Override
+ public String getDisplayName() {
+ return getString(PlayerColumns.profileName);
+ }
+
+ @Override
+ public Uri getHiResImageUri() {
+ return toUri(getString(PlayerColumns.profileHiResImageUri));
+ }
+
+ @Override
+ public Uri getIconImageUri() {
+ return toUri(getString(PlayerColumns.profileIconImageUri));
+ }
+
+ @Override
+ public long getLastPlayedWithTimestamp() {
+ return getLong(PlayerColumns.playedWithTimestamp);
+ }
+
+ @Override
+ public PlayerLevelInfo getLevelInfo() {
+ return null;
+ }
+
+ @Override
+ public String getPlayerId() {
+ return getString(PlayerColumns.externalPlayerId);
+ }
+
+ @Override
+ public PlayerRelationshipInfo getRelationshipInfo() {
+ return null;
+ }
+
+ @Override
+ public long getRetrievedTimestamp() {
+ return getLong(PlayerColumns.lastUpdated);
+ }
+
+ @Override
+ public String getTitle() {
+ return getString(PlayerColumns.playerTitle);
+ }
+
+ @Override
+ public void getTitle(CharArrayBuffer dataOut) {
+ copyToBuffer(PlayerColumns.playerTitle, dataOut);
+ }
+
+ @Override
+ public boolean hasHiResImage() {
+ return hasColumn(PlayerColumns.profileHiResImageUri);
+ }
+
+ @Override
+ public boolean hasIconImage() {
+ return hasColumn(PlayerColumns.profileIconImageUri);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ new PlayerEntity(this).writeToParcel(dest, flags);
+ }
+
+ @Override
+ public Player freeze() {
+ return null;
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public Player createFromParcel(Parcel source) {
+ return PlayerEntity.CREATOR.createFromParcel(source);
+ }
+
+ @Override
+ public Player[] newArray(int size) {
+ return new Player[size];
+ }
+ };
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfo.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..edac38537652e5958cb6820f9ca67f6886fba330
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfo.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.os.Parcelable;
+import com.google.android.gms.common.data.Freezable;
+
+/**
+ * Data object representing the relationship information of a player.
+ */
+public interface PlayerRelationshipInfo extends Freezable, Parcelable {
+ /**
+ * Retrieves this player's friend status relative to the currently signed-in player. The possible output can be found in
+ * {@link Player.PlayerFriendStatus}.
+ */
+ @Player.PlayerFriendStatus
+ int getFriendStatus();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfoEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfoEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..e34e3282489f4a2ad53b8dda325c553186c632dc
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayerRelationshipInfoEntity.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games;
+
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+@Hide
+public class PlayerRelationshipInfoEntity extends AutoSafeParcelable implements PlayerRelationshipInfo {
+ @Field(1)
+ @Player.PlayerFriendStatus
+ private int friendStatus;
+ @Field(2)
+ private String nickname;
+ @Field(3)
+ private String invitationNickname;
+ @Field(4)
+ private String nicknameAbuseReportToken;
+
+ public PlayerRelationshipInfoEntity() {
+ }
+
+ public PlayerRelationshipInfoEntity(PlayerRelationshipInfo copy) {
+ friendStatus = copy.getFriendStatus();
+ }
+
+ public PlayerRelationshipInfoEntity(int friendStatus, String nickname, String invitationNickname, String nicknameAbuseReportToken) {
+ this.friendStatus = friendStatus;
+ this.nickname = nickname;
+ this.invitationNickname = invitationNickname;
+ this.nicknameAbuseReportToken = nicknameAbuseReportToken;
+ }
+
+ @Override
+ @Player.PlayerFriendStatus
+ public int getFriendStatus() {
+ return friendStatus;
+ }
+
+ @Override
+ public PlayerRelationshipInfo freeze() {
+ return this;
+ }
+
+ @Override
+ public boolean isDataValid() {
+ return true;
+ }
+
+ public String getNickname() {
+ return nickname;
+ }
+
+ public String getInvitationNickname() {
+ return invitationNickname;
+ }
+
+ public String getNicknameAbuseReportToken() {
+ return nicknameAbuseReportToken;
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(PlayerRelationshipInfoEntity.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/Players.java b/play-services-games/src/main/java/com/google/android/gms/games/Players.java
new file mode 100644
index 0000000000000000000000000000000000000000..4172ce0ac4d9bf11336c4c9731331fcd129281e5
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/Players.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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;
+
+/**
+ * Entry point for player functionality.
+ *
+ * @deprecated Use {@link PlayersClient} instead
+ */
+@Deprecated
+public interface Players {
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/PlayersClient.java b/play-services-games/src/main/java/com/google/android/gms/games/PlayersClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..c61e4e3fdaa47fdfd255093e634e45a3b27f2049
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/PlayersClient.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2023 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.app.Activity;
+import android.content.Intent;
+import android.os.RemoteException;
+import com.google.android.gms.tasks.Task;
+
+/**
+ * A client to interact with Players.
+ */
+public interface PlayersClient {
+ /**
+ * Used by the Player Search UI to return a list of parceled Player objects. Retrieve with {@link Intent#getParcelableArrayListExtra(String)}.
+ *
+ * @see #getPlayerSearchIntent()
+ */
+ String EXTRA_PLAYER_SEARCH_RESULTS = "player_search_results";
+
+ /**
+ * Returns a {@link Task} which asynchronously loads the current signed-in {@link Player}, if available.
+ *
+ * The returned {@code Task} can fail with a {@link RemoteException}.
+ *
+ * @param forceReload If {@code true}, this call will clear any locally-cached data and attempt to fetch the latest data from the server. This would
+ * commonly be used for something like a user-initiated refresh. Normally, this should be set to {@code false} to gain advantages
+ * of data caching.
+ */
+ Task> getCurrentPlayer(boolean forceReload);
+
+ /**
+ * Returns a {@link Task} which asynchronously loads the current signed-in {@link Player}, if available.
+ *
+ * The returned {@code Task} can fail with a {@link RemoteException}.
+ */
+ Task getCurrentPlayer();
+
+ /**
+ * Returns a {@link Task} which asynchronously loads the current signed-in player ID, if available.
+ *
+ * The returned {@code Task} can fail with a {@link RemoteException}.
+ */
+ Task getCurrentPlayerId();
+
+ /**
+ * Returns a {@link Task} which asynchronously loads an {@link Intent} that will display a screen where the user can search for players.
+ *
+ * Note that this must be invoked with {@link Activity#startActivityForResult(Intent, int)}, so that the identity of the
+ * calling package can be established.
+ *
+ * If the user canceled, the result will be {@link Activity#RESULT_CANCELED}. If the user selected any players from the search
+ * results list, the result will be {@link Activity#RESULT_OK}, and the data intent will contain a list of parceled Player objects in
+ * {@link #EXTRA_PLAYER_SEARCH_RESULTS}.
+ *
+ * Note that the current Player Search UI only allows a single selection, so the returned list of parceled Player objects will
+ * currently contain at most one Player.
+ *
+ * The returned {@code Task} can fail with a {@link RemoteException}.
+ */
+ Task getPlayerSearchIntent();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/achievement/package-info.java b/play-services-games/src/main/java/com/google/android/gms/games/achievement/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..e6a223f2f4996c0119c1d44365b25500984d6b01
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/achievement/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2022 microG Project Team
+ * SPDX-License-Identifier: CC-BY-4.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.
+ */
+/**
+ * Contains classes for loading and updating achievements.
+ */
+package com.google.android.gms.games.achievement;
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/client/PlayGamesConsistencyTokens.java b/play-services-games/src/main/java/com/google/android/gms/games/client/PlayGamesConsistencyTokens.java
new file mode 100644
index 0000000000000000000000000000000000000000..51071a02658d575f07696420d417db19e5c778ac
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/client/PlayGamesConsistencyTokens.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.client;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+import org.microg.gms.utils.ToStringHelper;
+
+public class PlayGamesConsistencyTokens implements Parcelable {
+ public final String oneupConsistencyToken;
+ public final String superGlueConsistencyToken;
+
+ public PlayGamesConsistencyTokens(String oneupConsistencyToken, String superGlueConsistencyToken) {
+ this.oneupConsistencyToken = oneupConsistencyToken;
+ this.superGlueConsistencyToken = superGlueConsistencyToken;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return ToStringHelper.name("PlayGamesConsistencyTokens")
+ .field("oneupConsistencyToken", oneupConsistencyToken)
+ .field("superGlueConsistencyToken", superGlueConsistencyToken)
+ .end();
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeString(oneupConsistencyToken);
+ dest.writeString(superGlueConsistencyToken);
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public PlayGamesConsistencyTokens createFromParcel(Parcel source) {
+ return new PlayGamesConsistencyTokens(source.readString(), source.readString());
+ }
+
+ @Override
+ public PlayGamesConsistencyTokens[] newArray(int size) {
+ return new PlayGamesConsistencyTokens[size];
+ }
+ };
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInRequest.java b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5cf2d0bd1668f7cdf723cef96e1ff2e32bbb3900
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInRequest.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.internal.connect;
+
+import androidx.annotation.NonNull;
+import org.microg.gms.utils.ToStringHelper;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class GamesSignInRequest extends AutoSafeParcelable {
+ @Field(1)
+ public int signInType;
+ @Field(2)
+ public SignInResolutionResult previousStepResolutionResult;
+
+ @NonNull
+ @Override
+ public String toString() {
+ return ToStringHelper.name("GamesSignInRequest")
+ .field("signInType", signInType)
+ .field("previousStepResolutionResult", previousStepResolutionResult)
+ .end();
+ }
+
+ public static final Creator CREATOR = findCreator(GamesSignInRequest.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInResponse.java b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..05a65b33fc35a4b9f873251c07e30d0f901efe29
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/GamesSignInResponse.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.internal.connect;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class GamesSignInResponse extends AutoSafeParcelable {
+ @Field(1)
+ public String gameRunToken;
+ public static final Creator CREATOR = findCreator(GamesSignInResponse.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/SignInResolutionResult.java b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/SignInResolutionResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..9b3ccf15fc5b6ca24393d23b6ef9951854e63c36
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/internal/connect/SignInResolutionResult.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.internal.connect;
+
+import android.content.Intent;
+import androidx.annotation.NonNull;
+import org.microg.gms.utils.ToStringHelper;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class SignInResolutionResult extends AutoSafeParcelable {
+ @Field(1)
+ public Intent resultData;
+
+ @NonNull
+ @Override
+ public String toString() {
+ return ToStringHelper.name("SignInResolutionResult").field("resultData", resultData).end();
+ }
+
+ public static final Creator CREATOR = findCreator(SignInResolutionResult.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfo.java b/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee60b0d3d1fccd40245e94b780395588ad5d8a64
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfo.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.internal.player;
+
+import android.net.Uri;
+import android.os.Parcelable;
+import com.google.android.gms.common.data.Freezable;
+
+public interface MostRecentGameInfo extends Freezable, Parcelable {
+ long getActivityTimestampMillis();
+
+ Uri getGameFeaturedImageUri();
+
+ Uri getGameHiResImageUri();
+
+ Uri getGameIconImageUri();
+
+ String getGameId();
+
+ String getGameName();
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfoEntity.java b/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfoEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..59a58f9f0865c39a49ce6ad1f528d79c88bcb4fc
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/internal/player/MostRecentGameInfoEntity.java
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.internal.player;
+
+import android.net.Uri;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.Hide;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class MostRecentGameInfoEntity extends AutoSafeParcelable implements MostRecentGameInfo {
+ @Field(1)
+ private String gameId;
+ @Field(2)
+ private String gameName;
+ @Field(3)
+ private long activityTimestampMillis;
+ @Field(4)
+ private Uri gameIconImageUri;
+ @Field(5)
+ private Uri gameHiResImageUri;
+ @Field(6)
+ private Uri gameFeaturedImageUri;
+
+ @Hide
+ public MostRecentGameInfoEntity() {
+ }
+
+ @Hide
+ public MostRecentGameInfoEntity(String gameId, String gameName, long activityTimestampMillis, Uri gameIconImageUri, Uri gameHiResImageUri, Uri gameFeaturedImageUri) {
+ this.gameId = gameId;
+ this.gameName = gameName;
+ this.activityTimestampMillis = activityTimestampMillis;
+ this.gameIconImageUri = gameIconImageUri;
+ this.gameHiResImageUri = gameHiResImageUri;
+ this.gameFeaturedImageUri = gameFeaturedImageUri;
+ }
+
+ @Override
+ public long getActivityTimestampMillis() {
+ return activityTimestampMillis;
+ }
+
+ @Override
+ public Uri getGameFeaturedImageUri() {
+ return gameFeaturedImageUri;
+ }
+
+ @Override
+ public Uri getGameHiResImageUri() {
+ return gameHiResImageUri;
+ }
+
+ @Override
+ public Uri getGameIconImageUri() {
+ return gameIconImageUri;
+ }
+
+ @Override
+ public String getGameId() {
+ return gameId;
+ }
+
+ @Override
+ public String getGameName() {
+ return gameName;
+ }
+
+ @Override
+ public boolean isDataValid() {
+ return true;
+ }
+
+ @Override
+ public MostRecentGameInfo freeze() {
+ return this;
+ }
+
+ public static final SafeParcelableCreatorAndWriter CREATOR = findCreator(MostRecentGameInfoEntity.class);
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/leaderboard/package-info.java b/play-services-games/src/main/java/com/google/android/gms/games/leaderboard/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..197c499713bc380ec5f9369def0ce16a03a46938
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/leaderboard/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2022 microG Project Team
+ * SPDX-License-Identifier: CC-BY-4.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.
+ */
+/**
+ * Contains data classes for leaderboards.
+ */
+package com.google.android.gms.games.leaderboard;
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java b/play-services-games/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b7b393e57bd673f12ee8ddb57f784b05859bcdc
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2019 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.games.multiplayer.realtime;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import org.microg.gms.common.Hide;
+
+@Hide
+public final class RealTimeMessage implements Parcelable {
+ public static final int RELIABLE = 1;
+ public static final int UNRELIABLE = 0;
+
+ private final String senderParticipantId;
+ private final byte[] messageData;
+ private final int reliable;
+
+ public RealTimeMessage(String senderParticipantId, byte[] messageData, int reliable) {
+ this.senderParticipantId = senderParticipantId;
+ this.messageData = messageData.clone();
+ this.reliable = reliable;
+ }
+
+ private RealTimeMessage(Parcel parcel) {
+ this(parcel.readString(), parcel.createByteArray(), parcel.readInt());
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public RealTimeMessage createFromParcel(Parcel in) {
+ return new RealTimeMessage(in);
+ }
+ @Override
+ public RealTimeMessage[] newArray(int size) {
+ return new RealTimeMessage[size];
+ }
+ };
+
+ public byte[] getMessageData() {
+ return this.messageData;
+ }
+
+ public String getSenderParticipantId() {
+ return this.senderParticipantId;
+ }
+
+ public boolean isReliable() {
+ return this.reliable == RELIABLE;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int flag) {
+ parcel.writeString(this.senderParticipantId);
+ parcel.writeByteArray(this.messageData);
+ parcel.writeInt(this.reliable);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+}
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/package-info.java b/play-services-games/src/main/java/com/google/android/gms/games/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b8e49ea9e7ec24887440de76bb1f1beb73fcd54
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2022 microG Project Team
+ * SPDX-License-Identifier: CC-BY-4.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.
+ */
+/**
+ * Contains the games client class.
+ */
+package com.google.android.gms.games;
diff --git a/play-services-games/src/main/java/com/google/android/gms/games/snapshot/package-info.java b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..c33b19cf3aaafd12c9a97cbf3509e2478b0a6a5c
--- /dev/null
+++ b/play-services-games/src/main/java/com/google/android/gms/games/snapshot/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2022 microG Project Team
+ * SPDX-License-Identifier: CC-BY-4.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.
+ */
+/**
+ * Contains data classes for snapshot functionality.
+ */
+package com.google.android.gms.games.snapshot;
diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/NetworkLocationService.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/NetworkLocationService.kt
index 9744ba2aad4d85e2eb4f7fedfd8d1054ce8fa491..cc19b0044eda21b1256b3b77e5d5907f8a49f272 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/NetworkLocationService.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/NetworkLocationService.kt
@@ -57,7 +57,7 @@ class NetworkLocationService : LifecycleService(), WifiDetailsCallback, CellDeta
private val cache by lazy { LocationCacheDatabase(this) }
private val movingWifiHelper by lazy { MovingWifiHelper(this) }
private val settings by lazy { LocationSettings(this) }
- private val wifiScanCache = LruCache(100)
+ private val wifiScanCache = LruCache(100)
private var lastHighPowerScanRealtime = 0L
private var lastLowPowerScanRealtime = 0L
@@ -98,6 +98,8 @@ class NetworkLocationService : LifecycleService(), WifiDetailsCallback, CellDeta
)
}
} catch (e: SecurityException) {
+ Log.d(TAG, "GPS location retriever not initialized due to lack of permission")
+ } catch (e: Exception) {
Log.d(TAG, "GPS location retriever not initialized", e)
}
}
@@ -439,7 +441,7 @@ class NetworkLocationService : LifecycleService(), WifiDetailsCallback, CellDeta
}
}
-private operator fun LruCache.set(key: K, value: V) {
+private operator fun LruCache.set(key: K, value: V) {
put(key, value)
}
diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/MovingWifiHelper.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/MovingWifiHelper.kt
index 821c0a5b82fdc17ad9fef8b8caf03ed66d9050d4..87cc623388bcf11053d6e97bca8bc265ba7db0da 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/MovingWifiHelper.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/MovingWifiHelper.kt
@@ -218,12 +218,10 @@ class MovingWifiHelper(private val context: Context) {
val location = Location(ssid)
return when (ssid) {
"WIFIonICE" -> parseWifiOnIce(location, data)
- "FlixBus" -> parseFlixbus(location, data)
- "FlixBus Wi-Fi" -> parseFlixbus(location, data)
- "FlixTrain Wi-Fi" -> parseFlixbus(location, data)
- "MAVSTART-WIFI" -> parsePassengera(location, data)
+ "FlixBus", "FlixBus Wi-Fi", "FlixTrain Wi-Fi" -> parseFlixbus(location, data)
+ "CDWiFi", "MAVSTART-WIFI" -> parsePassengera(location, data)
"AegeanWiFi" -> parseDisplayUgo(location, data)
- "Telekom_FlyNet" -> parsePanasonic(location, data)
+ "Cathay Pacific", "Telekom_FlyNet" -> parsePanasonic(location, data)
"FlyNet" -> parseBoardConnect(location, data)
else -> throw UnsupportedOperationException()
}
@@ -243,6 +241,7 @@ class MovingWifiHelper(private val context: Context) {
"Telekom_FlyNet" to "https://services.inflightpanasonic.aero/inflight/services/flightdata/v2/flightdata",
"Cathay Pacific" to "https://services.inflightpanasonic.aero/inflight/services/flightdata/v2/flightdata",
"FlyNet" to "https://ww2.lufthansa-flynet.com/map/api/flightData",
+ "CDWiFi" to "http://cdwifi.cz/portal/api/vehicle/realtime",
)
}
}
diff --git a/play-services-location/core/src/main/AndroidManifest.xml b/play-services-location/core/src/main/AndroidManifest.xml
index d9687f96927c4cc664a3e668fd3ac8d8080a19d9..9b4ac06c896a6b2ae097aee7c97431b48d900f3b 100644
--- a/play-services-location/core/src/main/AndroidManifest.xml
+++ b/play-services-location/core/src/main/AndroidManifest.xml
@@ -1,38 +1,47 @@
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+ android:name="org.microg.gms.location.manager.LocationManagerService"
+ android:exported="true">
-
+
-
+
-
-
+
+
-
+
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/AskPermissionActivity.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/AskPermissionActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..3214571203953631b7f2888a481801cc6866c7f4
--- /dev/null
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/AskPermissionActivity.kt
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.location.manager
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Message
+import android.os.Messenger
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.os.bundleOf
+
+const val EXTRA_MESSENGER = "messenger"
+const val EXTRA_PERMISSIONS = "permissions"
+const val EXTRA_GRANT_RESULTS = "results"
+
+private const val REQUEST_CODE_PERMISSION = 120
+
+class AskPermissionActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val permissions = intent?.getStringArrayExtra(EXTRA_PERMISSIONS) ?: emptyArray()
+ ActivityCompat.requestPermissions(this, permissions, REQUEST_CODE_PERMISSION)
+ }
+
+ private fun sendReply(code: Int = RESULT_OK, extras: Bundle = Bundle.EMPTY) {
+ intent?.getParcelableExtra(EXTRA_MESSENGER)?.let {
+ runCatching {
+ it.send(Message.obtain().apply {
+ what = code
+ data = extras
+ })
+ }
+ }
+ setResult(code, Intent().apply { putExtras(extras) })
+ }
+
+ override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) {
+ if (requestCode == REQUEST_CODE_PERMISSION) {
+ sendReply(extras = bundleOf(EXTRA_GRANT_RESULTS to grantResults))
+ finish()
+ } else {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+ }
+ }
+}
\ No newline at end of file
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LastLocationCapsule.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LastLocationCapsule.kt
index 642c3d8783986955784f776ba1f18dbe6a001fdc..0df8f843c2db4e85eb08c2b87cd5b27e9b6586e4 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LastLocationCapsule.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LastLocationCapsule.kt
@@ -111,6 +111,10 @@ class LastLocationCapsule(private val context: Context) {
Log.w(TAG, e)
// Ignore
}
+ fetchFromSystem()
+ }
+
+ fun fetchFromSystem() {
val locationManager = context.getSystemService() ?: return
try {
locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)?.let { updateCoarseLocation(it) }
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManager.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManager.kt
index 2e7af7386960980faab473cea3922224a3f007fd..eec89ed6776fa5d9eef55538b3d93577c89c41a9 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManager.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManager.kt
@@ -6,6 +6,7 @@
package org.microg.gms.location.manager
import android.Manifest
+import android.app.Activity
import android.app.PendingIntent
import android.app.PendingIntent.FLAG_MUTABLE
import android.app.PendingIntent.FLAG_UPDATE_CURRENT
@@ -13,10 +14,10 @@ import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.location.Location
-import android.location.LocationManager
+import android.os.*
import android.os.Build.VERSION.SDK_INT
-import android.os.IBinder
import android.util.Log
+import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
import androidx.core.location.LocationListenerCompat
import androidx.core.location.LocationManagerCompat
@@ -29,6 +30,10 @@ import com.google.android.gms.location.Granularity.GRANULARITY_COARSE
import com.google.android.gms.location.Granularity.GRANULARITY_FINE
import com.google.android.gms.location.Priority.PRIORITY_HIGH_ACCURACY
import com.google.android.gms.location.internal.ClientIdentity
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
import org.microg.gms.location.*
import org.microg.gms.utils.IntentCacheManager
import java.io.PrintWriter
@@ -45,6 +50,8 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
private val gpsLocationListener by lazy { LocationListenerCompat { updateGpsLocation(it) } }
private val networkLocationListener by lazy { LocationListenerCompat { updateNetworkLocation(it) } }
private var boundToSystemNetworkLocation: Boolean = false
+ private val activePermissionRequestLock = Mutex()
+ private var activePermissionRequest: Deferred? = null
val deviceOrientationManager = DeviceOrientationManager(context, lifecycle)
@@ -72,6 +79,7 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
// No last location available at requested granularity due to lack of permission
null
} else {
+ ensurePermissions()
val preLocation = lastLocationCapsule.getLocation(effectiveGranularity, request.maxUpdateAgeMillis)
val processedLocation = postProcessor.process(preLocation, effectiveGranularity, clientIdentity.isGoogle(context))
if (!context.noteAppOpForEffectiveGranularity(clientIdentity, effectiveGranularity)) {
@@ -103,6 +111,7 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
suspend fun addBinderRequest(clientIdentity: ClientIdentity, binder: IBinder, callback: ILocationCallback, request: LocationRequest) {
request.verify(context, clientIdentity)
+ ensurePermissions()
requestManager.add(binder, clientIdentity, callback, request, lastLocationCapsule)
}
@@ -123,6 +132,7 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
suspend fun addIntentRequest(clientIdentity: ClientIdentity, pendingIntent: PendingIntent, request: LocationRequest) {
request.verify(context, clientIdentity)
+ ensurePermissions()
requestManager.add(pendingIntent, clientIdentity, request, lastLocationCapsule)
}
@@ -210,6 +220,8 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
}
} catch (e: SecurityException) {
// Ignore
+ } catch (e: Exception) {
+ // Ignore
}
}
@@ -241,6 +253,46 @@ class LocationManager(private val context: Context, private val lifecycle: Lifec
lastLocationCapsule.getLocation(GRANULARITY_FINE, Long.MAX_VALUE)?.let { deviceOrientationManager.onLocationChanged(it) }
}
+ private suspend fun ensurePermissions(): Boolean {
+ if (SDK_INT < 23)
+ return true
+
+ val permissions = mutableListOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
+ if (SDK_INT >= 29) permissions.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+
+ if (permissions.all { ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED })
+ return true
+
+ val (completable, deferred) = activePermissionRequestLock.withLock {
+ if (activePermissionRequest == null) {
+ val completable = CompletableDeferred()
+ activePermissionRequest = completable
+ completable to activePermissionRequest!!
+ } else {
+ null to activePermissionRequest!!
+ }
+ }
+ if (completable != null) {
+ val intent = Intent(context, AskPermissionActivity::class.java)
+ intent.putExtra(EXTRA_MESSENGER, Messenger(object : Handler(Looper.getMainLooper()) {
+ override fun handleMessage(msg: Message) {
+ if (msg.what == Activity.RESULT_OK) {
+ lastLocationCapsule.fetchFromSystem()
+ onRequestManagerUpdated()
+ val grantResults = msg.data?.getIntArray(EXTRA_GRANT_RESULTS) ?: IntArray(0)
+ completable.complete(grantResults.size == permissions.size && grantResults.all { it == PackageManager.PERMISSION_GRANTED })
+ } else {
+ completable.complete(false)
+ }
+ }
+ }))
+ intent.putExtra(EXTRA_PERMISSIONS, permissions.toTypedArray())
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+ context.startActivity(intent)
+ }
+ return deferred.await()
+ }
+
fun dump(writer: PrintWriter) {
writer.println("Location availability: ${lastLocationCapsule.locationAvailability}")
writer.println("Last coarse location: ${postProcessor.process(lastLocationCapsule.getLocation(GRANULARITY_COARSE, Long.MAX_VALUE), GRANULARITY_COARSE, true)}")
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManagerInstance.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManagerInstance.kt
index f9d8a08b5f8844f143d527a2be904c35d73b96fe..b2bbaa1794ec3a0eb67f9f82ef4b6404e611c32c 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManagerInstance.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationManagerInstance.kt
@@ -29,6 +29,7 @@ import com.google.android.gms.location.internal.*
import com.google.android.gms.location.internal.DeviceOrientationRequestUpdateData.REMOVE_UPDATES
import com.google.android.gms.location.internal.DeviceOrientationRequestUpdateData.REQUEST_UPDATES
import org.microg.gms.common.NonCancelToken
+import org.microg.gms.location.hasNetworkLocationServiceBuiltIn
import org.microg.gms.utils.warnOnTransactionIssues
class LocationManagerInstance(
@@ -158,7 +159,7 @@ class LocationManagerInstance(
lifecycleScope.launchWhenStarted {
val locationManager = context.getSystemService()
val gpsPresent = locationManager?.allProviders?.contains(GPS_PROVIDER) == true
- val networkPresent = locationManager?.allProviders?.contains(NETWORK_PROVIDER) == true
+ val networkPresent = locationManager?.allProviders?.contains(NETWORK_PROVIDER) == true || context.hasNetworkLocationServiceBuiltIn()
val gpsUsable = gpsPresent && locationManager?.isProviderEnabled(GPS_PROVIDER) == true &&
context.packageManager.checkPermission(ACCESS_FINE_LOCATION, clientIdentity.packageName) == PERMISSION_GRANTED
val networkUsable = networkPresent && locationManager?.isProviderEnabled(NETWORK_PROVIDER) == true &&
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationRequestManager.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationRequestManager.kt
index 39dcc603b9cf7a938efca558f8e70abf56cd47f3..2354bd4413d3c53e40b5c290465382a4a5fbe5ad 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationRequestManager.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/manager/LocationRequestManager.kt
@@ -364,7 +364,7 @@ class LocationRequestManager(private val context: Context, private val lifecycle
return request.priority
}
val maxUpdateDelayMillis: Long
- get() = max(request.maxUpdateDelayMillis, intervalMillis)
+ get() = max(max(request.maxUpdateDelayMillis, intervalMillis), 1000L)
val intervalMillis: Long
get() = request.intervalMillis
val updatesPending: Int
@@ -415,6 +415,7 @@ class LocationRequestManager(private val context: Context, private val lifecycle
fun check() {
if (!context.checkAppOpForEffectiveGranularity(clientIdentity, effectiveGranularity)) throw RuntimeException("Lack of permission")
+ if (effectiveGranularity > permissionGranularity) throw RuntimeException("Lack of permission")
if (timePendingMillis < 0) throw RuntimeException("duration limit reached (active for ${(SystemClock.elapsedRealtime() - start).formatDuration()}, duration ${request.durationMillis.formatDuration()})")
if (updatesPending <= 0) throw RuntimeException("max updates reached")
if (callback?.asBinder()?.isBinderAlive == false) throw RuntimeException("Binder died")
@@ -426,7 +427,7 @@ class LocationRequestManager(private val context: Context, private val lifecycle
if (lastLocation != null && location.distanceTo(lastLocation!!) < request.minUpdateDistanceMeters) return false
if (lastLocation == location) return false
val returnedLocation = if (effectiveGranularity > permissionGranularity) {
- throw RuntimeException("lack of permission")
+ throw RuntimeException("Lack of permission")
} else {
if (!context.noteAppOpForEffectiveGranularity(clientIdentity, effectiveGranularity)) {
throw RuntimeException("app op denied")
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
index 99b02de86c43a964bbeb88f10cfb38115c505dac..d05baa3abc5628accd6e23b41a32055872368946 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
@@ -5,9 +5,10 @@
package org.microg.gms.location.ui
-import android.annotation.SuppressLint
+import android.location.LocationManager
import android.os.Build.VERSION.SDK_INT
import android.os.Bundle
+import androidx.core.content.getSystemService
import androidx.core.os.bundleOf
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
@@ -90,8 +91,10 @@ class LocationPreferencesFragment : PreferenceFragmentCompat() {
networkProviderCategory.isVisible = requireContext().hasNetworkLocationServiceBuiltIn()
wifiMls.isVisible = requireContext().hasMozillaLocationServiceSupport()
cellMls.isVisible = requireContext().hasMozillaLocationServiceSupport()
- wifiLearning.isVisible = SDK_INT >= 17
- cellLearning.isVisible = SDK_INT >= 17
+ wifiLearning.isVisible =
+ SDK_INT >= 17 && requireContext().getSystemService()?.allProviders.orEmpty().contains(LocationManager.GPS_PROVIDER)
+ cellLearning.isVisible =
+ SDK_INT >= 17 && requireContext().getSystemService()?.allProviders.orEmpty().contains(LocationManager.GPS_PROVIDER)
}
override fun onResume() {
diff --git a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java
index 1d22bd14b3d3963ab33165f4a9eed4e273582e84..4822e070463fd7fd624ee0ec9ffb5ff5e00d4227 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java
@@ -19,17 +19,17 @@ package org.microg.gms.location;
import android.content.Context;
import android.os.Looper;
+import com.google.android.gms.common.api.Api;
import com.google.android.gms.common.api.Api.ApiOptions.NoOptions;
import org.microg.gms.common.api.ApiClientBuilder;
import org.microg.gms.common.api.ApiClientSettings;
-import org.microg.gms.common.api.ApiClient;
import org.microg.gms.common.api.ConnectionCallbacks;
import org.microg.gms.common.api.OnConnectionFailedListener;
public class ActivityRecognitionApiClientBuilder implements ApiClientBuilder {
@Override
- public ApiClient build(NoOptions options, Context context, Looper looper, ApiClientSettings clientSettings, ConnectionCallbacks callbacks, OnConnectionFailedListener connectionFailedListener) {
+ public Api.Client build(NoOptions options, Context context, Looper looper, ApiClientSettings clientSettings, ConnectionCallbacks callbacks, OnConnectionFailedListener connectionFailedListener) {
return new ActivityRecognitionClientImpl(context, callbacks, connectionFailedListener);
}
}
diff --git a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java
index 504bcc46bc83322f9cb86710331a0f9d34a007f6..8e664fdcdf2ef6049b29374e272eb546fc540c96 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java
@@ -19,17 +19,17 @@ package org.microg.gms.location;
import android.content.Context;
import android.os.Looper;
+import com.google.android.gms.common.api.Api;
import com.google.android.gms.common.api.Api.ApiOptions.NoOptions;
import org.microg.gms.common.api.ApiClientBuilder;
import org.microg.gms.common.api.ApiClientSettings;
-import org.microg.gms.common.api.ApiClient;
import org.microg.gms.common.api.ConnectionCallbacks;
import org.microg.gms.common.api.OnConnectionFailedListener;
public class LocationServicesApiClientBuilder implements ApiClientBuilder {
@Override
- public ApiClient build(NoOptions options, Context context, Looper looper, ApiClientSettings clientSettings, ConnectionCallbacks callbacks, OnConnectionFailedListener connectionFailedListener) {
+ public Api.Client build(NoOptions options, Context context, Looper looper, ApiClientSettings clientSettings, ConnectionCallbacks callbacks, OnConnectionFailedListener connectionFailedListener) {
return new LocationClientImpl(context, callbacks, connectionFailedListener);
}
}
diff --git a/play-services-maps-core-mapbox/build.gradle b/play-services-maps/core/mapbox/build.gradle
similarity index 100%
rename from play-services-maps-core-mapbox/build.gradle
rename to play-services-maps/core/mapbox/build.gradle
diff --git a/play-services-maps-core-mapbox/src/main/AndroidManifest.xml b/play-services-maps/core/mapbox/src/main/AndroidManifest.xml
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/AndroidManifest.xml
rename to play-services-maps/core/mapbox/src/main/AndroidManifest.xml
diff --git a/play-services-maps-core-mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular b/play-services-maps/core/mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular
rename to play-services-maps/core/mapbox/src/main/assets/Open Sans Regular,Arial Unicode MS Regular
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/0-255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/0-255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/0-255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1024-1279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1024-1279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1024-1279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10240-10495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10240-10495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10240-10495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10496-10751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10496-10751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10496-10751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10752-11007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/10752-11007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/10752-11007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11008-11263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11008-11263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11008-11263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11264-11519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11264-11519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11264-11519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11520-11775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11520-11775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11520-11775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11776-12031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/11776-12031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/11776-12031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12032-12287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12032-12287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12032-12287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12288-12543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12288-12543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12288-12543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12544-12799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12544-12799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12544-12799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1280-1535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1280-1535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1280-1535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12800-13055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/12800-13055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/12800-13055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13056-13311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13056-13311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13056-13311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13312-13567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13312-13567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13312-13567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13568-13823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13568-13823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13568-13823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13824-14079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/13824-14079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/13824-14079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14080-14335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14080-14335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14080-14335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14336-14591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14336-14591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14336-14591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14592-14847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14592-14847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14592-14847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14848-15103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/14848-15103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/14848-15103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15104-15359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15104-15359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15104-15359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1536-1791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1536-1791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1536-1791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15360-15615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15360-15615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15360-15615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15616-15871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15616-15871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15616-15871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15872-16127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/15872-16127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/15872-16127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16128-16383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16128-16383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16128-16383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16384-16639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16384-16639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16384-16639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16640-16895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16640-16895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16640-16895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16896-17151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/16896-17151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/16896-17151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17152-17407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17152-17407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17152-17407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17408-17663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17408-17663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17408-17663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17664-17919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17664-17919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17664-17919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1792-2047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/1792-2047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/1792-2047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17920-18175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/17920-18175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/17920-18175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18176-18431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18176-18431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18176-18431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18432-18687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18432-18687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18432-18687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18688-18943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18688-18943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18688-18943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18944-19199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/18944-19199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/18944-19199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19200-19455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19200-19455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19200-19455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19456-19711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19456-19711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19456-19711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19712-19967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19712-19967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19712-19967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19968-20223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/19968-20223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/19968-20223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20224-20479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20224-20479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20224-20479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2048-2303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2048-2303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2048-2303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20480-20735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20480-20735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20480-20735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20736-20991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20736-20991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20736-20991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20992-21247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/20992-21247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/20992-21247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21248-21503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21248-21503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21248-21503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21504-21759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21504-21759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21504-21759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21760-22015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/21760-22015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/21760-22015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22016-22271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22016-22271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22016-22271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22272-22527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22272-22527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22272-22527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22528-22783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22528-22783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22528-22783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22784-23039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/22784-23039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/22784-23039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2304-2559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2304-2559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2304-2559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23040-23295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23040-23295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23040-23295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23296-23551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23296-23551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23296-23551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23552-23807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23552-23807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23552-23807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23808-24063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/23808-24063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/23808-24063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24064-24319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24064-24319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24064-24319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24320-24575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24320-24575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24320-24575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24576-24831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24576-24831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24576-24831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24832-25087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/24832-25087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/24832-25087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25088-25343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25088-25343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25088-25343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25344-25599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25344-25599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25344-25599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/256-511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/256-511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/256-511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2560-2815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2560-2815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2560-2815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25600-25855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25600-25855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25600-25855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25856-26111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/25856-26111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/25856-26111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26112-26367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26112-26367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26112-26367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26368-26623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26368-26623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26368-26623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26624-26879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26624-26879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26624-26879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26880-27135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/26880-27135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/26880-27135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27136-27391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27136-27391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27136-27391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27392-27647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27392-27647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27392-27647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27648-27903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27648-27903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27648-27903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27904-28159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/27904-28159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/27904-28159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2816-3071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/2816-3071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/2816-3071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28160-28415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28160-28415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28160-28415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28416-28671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28416-28671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28416-28671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28672-28927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28672-28927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28672-28927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28928-29183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/28928-29183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/28928-29183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29184-29439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29184-29439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29184-29439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29440-29695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29440-29695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29440-29695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29696-29951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29696-29951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29696-29951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29952-30207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/29952-30207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/29952-30207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30208-30463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30208-30463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30208-30463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30464-30719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30464-30719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30464-30719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3072-3327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3072-3327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3072-3327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30720-30975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30720-30975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30720-30975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30976-31231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/30976-31231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/30976-31231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31232-31487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31232-31487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31232-31487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31488-31743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31488-31743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31488-31743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31744-31999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/31744-31999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/31744-31999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32000-32255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32000-32255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32000-32255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32256-32511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32256-32511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32256-32511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32512-32767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32512-32767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32512-32767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32768-33023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/32768-33023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/32768-33023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33024-33279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33024-33279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33024-33279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3328-3583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3328-3583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3328-3583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33280-33535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33280-33535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33280-33535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33536-33791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33536-33791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33536-33791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33792-34047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/33792-34047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/33792-34047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34048-34303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34048-34303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34048-34303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34304-34559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34304-34559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34304-34559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34560-34815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34560-34815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34560-34815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34816-35071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/34816-35071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/34816-35071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35072-35327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35072-35327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35072-35327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35328-35583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35328-35583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35328-35583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35584-35839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35584-35839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35584-35839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3584-3839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3584-3839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3584-3839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35840-36095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/35840-36095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/35840-36095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36096-36351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36096-36351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36096-36351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36352-36607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36352-36607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36352-36607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36608-36863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36608-36863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36608-36863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36864-37119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/36864-37119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/36864-37119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37120-37375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37120-37375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37120-37375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37376-37631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37376-37631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37376-37631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37632-37887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37632-37887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37632-37887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37888-38143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/37888-38143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/37888-38143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38144-38399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38144-38399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38144-38399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3840-4095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/3840-4095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/3840-4095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38400-38655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38400-38655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38400-38655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38656-38911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38656-38911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38656-38911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38912-39167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/38912-39167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/38912-39167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39168-39423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39168-39423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39168-39423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39424-39679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39424-39679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39424-39679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39680-39935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39680-39935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39680-39935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39936-40191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/39936-40191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/39936-40191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40192-40447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40192-40447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40192-40447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40448-40703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40448-40703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40448-40703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40704-40959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40704-40959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40704-40959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4096-4351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4096-4351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4096-4351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40960-41215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/40960-41215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/40960-41215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41216-41471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41216-41471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41216-41471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41472-41727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41472-41727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41472-41727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41728-41983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41728-41983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41728-41983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41984-42239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/41984-42239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/41984-42239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42240-42495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42240-42495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42240-42495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42496-42751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42496-42751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42496-42751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42752-43007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/42752-43007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/42752-43007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43008-43263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43008-43263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43008-43263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43264-43519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43264-43519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43264-43519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4352-4607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4352-4607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4352-4607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43520-43775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43520-43775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43520-43775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43776-44031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/43776-44031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/43776-44031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44032-44287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44032-44287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44032-44287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44288-44543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44288-44543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44288-44543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44544-44799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44544-44799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44544-44799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44800-45055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/44800-45055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/44800-45055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45056-45311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45056-45311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45056-45311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45312-45567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45312-45567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45312-45567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45568-45823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45568-45823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45568-45823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45824-46079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/45824-46079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/45824-46079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4608-4863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4608-4863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4608-4863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46080-46335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46080-46335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46080-46335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46336-46591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46336-46591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46336-46591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46592-46847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46592-46847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46592-46847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46848-47103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/46848-47103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/46848-47103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47104-47359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47104-47359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47104-47359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47360-47615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47360-47615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47360-47615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47616-47871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47616-47871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47616-47871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47872-48127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/47872-48127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/47872-48127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48128-48383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48128-48383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48128-48383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48384-48639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48384-48639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48384-48639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4864-5119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/4864-5119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/4864-5119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48640-48895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48640-48895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48640-48895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48896-49151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/48896-49151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/48896-49151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49152-49407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49152-49407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49152-49407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49408-49663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49408-49663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49408-49663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49664-49919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49664-49919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49664-49919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49920-50175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/49920-50175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/49920-50175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50176-50431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50176-50431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50176-50431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50432-50687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50432-50687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50432-50687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50688-50943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50688-50943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50688-50943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50944-51199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/50944-51199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/50944-51199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/512-767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/512-767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/512-767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5120-5375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5120-5375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5120-5375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51200-51455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51200-51455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51200-51455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51456-51711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51456-51711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51456-51711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51712-51967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51712-51967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51712-51967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51968-52223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/51968-52223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/51968-52223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52224-52479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52224-52479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52224-52479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52480-52735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52480-52735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52480-52735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52736-52991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52736-52991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52736-52991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52992-53247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/52992-53247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/52992-53247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53248-53503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53248-53503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53248-53503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53504-53759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53504-53759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53504-53759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5376-5631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5376-5631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5376-5631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53760-54015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/53760-54015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/53760-54015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54016-54271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54016-54271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54016-54271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54272-54527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54272-54527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54272-54527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54528-54783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54528-54783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54528-54783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54784-55039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/54784-55039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/54784-55039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55040-55295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55040-55295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55040-55295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55296-55551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55296-55551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55296-55551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55552-55807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55552-55807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55552-55807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55808-56063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/55808-56063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/55808-56063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56064-56319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56064-56319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56064-56319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5632-5887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5632-5887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5632-5887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56320-56575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56320-56575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56320-56575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56576-56831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56576-56831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56576-56831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56832-57087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/56832-57087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/56832-57087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57088-57343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57088-57343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57088-57343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57344-57599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57344-57599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57344-57599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57600-57855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57600-57855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57600-57855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57856-58111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/57856-58111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/57856-58111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58112-58367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58112-58367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58112-58367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58368-58623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58368-58623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58368-58623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58624-58879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58624-58879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58624-58879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5888-6143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/5888-6143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/5888-6143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58880-59135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/58880-59135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/58880-59135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59136-59391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59136-59391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59136-59391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59392-59647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59392-59647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59392-59647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59648-59903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59648-59903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59648-59903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59904-60159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/59904-60159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/59904-60159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60160-60415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60160-60415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60160-60415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60416-60671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60416-60671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60416-60671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60672-60927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60672-60927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60672-60927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60928-61183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/60928-61183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/60928-61183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61184-61439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61184-61439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61184-61439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6144-6399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6144-6399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6144-6399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61440-61695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61440-61695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61440-61695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61696-61951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61696-61951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61696-61951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61952-62207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/61952-62207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/61952-62207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62208-62463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62208-62463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62208-62463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62464-62719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62464-62719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62464-62719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62720-62975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62720-62975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62720-62975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62976-63231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/62976-63231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/62976-63231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63232-63487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63232-63487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63232-63487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63488-63743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63488-63743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63488-63743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63744-63999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/63744-63999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/63744-63999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6400-6655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6400-6655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6400-6655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64000-64255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64000-64255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64000-64255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64256-64511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64256-64511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64256-64511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64512-64767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64512-64767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64512-64767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64768-65023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/64768-65023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/64768-65023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65024-65279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65024-65279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65024-65279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65280-65535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/65280-65535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/65280-65535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6656-6911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6656-6911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6656-6911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6912-7167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/6912-7167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/6912-7167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7168-7423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7168-7423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7168-7423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7424-7679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7424-7679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7424-7679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/768-1023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/768-1023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/768-1023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7680-7935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7680-7935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7680-7935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7936-8191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/7936-8191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/7936-8191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8192-8447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8192-8447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8192-8447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8448-8703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8448-8703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8448-8703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8704-8959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8704-8959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8704-8959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8960-9215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/8960-9215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/8960-9215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9216-9471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9216-9471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9216-9471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9472-9727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9472-9727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9472-9727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9728-9983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9728-9983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9728-9983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9984-10239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Bold/9984-10239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Bold/9984-10239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/0-255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/0-255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/0-255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1024-1279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1024-1279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1024-1279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10240-10495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10240-10495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10240-10495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10496-10751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10496-10751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10496-10751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10752-11007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/10752-11007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/10752-11007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11008-11263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11008-11263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11008-11263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11264-11519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11264-11519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11264-11519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11520-11775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11520-11775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11520-11775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11776-12031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/11776-12031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/11776-12031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12032-12287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12032-12287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12032-12287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12288-12543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12288-12543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12288-12543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12544-12799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12544-12799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12544-12799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1280-1535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1280-1535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1280-1535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12800-13055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/12800-13055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/12800-13055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13056-13311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13056-13311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13056-13311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13312-13567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13312-13567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13312-13567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13568-13823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13568-13823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13568-13823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13824-14079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/13824-14079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/13824-14079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14080-14335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14080-14335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14080-14335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14336-14591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14336-14591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14336-14591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14592-14847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14592-14847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14592-14847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14848-15103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/14848-15103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/14848-15103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15104-15359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15104-15359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15104-15359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1536-1791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1536-1791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1536-1791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15360-15615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15360-15615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15360-15615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15616-15871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15616-15871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15616-15871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15872-16127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/15872-16127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/15872-16127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16128-16383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16128-16383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16128-16383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16384-16639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16384-16639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16384-16639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16640-16895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16640-16895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16640-16895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16896-17151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/16896-17151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/16896-17151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17152-17407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17152-17407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17152-17407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17408-17663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17408-17663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17408-17663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17664-17919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17664-17919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17664-17919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1792-2047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/1792-2047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/1792-2047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17920-18175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/17920-18175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/17920-18175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18176-18431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18176-18431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18176-18431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18432-18687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18432-18687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18432-18687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18688-18943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18688-18943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18688-18943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18944-19199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/18944-19199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/18944-19199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19200-19455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19200-19455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19200-19455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19456-19711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19456-19711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19456-19711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19712-19967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19712-19967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19712-19967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19968-20223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/19968-20223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/19968-20223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20224-20479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20224-20479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20224-20479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2048-2303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2048-2303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2048-2303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20480-20735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20480-20735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20480-20735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20736-20991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20736-20991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20736-20991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20992-21247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/20992-21247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/20992-21247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21248-21503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21248-21503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21248-21503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21504-21759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21504-21759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21504-21759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21760-22015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/21760-22015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/21760-22015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22016-22271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22016-22271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22016-22271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22272-22527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22272-22527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22272-22527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22528-22783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22528-22783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22528-22783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22784-23039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/22784-23039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/22784-23039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2304-2559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2304-2559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2304-2559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23040-23295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23040-23295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23040-23295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23296-23551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23296-23551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23296-23551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23552-23807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23552-23807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23552-23807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23808-24063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/23808-24063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/23808-24063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24064-24319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24064-24319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24064-24319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24320-24575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24320-24575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24320-24575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24576-24831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24576-24831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24576-24831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24832-25087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/24832-25087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/24832-25087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25088-25343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25088-25343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25088-25343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25344-25599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25344-25599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25344-25599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/256-511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/256-511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/256-511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2560-2815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2560-2815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2560-2815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25600-25855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25600-25855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25600-25855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25856-26111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/25856-26111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/25856-26111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26112-26367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26112-26367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26112-26367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26368-26623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26368-26623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26368-26623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26624-26879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26624-26879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26624-26879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26880-27135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/26880-27135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/26880-27135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27136-27391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27136-27391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27136-27391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27392-27647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27392-27647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27392-27647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27648-27903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27648-27903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27648-27903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27904-28159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/27904-28159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/27904-28159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2816-3071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/2816-3071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/2816-3071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28160-28415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28160-28415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28160-28415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28416-28671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28416-28671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28416-28671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28672-28927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28672-28927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28672-28927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28928-29183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/28928-29183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/28928-29183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29184-29439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29184-29439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29184-29439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29440-29695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29440-29695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29440-29695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29696-29951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29696-29951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29696-29951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29952-30207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/29952-30207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/29952-30207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30208-30463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30208-30463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30208-30463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30464-30719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30464-30719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30464-30719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3072-3327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3072-3327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3072-3327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30720-30975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30720-30975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30720-30975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30976-31231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/30976-31231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/30976-31231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31232-31487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31232-31487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31232-31487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31488-31743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31488-31743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31488-31743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31744-31999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/31744-31999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/31744-31999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32000-32255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32000-32255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32000-32255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32256-32511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32256-32511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32256-32511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32512-32767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32512-32767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32512-32767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32768-33023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/32768-33023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/32768-33023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33024-33279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33024-33279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33024-33279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3328-3583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3328-3583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3328-3583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33280-33535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33280-33535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33280-33535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33536-33791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33536-33791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33536-33791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33792-34047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/33792-34047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/33792-34047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34048-34303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34048-34303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34048-34303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34304-34559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34304-34559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34304-34559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34560-34815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34560-34815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34560-34815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34816-35071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/34816-35071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/34816-35071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35072-35327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35072-35327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35072-35327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35328-35583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35328-35583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35328-35583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35584-35839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35584-35839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35584-35839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3584-3839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3584-3839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3584-3839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35840-36095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/35840-36095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/35840-36095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36096-36351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36096-36351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36096-36351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36352-36607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36352-36607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36352-36607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36608-36863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36608-36863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36608-36863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36864-37119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/36864-37119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/36864-37119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37120-37375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37120-37375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37120-37375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37376-37631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37376-37631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37376-37631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37632-37887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37632-37887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37632-37887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37888-38143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/37888-38143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/37888-38143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38144-38399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38144-38399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38144-38399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3840-4095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/3840-4095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/3840-4095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38400-38655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38400-38655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38400-38655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38656-38911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38656-38911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38656-38911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38912-39167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/38912-39167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/38912-39167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39168-39423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39168-39423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39168-39423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39424-39679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39424-39679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39424-39679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39680-39935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39680-39935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39680-39935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39936-40191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/39936-40191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/39936-40191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40192-40447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40192-40447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40192-40447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40448-40703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40448-40703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40448-40703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40704-40959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40704-40959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40704-40959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4096-4351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4096-4351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4096-4351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40960-41215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/40960-41215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/40960-41215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41216-41471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41216-41471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41216-41471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41472-41727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41472-41727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41472-41727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41728-41983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41728-41983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41728-41983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41984-42239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/41984-42239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/41984-42239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42240-42495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42240-42495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42240-42495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42496-42751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42496-42751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42496-42751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42752-43007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/42752-43007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/42752-43007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43008-43263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43008-43263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43008-43263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43264-43519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43264-43519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43264-43519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4352-4607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4352-4607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4352-4607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43520-43775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43520-43775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43520-43775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43776-44031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/43776-44031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/43776-44031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44032-44287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44032-44287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44032-44287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44288-44543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44288-44543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44288-44543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44544-44799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44544-44799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44544-44799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44800-45055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/44800-45055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/44800-45055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45056-45311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45056-45311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45056-45311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45312-45567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45312-45567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45312-45567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45568-45823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45568-45823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45568-45823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45824-46079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/45824-46079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/45824-46079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4608-4863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4608-4863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4608-4863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46080-46335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46080-46335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46080-46335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46336-46591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46336-46591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46336-46591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46592-46847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46592-46847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46592-46847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46848-47103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/46848-47103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/46848-47103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47104-47359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47104-47359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47104-47359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47360-47615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47360-47615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47360-47615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47616-47871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47616-47871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47616-47871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47872-48127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/47872-48127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/47872-48127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48128-48383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48128-48383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48128-48383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48384-48639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48384-48639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48384-48639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4864-5119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/4864-5119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/4864-5119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48640-48895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48640-48895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48640-48895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48896-49151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/48896-49151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/48896-49151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49152-49407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49152-49407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49152-49407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49408-49663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49408-49663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49408-49663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49664-49919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49664-49919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49664-49919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49920-50175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/49920-50175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/49920-50175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50176-50431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50176-50431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50176-50431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50432-50687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50432-50687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50432-50687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50688-50943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50688-50943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50688-50943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50944-51199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/50944-51199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/50944-51199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/512-767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/512-767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/512-767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5120-5375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5120-5375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5120-5375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51200-51455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51200-51455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51200-51455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51456-51711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51456-51711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51456-51711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51712-51967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51712-51967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51712-51967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51968-52223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/51968-52223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/51968-52223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52224-52479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52224-52479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52224-52479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52480-52735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52480-52735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52480-52735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52736-52991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52736-52991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52736-52991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52992-53247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/52992-53247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/52992-53247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53248-53503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53248-53503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53248-53503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53504-53759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53504-53759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53504-53759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5376-5631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5376-5631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5376-5631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53760-54015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/53760-54015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/53760-54015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54016-54271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54016-54271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54016-54271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54272-54527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54272-54527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54272-54527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54528-54783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54528-54783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54528-54783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54784-55039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/54784-55039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/54784-55039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55040-55295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55040-55295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55040-55295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55296-55551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55296-55551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55296-55551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55552-55807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55552-55807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55552-55807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55808-56063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/55808-56063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/55808-56063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56064-56319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56064-56319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56064-56319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5632-5887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5632-5887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5632-5887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56320-56575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56320-56575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56320-56575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56576-56831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56576-56831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56576-56831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56832-57087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/56832-57087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/56832-57087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57088-57343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57088-57343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57088-57343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57344-57599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57344-57599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57344-57599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57600-57855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57600-57855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57600-57855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57856-58111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/57856-58111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/57856-58111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58112-58367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58112-58367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58112-58367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58368-58623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58368-58623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58368-58623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58624-58879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58624-58879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58624-58879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5888-6143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/5888-6143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/5888-6143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58880-59135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/58880-59135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/58880-59135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59136-59391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59136-59391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59136-59391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59392-59647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59392-59647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59392-59647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59648-59903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59648-59903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59648-59903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59904-60159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/59904-60159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/59904-60159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60160-60415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60160-60415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60160-60415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60416-60671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60416-60671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60416-60671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60672-60927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60672-60927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60672-60927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60928-61183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/60928-61183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/60928-61183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61184-61439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61184-61439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61184-61439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6144-6399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6144-6399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6144-6399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61440-61695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61440-61695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61440-61695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61696-61951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61696-61951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61696-61951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61952-62207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/61952-62207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/61952-62207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62208-62463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62208-62463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62208-62463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62464-62719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62464-62719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62464-62719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62720-62975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62720-62975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62720-62975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62976-63231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/62976-63231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/62976-63231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63232-63487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63232-63487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63232-63487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63488-63743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63488-63743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63488-63743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63744-63999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/63744-63999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/63744-63999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6400-6655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6400-6655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6400-6655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64000-64255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64000-64255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64000-64255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64256-64511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64256-64511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64256-64511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64512-64767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64512-64767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64512-64767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64768-65023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/64768-65023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/64768-65023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65024-65279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65024-65279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65024-65279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65280-65535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/65280-65535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/65280-65535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6656-6911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6656-6911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6656-6911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6912-7167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/6912-7167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/6912-7167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7168-7423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7168-7423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7168-7423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7424-7679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7424-7679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7424-7679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/768-1023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/768-1023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/768-1023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7680-7935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7680-7935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7680-7935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7936-8191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/7936-8191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/7936-8191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8192-8447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8192-8447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8192-8447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8448-8703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8448-8703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8448-8703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8704-8959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8704-8959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8704-8959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8960-9215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/8960-9215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/8960-9215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9216-9471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9216-9471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9216-9471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9472-9727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9472-9727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9472-9727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9728-9983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9728-9983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9728-9983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9984-10239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Medium/9984-10239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Medium/9984-10239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/0-255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/0-255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/0-255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/0-255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1024-1279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1024-1279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1024-1279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1024-1279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10240-10495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10240-10495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10240-10495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10240-10495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10496-10751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10496-10751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10496-10751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10496-10751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10752-11007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10752-11007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/10752-11007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/10752-11007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11008-11263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11008-11263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11008-11263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11008-11263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11264-11519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11264-11519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11264-11519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11264-11519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11520-11775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11520-11775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11520-11775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11520-11775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11776-12031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11776-12031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/11776-12031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/11776-12031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12032-12287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12032-12287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12032-12287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12032-12287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12288-12543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12288-12543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12288-12543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12288-12543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12544-12799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12544-12799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12544-12799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12544-12799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1280-1535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1280-1535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1280-1535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1280-1535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12800-13055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12800-13055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/12800-13055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/12800-13055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13056-13311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13056-13311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13056-13311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13056-13311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13312-13567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13312-13567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13312-13567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13312-13567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13568-13823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13568-13823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13568-13823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13568-13823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13824-14079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13824-14079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/13824-14079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/13824-14079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14080-14335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14080-14335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14080-14335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14080-14335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14336-14591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14336-14591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14336-14591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14336-14591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14592-14847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14592-14847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14592-14847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14592-14847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14848-15103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14848-15103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/14848-15103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/14848-15103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15104-15359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15104-15359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15104-15359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15104-15359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1536-1791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1536-1791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1536-1791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1536-1791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15360-15615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15360-15615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15360-15615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15360-15615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15616-15871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15616-15871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15616-15871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15616-15871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15872-16127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15872-16127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/15872-16127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/15872-16127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16128-16383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16128-16383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16128-16383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16128-16383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16384-16639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16384-16639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16384-16639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16384-16639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16640-16895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16640-16895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16640-16895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16640-16895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16896-17151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16896-17151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/16896-17151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/16896-17151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17152-17407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17152-17407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17152-17407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17152-17407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17408-17663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17408-17663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17408-17663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17408-17663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17664-17919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17664-17919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17664-17919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17664-17919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1792-2047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1792-2047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/1792-2047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/1792-2047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17920-18175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17920-18175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/17920-18175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/17920-18175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18176-18431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18176-18431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18176-18431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18176-18431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18432-18687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18432-18687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18432-18687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18432-18687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18688-18943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18688-18943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18688-18943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18688-18943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18944-19199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18944-19199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/18944-19199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/18944-19199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19200-19455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19200-19455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19200-19455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19200-19455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19456-19711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19456-19711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19456-19711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19456-19711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19712-19967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19712-19967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19712-19967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19712-19967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19968-20223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19968-20223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/19968-20223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/19968-20223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20224-20479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20224-20479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20224-20479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20224-20479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2048-2303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2048-2303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2048-2303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2048-2303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20480-20735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20480-20735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20480-20735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20480-20735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20736-20991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20736-20991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20736-20991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20736-20991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20992-21247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20992-21247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/20992-21247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/20992-21247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21248-21503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21248-21503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21248-21503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21248-21503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21504-21759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21504-21759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21504-21759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21504-21759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21760-22015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21760-22015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/21760-22015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/21760-22015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22016-22271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22016-22271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22016-22271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22016-22271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22272-22527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22272-22527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22272-22527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22272-22527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22528-22783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22528-22783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22528-22783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22528-22783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22784-23039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22784-23039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/22784-23039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/22784-23039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2304-2559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2304-2559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2304-2559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2304-2559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23040-23295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23040-23295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23040-23295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23040-23295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23296-23551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23296-23551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23296-23551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23296-23551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23552-23807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23552-23807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23552-23807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23552-23807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23808-24063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23808-24063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/23808-24063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/23808-24063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24064-24319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24064-24319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24064-24319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24064-24319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24320-24575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24320-24575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24320-24575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24320-24575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24576-24831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24576-24831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24576-24831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24576-24831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24832-25087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24832-25087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/24832-25087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/24832-25087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25088-25343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25088-25343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25088-25343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25088-25343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25344-25599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25344-25599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25344-25599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25344-25599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/256-511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/256-511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/256-511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/256-511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2560-2815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2560-2815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2560-2815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2560-2815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25600-25855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25600-25855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25600-25855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25600-25855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25856-26111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25856-26111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/25856-26111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/25856-26111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26112-26367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26112-26367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26112-26367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26112-26367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26368-26623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26368-26623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26368-26623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26368-26623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26624-26879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26624-26879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26624-26879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26624-26879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26880-27135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26880-27135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/26880-27135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/26880-27135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27136-27391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27136-27391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27136-27391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27136-27391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27392-27647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27392-27647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27392-27647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27392-27647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27648-27903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27648-27903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27648-27903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27648-27903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27904-28159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27904-28159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/27904-28159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/27904-28159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2816-3071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2816-3071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/2816-3071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/2816-3071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28160-28415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28160-28415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28160-28415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28160-28415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28416-28671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28416-28671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28416-28671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28416-28671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28672-28927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28672-28927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28672-28927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28672-28927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28928-29183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28928-29183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/28928-29183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/28928-29183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29184-29439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29184-29439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29184-29439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29184-29439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29440-29695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29440-29695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29440-29695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29440-29695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29696-29951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29696-29951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29696-29951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29696-29951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29952-30207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29952-30207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/29952-30207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/29952-30207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30208-30463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30208-30463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30208-30463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30208-30463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30464-30719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30464-30719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30464-30719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30464-30719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3072-3327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3072-3327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3072-3327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3072-3327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30720-30975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30720-30975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30720-30975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30720-30975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30976-31231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30976-31231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/30976-31231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/30976-31231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31232-31487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31232-31487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31232-31487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31232-31487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31488-31743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31488-31743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31488-31743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31488-31743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31744-31999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31744-31999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/31744-31999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/31744-31999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32000-32255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32000-32255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32000-32255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32000-32255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32256-32511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32256-32511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32256-32511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32256-32511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32512-32767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32512-32767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32512-32767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32512-32767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32768-33023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32768-33023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/32768-33023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/32768-33023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33024-33279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33024-33279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33024-33279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33024-33279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3328-3583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3328-3583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3328-3583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3328-3583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33280-33535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33280-33535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33280-33535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33280-33535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33536-33791.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33536-33791.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33536-33791.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33536-33791.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33792-34047.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33792-34047.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/33792-34047.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/33792-34047.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34048-34303.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34048-34303.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34048-34303.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34048-34303.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34304-34559.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34304-34559.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34304-34559.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34304-34559.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34560-34815.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34560-34815.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34560-34815.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34560-34815.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34816-35071.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34816-35071.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/34816-35071.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/34816-35071.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35072-35327.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35072-35327.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35072-35327.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35072-35327.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35328-35583.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35328-35583.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35328-35583.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35328-35583.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35584-35839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35584-35839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35584-35839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35584-35839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3584-3839.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3584-3839.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3584-3839.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3584-3839.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35840-36095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35840-36095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/35840-36095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/35840-36095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36096-36351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36096-36351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36096-36351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36096-36351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36352-36607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36352-36607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36352-36607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36352-36607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36608-36863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36608-36863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36608-36863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36608-36863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36864-37119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36864-37119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/36864-37119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/36864-37119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37120-37375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37120-37375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37120-37375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37120-37375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37376-37631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37376-37631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37376-37631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37376-37631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37632-37887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37632-37887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37632-37887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37632-37887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37888-38143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37888-38143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/37888-38143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/37888-38143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38144-38399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38144-38399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38144-38399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38144-38399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3840-4095.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3840-4095.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/3840-4095.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/3840-4095.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38400-38655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38400-38655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38400-38655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38400-38655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38656-38911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38656-38911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38656-38911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38656-38911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38912-39167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38912-39167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/38912-39167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/38912-39167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39168-39423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39168-39423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39168-39423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39168-39423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39424-39679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39424-39679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39424-39679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39424-39679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39680-39935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39680-39935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39680-39935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39680-39935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39936-40191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39936-40191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/39936-40191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/39936-40191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40192-40447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40192-40447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40192-40447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40192-40447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40448-40703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40448-40703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40448-40703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40448-40703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40704-40959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40704-40959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40704-40959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40704-40959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4096-4351.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4096-4351.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4096-4351.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4096-4351.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40960-41215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40960-41215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/40960-41215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/40960-41215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41216-41471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41216-41471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41216-41471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41216-41471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41472-41727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41472-41727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41472-41727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41472-41727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41728-41983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41728-41983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41728-41983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41728-41983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41984-42239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41984-42239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/41984-42239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/41984-42239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42240-42495.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42240-42495.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42240-42495.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42240-42495.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42496-42751.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42496-42751.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42496-42751.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42496-42751.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42752-43007.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42752-43007.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/42752-43007.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/42752-43007.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43008-43263.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43008-43263.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43008-43263.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43008-43263.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43264-43519.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43264-43519.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43264-43519.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43264-43519.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4352-4607.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4352-4607.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4352-4607.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4352-4607.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43520-43775.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43520-43775.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43520-43775.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43520-43775.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43776-44031.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43776-44031.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/43776-44031.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/43776-44031.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44032-44287.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44032-44287.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44032-44287.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44032-44287.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44288-44543.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44288-44543.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44288-44543.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44288-44543.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44544-44799.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44544-44799.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44544-44799.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44544-44799.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44800-45055.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44800-45055.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/44800-45055.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/44800-45055.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45056-45311.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45056-45311.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45056-45311.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45056-45311.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45312-45567.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45312-45567.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45312-45567.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45312-45567.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45568-45823.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45568-45823.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45568-45823.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45568-45823.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45824-46079.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45824-46079.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/45824-46079.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/45824-46079.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4608-4863.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4608-4863.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4608-4863.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4608-4863.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46080-46335.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46080-46335.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46080-46335.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46080-46335.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46336-46591.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46336-46591.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46336-46591.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46336-46591.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46592-46847.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46592-46847.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46592-46847.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46592-46847.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46848-47103.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46848-47103.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/46848-47103.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/46848-47103.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47104-47359.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47104-47359.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47104-47359.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47104-47359.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47360-47615.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47360-47615.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47360-47615.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47360-47615.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47616-47871.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47616-47871.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47616-47871.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47616-47871.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47872-48127.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47872-48127.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/47872-48127.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/47872-48127.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48128-48383.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48128-48383.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48128-48383.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48128-48383.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48384-48639.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48384-48639.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48384-48639.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48384-48639.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4864-5119.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4864-5119.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/4864-5119.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/4864-5119.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48640-48895.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48640-48895.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48640-48895.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48640-48895.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48896-49151.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48896-49151.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/48896-49151.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/48896-49151.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49152-49407.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49152-49407.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49152-49407.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49152-49407.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49408-49663.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49408-49663.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49408-49663.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49408-49663.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49664-49919.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49664-49919.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49664-49919.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49664-49919.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49920-50175.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49920-50175.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/49920-50175.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/49920-50175.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50176-50431.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50176-50431.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50176-50431.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50176-50431.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50432-50687.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50432-50687.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50432-50687.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50432-50687.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50688-50943.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50688-50943.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50688-50943.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50688-50943.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50944-51199.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50944-51199.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/50944-51199.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/50944-51199.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/512-767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/512-767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/512-767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/512-767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5120-5375.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5120-5375.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5120-5375.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5120-5375.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51200-51455.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51200-51455.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51200-51455.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51200-51455.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51456-51711.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51456-51711.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51456-51711.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51456-51711.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51712-51967.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51712-51967.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51712-51967.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51712-51967.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51968-52223.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51968-52223.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/51968-52223.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/51968-52223.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52224-52479.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52224-52479.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52224-52479.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52224-52479.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52480-52735.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52480-52735.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52480-52735.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52480-52735.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52736-52991.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52736-52991.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52736-52991.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52736-52991.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52992-53247.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52992-53247.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/52992-53247.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/52992-53247.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53248-53503.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53248-53503.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53248-53503.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53248-53503.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53504-53759.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53504-53759.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53504-53759.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53504-53759.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5376-5631.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5376-5631.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5376-5631.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5376-5631.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53760-54015.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53760-54015.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/53760-54015.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/53760-54015.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54016-54271.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54016-54271.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54016-54271.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54016-54271.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54272-54527.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54272-54527.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54272-54527.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54272-54527.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54528-54783.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54528-54783.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54528-54783.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54528-54783.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54784-55039.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54784-55039.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/54784-55039.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/54784-55039.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55040-55295.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55040-55295.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55040-55295.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55040-55295.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55296-55551.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55296-55551.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55296-55551.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55296-55551.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55552-55807.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55552-55807.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55552-55807.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55552-55807.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55808-56063.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55808-56063.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/55808-56063.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/55808-56063.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56064-56319.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56064-56319.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56064-56319.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56064-56319.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5632-5887.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5632-5887.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5632-5887.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5632-5887.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56320-56575.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56320-56575.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56320-56575.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56320-56575.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56576-56831.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56576-56831.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56576-56831.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56576-56831.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56832-57087.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56832-57087.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/56832-57087.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/56832-57087.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57088-57343.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57088-57343.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57088-57343.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57088-57343.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57344-57599.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57344-57599.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57344-57599.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57344-57599.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57600-57855.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57600-57855.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57600-57855.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57600-57855.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57856-58111.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57856-58111.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/57856-58111.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/57856-58111.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58112-58367.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58112-58367.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58112-58367.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58112-58367.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58368-58623.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58368-58623.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58368-58623.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58368-58623.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58624-58879.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58624-58879.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58624-58879.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58624-58879.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5888-6143.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5888-6143.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/5888-6143.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/5888-6143.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58880-59135.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58880-59135.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/58880-59135.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/58880-59135.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59136-59391.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59136-59391.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59136-59391.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59136-59391.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59392-59647.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59392-59647.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59392-59647.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59392-59647.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59648-59903.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59648-59903.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59648-59903.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59648-59903.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59904-60159.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59904-60159.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/59904-60159.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/59904-60159.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60160-60415.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60160-60415.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60160-60415.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60160-60415.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60416-60671.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60416-60671.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60416-60671.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60416-60671.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60672-60927.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60672-60927.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60672-60927.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60672-60927.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60928-61183.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60928-61183.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/60928-61183.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/60928-61183.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61184-61439.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61184-61439.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61184-61439.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61184-61439.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6144-6399.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6144-6399.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6144-6399.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6144-6399.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61440-61695.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61440-61695.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61440-61695.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61440-61695.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61696-61951.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61696-61951.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61696-61951.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61696-61951.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61952-62207.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61952-62207.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/61952-62207.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/61952-62207.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62208-62463.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62208-62463.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62208-62463.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62208-62463.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62464-62719.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62464-62719.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62464-62719.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62464-62719.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62720-62975.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62720-62975.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62720-62975.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62720-62975.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62976-63231.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62976-63231.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/62976-63231.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/62976-63231.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63232-63487.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63232-63487.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63232-63487.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63232-63487.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63488-63743.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63488-63743.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63488-63743.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63488-63743.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63744-63999.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63744-63999.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/63744-63999.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/63744-63999.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6400-6655.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6400-6655.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6400-6655.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6400-6655.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64000-64255.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64000-64255.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64000-64255.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64000-64255.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64256-64511.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64256-64511.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64256-64511.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64256-64511.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64512-64767.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64512-64767.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64512-64767.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64512-64767.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64768-65023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64768-65023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/64768-65023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/64768-65023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65024-65279.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65024-65279.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65024-65279.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65024-65279.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65280-65535.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65280-65535.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/65280-65535.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/65280-65535.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6656-6911.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6656-6911.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6656-6911.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6656-6911.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6912-7167.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6912-7167.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/6912-7167.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/6912-7167.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7168-7423.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7168-7423.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7168-7423.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7168-7423.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7424-7679.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7424-7679.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7424-7679.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7424-7679.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/768-1023.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/768-1023.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/768-1023.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/768-1023.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7680-7935.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7680-7935.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7680-7935.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7680-7935.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7936-8191.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7936-8191.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/7936-8191.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/7936-8191.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8192-8447.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8192-8447.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8192-8447.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8192-8447.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8448-8703.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8448-8703.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8448-8703.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8448-8703.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8704-8959.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8704-8959.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8704-8959.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8704-8959.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8960-9215.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8960-9215.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/8960-9215.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/8960-9215.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9216-9471.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9216-9471.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9216-9471.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9216-9471.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9472-9727.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9472-9727.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9472-9727.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9472-9727.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9728-9983.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9728-9983.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9728-9983.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9728-9983.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9984-10239.pbf b/play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9984-10239.pbf
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/Roboto Regular/9984-10239.pbf
rename to play-services-maps/core/mapbox/src/main/assets/Roboto Regular/9984-10239.pbf
diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites.json b/play-services-maps/core/mapbox/src/main/assets/sprites.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/sprites.json
rename to play-services-maps/core/mapbox/src/main/assets/sprites.json
diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites.png b/play-services-maps/core/mapbox/src/main/assets/sprites.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/sprites.png
rename to play-services-maps/core/mapbox/src/main/assets/sprites.png
diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites@2x.json b/play-services-maps/core/mapbox/src/main/assets/sprites@2x.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/sprites@2x.json
rename to play-services-maps/core/mapbox/src/main/assets/sprites@2x.json
diff --git a/play-services-maps-core-mapbox/src/main/assets/sprites@2x.png b/play-services-maps/core/mapbox/src/main/assets/sprites@2x.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/sprites@2x.png
rename to play-services-maps/core/mapbox/src/main/assets/sprites@2x.png
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-mapbox-outdoors-v12.json b/play-services-maps/core/mapbox/src/main/assets/style-mapbox-outdoors-v12.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/style-mapbox-outdoors-v12.json
rename to play-services-maps/core/mapbox/src/main/assets/style-mapbox-outdoors-v12.json
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-mapbox.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-normal-mapbox.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/style-microg-normal-mapbox.json
rename to play-services-maps/core/mapbox/src/main/assets/style-microg-normal-mapbox.json
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-normal-stadia.json
similarity index 96%
rename from play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json
rename to play-services-maps/core/mapbox/src/main/assets/style-microg-normal-stadia.json
index af23da4c850b8bb5e5ce66fe981c5e604168052b..02dd3f032fb63d7f245f910f949bc75915a581ab 100644
--- a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json
+++ b/play-services-maps/core/mapbox/src/main/assets/style-microg-normal-stadia.json
@@ -1288,16 +1288,32 @@
"filter": [
"all",
[
- "match",
+ "any",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "rail"
+ ],
+ true,
+ false
],
[
- "track"
- ],
- true,
- false
+ "match",
+ [
+ "get",
+ "subclass"
+ ],
+ [
+ "light_rail",
+ "tram"
+ ],
+ true,
+ false
+ ]
],
[
"match",
@@ -3404,27 +3420,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -3497,7 +3523,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -3546,6 +3574,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -3619,7 +3648,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -3661,6 +3692,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -3710,27 +3742,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -3803,7 +3845,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -3852,6 +3896,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -3925,7 +3970,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -3967,6 +4014,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -4016,27 +4064,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -4108,7 +4166,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -4157,6 +4217,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -4252,7 +4313,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -4294,6 +4357,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -4343,27 +4407,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -4435,7 +4509,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -4484,6 +4560,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -4579,7 +4656,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -4621,6 +4700,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-mapbox.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-mapbox.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-mapbox.json
rename to play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-mapbox.json
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json b/play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-stadia.json
similarity index 95%
rename from play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json
rename to play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-stadia.json
index f83bfbe1fecb5a3e7edc5b6b7f14d32ed1c10823..7f183c5146e6089ea4e65384bd4964555fcdcf51 100644
--- a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json
+++ b/play-services-maps/core/mapbox/src/main/assets/style-microg-satellite-stadia.json
@@ -392,16 +392,32 @@
"filter": [
"all",
[
- "match",
+ "any",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "rail"
+ ],
+ true,
+ false
],
[
- "track"
- ],
- true,
- false
+ "match",
+ [
+ "get",
+ "subclass"
+ ],
+ [
+ "light_rail",
+ "tram"
+ ],
+ true,
+ false
+ ]
],
[
"match",
@@ -2301,27 +2317,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -2394,7 +2420,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -2443,6 +2471,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -2516,7 +2545,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -2558,6 +2589,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -2607,27 +2639,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -2700,7 +2742,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -2749,6 +2793,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -2822,7 +2867,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -2864,6 +2911,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -2913,27 +2961,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -3005,7 +3063,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -3054,6 +3114,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -3149,7 +3210,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -3191,6 +3254,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
@@ -3240,27 +3304,37 @@
true
],
[
- "!=",
+ "any",
[
- "match",
+ "!=",
[
- "get",
- "class"
+ "match",
+ [
+ "get",
+ "class"
+ ],
+ [
+ "park",
+ "cemetery"
+ ],
+ true,
+ false
],
[
- "park",
- "cemetery"
- ],
- true,
- false
+ "<=",
+ [
+ "get",
+ "rank"
+ ],
+ 250
+ ]
],
[
- "<=",
+ ">=",
[
- "get",
- "rank"
+ "zoom"
],
- 250
+ 16
]
]
],
@@ -3332,7 +3406,9 @@
"poi_generic_green",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"poi_generic_purple",
@@ -3381,6 +3457,7 @@
]
],
[
+ "clothing_store",
"shop"
],
"poi_generic_blue",
@@ -3476,7 +3553,9 @@
"hsl(117, 53%, 31%)",
[
"bank",
+ "atm",
"parking",
+ "toilets",
"garages"
],
"#737b9b",
@@ -3518,6 +3597,7 @@
"#df7db1",
[
"grocery",
+ "clothing_store",
"shop"
],
"hsl(213, 40%, 48%)",
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-stadia-outdoors.json b/play-services-maps/core/mapbox/src/main/assets/style-stadia-outdoors.json
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/assets/style-stadia-outdoors.json
rename to play-services-maps/core/mapbox/src/main/assets/style-stadia-outdoors.json
diff --git a/play-services-maps-core-mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java b/play-services-maps/core/mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java
rename to play-services-maps/core/mapbox/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/maps_dynamite/ModuleDescriptor.java
diff --git a/play-services-maps-core-mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
rename to play-services-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
diff --git a/play-services-maps-core-mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java b/play-services-maps/core/mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java
rename to play-services-maps/core/mapbox/src/main/java/com/mapbox/android/accounts/v1/MapboxAccounts.java
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/AbstractGoogleMap.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraBoundsWithSizeUpdate.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/CameraUpdateFactory.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleLocationEngine.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/LiteGoogleMap.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Pattern.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/SourceLocationEngine.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/UiSettings.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptor.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
similarity index 95%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
index 6e46de389f96e34f4ba0b6c7140f61e16cf9af03..ebe931181939cb9b912605d8aa30d908d0ef1335 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
+++ b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
@@ -27,6 +27,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
import com.mapbox.mapboxsdk.maps.Style
import org.microg.gms.maps.mapbox.R
import org.microg.gms.maps.mapbox.runOnMainLooper
+import org.microg.gms.utils.toHexString
+import java.nio.ByteBuffer
+import java.security.MessageDigest
object BitmapDescriptorFactoryImpl : IBitmapDescriptorFactoryDelegate.Stub() {
@@ -189,7 +192,13 @@ object BitmapDescriptorFactoryImpl : IBitmapDescriptorFactoryDelegate.Stub() {
}
}
- override fun fromBitmap(bitmap: Bitmap): IObjectWrapper = registerBitmap("bitmap-${bitmap.hashCode()}") { bitmap }
+ private fun Bitmap.sha256(): String {
+ val bytes = ByteArray(rowBytes * height)
+ copyPixelsToBuffer(ByteBuffer.wrap(bytes))
+ return MessageDigest.getInstance("SHA-256").digest(bytes).toHexString()
+ }
+
+ override fun fromBitmap(bitmap: Bitmap): IObjectWrapper = registerBitmap("bitmap-${bitmap.sha256()}") { bitmap }
override fun fromPath(absolutePath: String): IObjectWrapper = registerBitmap("path-$absolutePath") { BitmapFactory.decodeFile(absolutePath) }
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Circle.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/GroundOverlay.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Markup.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polyline.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/TileOverlay.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt
rename to play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/typeConverter.kt
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-hdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-hdpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-hdpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-hdpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-ldpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-ldpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-ldpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-ldpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-mdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-mdpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-mdpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-mdpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-xhdpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-xxhdpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png b/play-services-maps/core/mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png
rename to play-services-maps/core/mapbox/src/main/res/drawable-xxxhdpi/maps_default_marker.png
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable/location_dot.xml b/play-services-maps/core/mapbox/src/main/res/drawable/location_dot.xml
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable/location_dot.xml
rename to play-services-maps/core/mapbox/src/main/res/drawable/location_dot.xml
diff --git a/play-services-maps-core-mapbox/src/main/res/drawable/maps_default_bubble.xml b/play-services-maps/core/mapbox/src/main/res/drawable/maps_default_bubble.xml
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/drawable/maps_default_bubble.xml
rename to play-services-maps/core/mapbox/src/main/res/drawable/maps_default_bubble.xml
diff --git a/play-services-maps-core-mapbox/src/main/res/layout/maps_default_bubble_layout.xml b/play-services-maps/core/mapbox/src/main/res/layout/maps_default_bubble_layout.xml
similarity index 100%
rename from play-services-maps-core-mapbox/src/main/res/layout/maps_default_bubble_layout.xml
rename to play-services-maps/core/mapbox/src/main/res/layout/maps_default_bubble_layout.xml
diff --git a/play-services-maps-core-mapbox/user.gradle b/play-services-maps/core/mapbox/user.gradle
similarity index 100%
rename from play-services-maps-core-mapbox/user.gradle
rename to play-services-maps/core/mapbox/user.gradle
diff --git a/play-services-maps-core-vtm/build.gradle b/play-services-maps/core/vtm/build.gradle
similarity index 92%
rename from play-services-maps-core-vtm/build.gradle
rename to play-services-maps/core/vtm/build.gradle
index b4b8c2dc48f0d02fa031d5c2f5b693945f8f51ef..ce66fa9a3513e6760446f3d36066e756e6baa129 100644
--- a/play-services-maps-core-vtm/build.gradle
+++ b/play-services-maps/core/vtm/build.gradle
@@ -27,7 +27,7 @@ dependencies {
implementation "org.microg:vtm-android:0.9.1-mod:natives-x86_64"
implementation "org.microg:vtm-extras:0.9.1-mod"
implementation "org.microg:vtm-jts:0.9.1-mod"
- implementation project(":play-services-maps-core-vtm:vtm-microg-theme")
+ implementation project(":play-services-maps-core-vtm-microg-theme")
implementation "androidx.appcompat:appcompat:$appcompatVersion"
}
@@ -48,8 +48,7 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
- versionName "temp"
- versionCode 1
+ versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
@@ -66,7 +65,6 @@ android {
buildTypes {
release {
minifyEnabled true
- proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
releaseTest {
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/build.gradle b/play-services-maps/core/vtm/microg-theme/build.gradle
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/build.gradle
rename to play-services-maps/core/vtm/microg-theme/build.gradle
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/styles/microg.xml b/play-services-maps/core/vtm/microg-theme/resources/assets/styles/microg.xml
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/styles/microg.xml
rename to play-services-maps/core/vtm/microg-theme/resources/assets/styles/microg.xml
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/dot_white.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/dot_white.svg
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/dot_white.svg
rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/dot_white.svg
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station.svg
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station.svg
rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station.svg
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station_small.svg b/play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station_small.svg
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/resources/assets/symbols/transit/train_station_small.svg
rename to play-services-maps/core/vtm/microg-theme/resources/assets/symbols/transit/train_station_small.svg
diff --git a/play-services-maps-core-vtm/vtm-microg-theme/src/org/oscim/theme/MicrogThemes.java b/play-services-maps/core/vtm/microg-theme/src/org/oscim/theme/MicrogThemes.java
similarity index 100%
rename from play-services-maps-core-vtm/vtm-microg-theme/src/org/oscim/theme/MicrogThemes.java
rename to play-services-maps/core/vtm/microg-theme/src/org/oscim/theme/MicrogThemes.java
diff --git a/play-services-maps-core-vtm/src/main/AndroidManifest.xml b/play-services-maps/core/vtm/src/main/AndroidManifest.xml
similarity index 100%
rename from play-services-maps-core-vtm/src/main/AndroidManifest.xml
rename to play-services-maps/core/vtm/src/main/AndroidManifest.xml
diff --git a/play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-maps/core/vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
rename to play-services-maps/core/vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java b/play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
similarity index 100%
rename from play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
rename to play-services-maps/core/vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
diff --git a/play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png b/play-services-maps/core/vtm/src/main/res/drawable/maps_default_marker.png
similarity index 100%
rename from play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png
rename to play-services-maps/core/vtm/src/main/res/drawable/maps_default_marker.png
diff --git a/play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png b/play-services-maps/core/vtm/src/main/res/drawable/maps_default_window.9.png
similarity index 100%
rename from play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png
rename to play-services-maps/core/vtm/src/main/res/drawable/maps_default_window.9.png
diff --git a/play-services-maps-core-vtm/src/main/res/drawable/nop.png b/play-services-maps/core/vtm/src/main/res/drawable/nop.png
similarity index 100%
rename from play-services-maps-core-vtm/src/main/res/drawable/nop.png
rename to play-services-maps/core/vtm/src/main/res/drawable/nop.png
diff --git a/play-services-maps-core-vtm/user.gradle b/play-services-maps/core/vtm/user.gradle
similarity index 100%
rename from play-services-maps-core-vtm/user.gradle
rename to play-services-maps/core/vtm/user.gradle
diff --git a/play-services-maps/src/main/java/com/google/android/gms/maps/model/LatLng.java b/play-services-maps/src/main/java/com/google/android/gms/maps/model/LatLng.java
index f8233075a607c4f7c4aee6be85fc1d38203c1ebc..6002f7b9e0c402f98fa02dcbe38f1cec92c021ec 100644
--- a/play-services-maps/src/main/java/com/google/android/gms/maps/model/LatLng.java
+++ b/play-services-maps/src/main/java/com/google/android/gms/maps/model/LatLng.java
@@ -19,8 +19,8 @@ package com.google.android.gms.maps.model;
import android.os.Parcel;
import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
-import org.microg.gms.common.PublicApi;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import org.microg.gms.common.PublicApi;
/**
* An immutable class representing a pair of latitude and longitude coordinates, stored as degrees.
diff --git a/play-services-nearby/core/package/build.gradle b/play-services-nearby/core/package/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..6902e87b8e1bce8223eff19bf67b82f7c5f52490
--- /dev/null
+++ b/play-services-nearby/core/package/build.gradle
@@ -0,0 +1,47 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+dependencies {
+ implementation project(':play-services-base-core')
+ implementation project(':play-services-nearby-core')
+ implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
+ implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
+ implementation "androidx.preference:preference:$preferenceVersion"
+}
+
+android {
+ namespace "org.microg.gms.nearby.core.pkg"
+
+ compileSdkVersion androidCompileSdk
+ buildToolsVersion "$androidBuildVersionTools"
+
+ defaultConfig {
+ versionName version
+ minSdkVersion androidMinSdk
+ targetSdkVersion androidTargetSdk
+ }
+
+ sourceSets {
+ main {
+ java.srcDirs = ['src/main/kotlin']
+ }
+ }
+
+ lintOptions {
+ disable 'MissingTranslation'
+ }
+
+ compileOptions {
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ }
+
+ kotlinOptions {
+ jvmTarget = 1.8
+ }
+}
diff --git a/play-services-core/src/withNearby/AndroidManifest.xml b/play-services-nearby/core/package/src/main/AndroidManifest.xml
similarity index 73%
rename from play-services-core/src/withNearby/AndroidManifest.xml
rename to play-services-nearby/core/package/src/main/AndroidManifest.xml
index 2c5b572f9fb33a80453e54812791a60580df5218..4a226e637ef3a4792903062f254669463d664462 100644
--- a/play-services-core/src/withNearby/AndroidManifest.xml
+++ b/play-services-nearby/core/package/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
@@ -9,11 +9,18 @@
-
+
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt b/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fefc85e78ec6ce7905ab4200ecc4c92fe55ee906
--- /dev/null
+++ b/play-services-nearby/core/package/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsSettingsProvider.kt
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.nearby.exposurenotification.ui
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
+import androidx.annotation.Keep
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.navigation.NavController
+import com.google.android.gms.nearby.exposurenotification.ExposureNotificationClient
+import org.microg.gms.ui.settings.SettingsProvider
+import org.microg.gms.nearby.core.R
+import org.microg.gms.nearby.exposurenotification.ExposureDatabase
+import org.microg.gms.nearby.exposurenotification.ExposurePreferences
+import org.microg.gms.ui.settings.SettingsProvider.Companion.Entry
+import org.microg.gms.ui.settings.SettingsProvider.Companion.Group.OTHER
+
+@Keep
+object ExposureNotificationsSettingsProvider : SettingsProvider {
+ override fun getEntriesStatic(context: Context): List {
+ if (SDK_INT < 21) return emptyList()
+ if (!ExposurePreferences(context).enabled) return emptyList()
+ return getEntries(context)
+ }
+
+ override suspend fun getEntriesDynamic(context: Context): List {
+ if (SDK_INT < 21) return emptyList()
+ if (!ExposurePreferences(context).enabled) {
+ if (ExposureDatabase.with(context) { it.isEmpty }) {
+ return emptyList()
+ }
+ }
+ return getEntries(context)
+ }
+
+ private fun getEntries(context: Context) = listOf(
+ Entry(
+ key = "pref_exposure",
+ group = OTHER,
+ navigationId = R.id.exposureNotificationsFragment,
+ title = context.getString(R.string.service_name_exposure),
+ summary = if (ExposurePreferences(context).enabled) {
+ context.getString(org.microg.gms.base.core.R.string.service_status_enabled_short)
+ } else {
+ context.getString(org.microg.gms.base.core.R.string.service_status_disabled_short)
+ },
+ icon = AppCompatResources.getDrawable(context, R.drawable.ic_virus_outline)
+ )
+ )
+
+ override fun preProcessSettingsIntent(intent: Intent) {
+ if (ExposureNotificationClient.ACTION_EXPOSURE_NOTIFICATION_SETTINGS == intent.action && intent.data == null) {
+ intent.data = Uri.parse("x-gms-settings://exposure-notifications")
+ }
+ }
+
+ override fun extendNavigation(navController: NavController) {
+ navController.graph.addAll(navController.navInflater.inflate(R.navigation.nav_nearby))
+ }
+}
\ No newline at end of file
diff --git a/play-services-nearby/core/src/main/AndroidManifest.xml b/play-services-nearby/core/src/main/AndroidManifest.xml
index d1cbd7389674415e27a71fba570ad1ffe33f911c..9f215f0125989792745756c5234eda2f059fb86f 100644
--- a/play-services-nearby/core/src/main/AndroidManifest.xml
+++ b/play-services-nearby/core/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
-
diff --git a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
index 6c3407513a3633d8491b0f6de68eb175a10922c8..567d92c64b977e14384f93b81e3e60e28f20883c 100644
--- a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
+++ b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
@@ -9,10 +9,12 @@ import android.annotation.TargetApi
import android.content.ContentValues
import android.content.Context
import android.content.Intent
+import android.database.DatabaseUtils
import android.database.sqlite.SQLiteCursor
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
import android.database.sqlite.SQLiteOpenHelper
+import android.database.sqlite.SQLiteQueryBuilder
import android.net.Uri
import android.os.Parcel
import android.os.Parcelable
@@ -154,6 +156,9 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit
val appLogEntries = delete(TABLE_APP_LOG, "timestamp < ?", longArrayOf(rollingStartTime))
Log.d(TAG, "Deleted on daily cleanup: $appLogEntries applogs")
if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false
+ val tokens = delete(TABLE_TOKENS, "timestamp < ?", longArrayOf(rollingStartTime))
+ Log.d(TAG, "Deleted on daily cleanup: $tokens tokens")
+ if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false
val temporaryExposureKeys = delete(TABLE_TEK, "(rollingStartNumber + rollingPeriod) < ?", longArrayOf(rollingStartTime / ROLLING_WINDOW_LENGTH_MS))
Log.d(TAG, "Deleted on daily cleanup: $temporaryExposureKeys teks")
if (start + MAX_DELETE_TIME < System.currentTimeMillis()) return@run false
@@ -735,6 +740,15 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit
}
}
+ val isEmpty: Boolean
+ get() = readableDatabase.run {
+ Log.d(TAG, "${DatabaseUtils.queryNumEntries(this, TABLE_ADVERTISEMENTS)}, ${DatabaseUtils.queryNumEntries(this, TABLE_APP_LOG)}, ${DatabaseUtils.queryNumEntries(this, TABLE_TEK)}, ${DatabaseUtils.queryNumEntries(this, TABLE_TOKENS)}")
+ DatabaseUtils.queryNumEntries(this, TABLE_ADVERTISEMENTS) == 0L &&
+ DatabaseUtils.queryNumEntries(this, TABLE_APP_LOG) == 0L &&
+ DatabaseUtils.queryNumEntries(this, TABLE_TEK) == 0L &&
+ DatabaseUtils.queryNumEntries(this, TABLE_TOKENS) == 0L
+ }
+
fun countMethodCalls(packageName: String, method: String): Int = readableDatabase.run {
query(TABLE_APP_LOG, arrayOf("COUNT(*)"), "package = ? AND method = ? AND timestamp > ?", arrayOf(packageName, method, (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(KEEP_DAYS.toLong())).toString()), null, null, null, null).use { cursor ->
if (cursor.moveToNext()) {
diff --git a/play-services-phenotype/build.gradle b/play-services-phenotype/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..c2dab9a8e23ce32a611f01b99a0928f45cb5e7a7
--- /dev/null
+++ b/play-services-phenotype/build.gradle
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+dependencies {
+ // Dependencies from play-services-phenotype:17.0.0
+ api "androidx.core:core:1.0.0"
+ api project(':play-services-base')
+ api project(':play-services-basement')
+ api project(':play-services-tasks')
+
+ annotationProcessor project(':safe-parcel-processor')
+}
+
+android {
+ namespace "com.google.android.gms.phenotype"
+
+ compileSdkVersion androidCompileSdk
+ buildToolsVersion "$androidBuildVersionTools"
+
+ buildFeatures {
+ aidl = true
+ }
+
+ defaultConfig {
+ versionName version
+ minSdkVersion androidMinSdk
+ targetSdkVersion androidTargetSdk
+ }
+
+ compileOptions {
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ }
+}
+
+apply from: '../gradle/publish-android.gradle'
+
+description = 'microG implementation of play-services-phenotype'
diff --git a/play-services-phenotype/src/main/AndroidManifest.xml b/play-services-phenotype/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3408ac9209f48af171f11a55b32435efa5eb2c87
--- /dev/null
+++ b/play-services-phenotype/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Configuration.java
similarity index 67%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java
rename to play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Configuration.java
index 70b4d286e1b6b7c087a5a91368b88bbe1441d619..a9591500f8d6c9d8df4b7804cc8f9cb8648a79a0 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java
+++ b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Configuration.java
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
@@ -14,5 +14,6 @@ public class Configuration extends AutoSafeParcelable {
public Flag[] flags;
@Field(4)
public String[] removeNames;
- public static final Creator CREATOR = new AutoCreator<>(Configuration.class);
+
+ public static final Creator CREATOR = findCreator(Configuration.class);
}
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java
similarity index 78%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java
rename to play-services-phenotype/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java
index d3f858fec8c527787b7d1f635ef960b8f67bafd4..8cc08eea31bbff1a070f23279a73c86c8c3323dd 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java
+++ b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
@@ -26,5 +26,6 @@ public class ExperimentTokens extends AutoSafeParcelable {
public byte[][] directs;
@Field(10)
public int[] genericDimensions;
- public static final Creator CREATOR = new AutoCreator<>(ExperimentTokens.class);
+
+ public static final Creator CREATOR = findCreator(ExperimentTokens.class);
}
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Flag.java
similarity index 94%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java
rename to play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Flag.java
index 4d0a03af7b24dfe94e7e7884f03947beb4b57929..12aa84575897236ab1f26b8a491d47f70f172ace 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java
+++ b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Flag.java
@@ -1,12 +1,14 @@
/*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.phenotype;
+import org.microg.gms.common.Hide;
import org.microg.safeparcel.AutoSafeParcelable;
+@Hide
public class Flag extends AutoSafeParcelable {
@Field(2)
public String name;
@@ -98,5 +100,6 @@ public class Flag extends AutoSafeParcelable {
public static final int DATA_TYPE_DOUBLE = 3;
public static final int DATA_TYPE_STRING = 4;
public static final int DATA_TYPE_BYTES = 5;
- public static final Creator CREATOR = new AutoCreator<>(Flag.class);
+
+ public static final Creator CREATOR = findCreator(Flag.class);
}
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/GenericDimension.java b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/GenericDimension.java
similarity index 58%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/GenericDimension.java
rename to play-services-phenotype/src/main/java/com/google/android/gms/phenotype/GenericDimension.java
index f10f83c0c0e1bbf3716587a94ee64ef6dce4774d..f2aa1764bf3b23b37a6808e1d6286e3a9bc249d0 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/GenericDimension.java
+++ b/play-services-phenotype/src/main/java/com/google/android/gms/phenotype/GenericDimension.java
@@ -1,17 +1,19 @@
/*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.phenotype;
+import org.microg.gms.common.Hide;
import org.microg.safeparcel.AutoSafeParcelable;
+@Hide
public class GenericDimension extends AutoSafeParcelable {
@Field(1)
public int a;
@Field(2)
public int b;
- public static final Creator CREATOR = new AutoCreator<>(GenericDimension.class);
+ public static final Creator CREATOR = findCreator(GenericDimension.class);
}
diff --git a/play-services-vision-common/build.gradle b/play-services-vision-common/build.gradle
index 848ee372468c7956509c1b59d05ffa69ee557c0c..fc9746399a497ffb4738042de786379d6e6fbefd 100644
--- a/play-services-vision-common/build.gradle
+++ b/play-services-vision-common/build.gradle
@@ -38,7 +38,7 @@ dependencies {
// Dependencies from play-services-vision-common:19.1.3
api project(':play-services-base')
api project(':play-services-basement')
- //api project(':play-services-clearcut')
+ api project(':play-services-clearcut')
//api project(':play-services-flags')
- //api project(':play-services-phenotype')
+ api project(':play-services-phenotype')
}
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
index 1c6c98e04dc74c4af531211017303cfe28f975c5..742ca1959862b974d79fdc63348d5be177883687 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
@@ -18,6 +18,7 @@ package com.google.android.gms.wearable;
import com.google.android.gms.common.api.Result;
import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.data.AbstractDataBuffer;
import com.google.android.gms.common.data.DataBuffer;
import com.google.android.gms.common.data.DataHolder;
@@ -27,7 +28,7 @@ import org.microg.gms.common.PublicApi;
* Data structure holding references to a set of events.
*/
@PublicApi
-public class DataEventBuffer extends DataBuffer implements Result {
+public class DataEventBuffer extends AbstractDataBuffer implements Result {
private Status status;
@PublicApi(exclude = true)
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
index 703d7ae3e0299fb321916e9ecae7e330ddfb9bd6..54aeb16aafc9c685113bddac7745118d877e15c8 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
@@ -18,13 +18,14 @@ package com.google.android.gms.wearable;
import com.google.android.gms.common.api.Result;
import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.data.AbstractDataBuffer;
import com.google.android.gms.common.data.DataBuffer;
import com.google.android.gms.common.data.DataHolder;
import org.microg.gms.common.PublicApi;
@PublicApi
-public class DataItemBuffer extends DataBuffer implements Result {
+public class DataItemBuffer extends AbstractDataBuffer implements Result {
private Status status;
@PublicApi(exclude = true)
diff --git a/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiClientBuilder.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiClientBuilder.java
index ebfdc302377ff9234be913dc693887fcd0495ab4..ff74631581e381d1aeecc674620e0162c1fcbaef 100644
--- a/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiClientBuilder.java
+++ b/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiClientBuilder.java
@@ -19,11 +19,11 @@ package org.microg.gms.wearable;
import android.content.Context;
import android.os.Looper;
+import com.google.android.gms.common.api.Api;
import com.google.android.gms.wearable.Wearable;
import org.microg.gms.common.api.ApiClientBuilder;
import org.microg.gms.common.api.ApiClientSettings;
-import org.microg.gms.common.api.ApiClient;
import org.microg.gms.common.api.ConnectionCallbacks;
import org.microg.gms.common.api.OnConnectionFailedListener;
@@ -31,7 +31,7 @@ public class WearableApiClientBuilder implements ApiClientBuilder", "java.util.ArrayList",
+
+// "java.util.List", "java.util.List",
+// "java.util.ArrayList", "java.util.ArrayList",
+// "java.util.List", "java.util.List", "java.util.List",
+// "java.util.ArrayList", "java.util.ArrayList", "java.util.ArrayList",
+)
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedAnnotationTypes("$SafeParcelable.Class")
class SafeParcelProcessor : AbstractProcessor() {
override fun process(set: Set, roundEnvironment: RoundEnvironment): Boolean {
val safeParcelableClassTypeElement = set.firstOrNull() ?: return false
+
classes@ for (classElement in roundEnvironment.getElementsAnnotatedWith(safeParcelableClassTypeElement)) {
val clazz = ClassInfo(classElement)
- if (clazz.check(processingEnv.messager)) {
+ if (clazz.check(processingEnv)) {
processingEnv.filer.createSourceFile(clazz.fullCreatorName, clazz.classElement).openWriter().use { it.write(clazz.generateCreator()) }
}
}
@@ -63,9 +80,9 @@ class ClassInfo(val classElement: Element) {
.let { if (it.size == 2) it.first { it.parameters.isNotEmpty() } else it.firstOrNull() }
?.let { ConstructorInfo(this, it) }
- fun check(messager: Messager): Boolean {
- fun note(message: String) = messager.printMessage(Diagnostic.Kind.NOTE, message)
- fun error(message: String) = messager.printMessage(Diagnostic.Kind.ERROR, message)
+ fun check(processingEnv: ProcessingEnvironment): Boolean {
+ fun note(message: String) = processingEnv.messager.printMessage(Diagnostic.Kind.NOTE, message)
+ fun error(message: String) = processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, message)
if (constructor == null) {
error("No suitable constructor found for $fullName")
return false
@@ -82,12 +99,26 @@ class ClassInfo(val classElement: Element) {
note("Using reflection to construct $fullName from parcel. Consider providing a suitable package-visible constructor for improved performance.")
}
for (field in fields) {
- if (field.type !in listOf("int", "byte", "short", "boolean", "long", "float", "double", "java.lang.String")) {
- error("Field ${field.name} in $fullName has unsupported type.")
- return false
+ if (field.type !in NATIVE_SUPPORTED_TYPES) {
+ val typeName = field.listItemType ?: field.type
+ val type = runCatching { processingEnv.typeUtils.getDeclaredType(processingEnv.elementUtils.getTypeElement(typeName)) }.getOrNull()
+ val parcelable = processingEnv.typeUtils.getDeclaredType(processingEnv.elementUtils.getTypeElement(Parcelable))
+ val iinterface = processingEnv.typeUtils.getDeclaredType(processingEnv.elementUtils.getTypeElement(IInterface))
+ if (type != null && processingEnv.typeUtils.isAssignable(type, parcelable)) {
+ field.isParcelable = true
+ } else if (type != null && processingEnv.typeUtils.isAssignable(type, iinterface)) {
+ field.isIInterface = true
+ } else {
+ error("Field ${field.name} in $fullName has unsupported type ${if (typeName != field.type) "$typeName if ${field.type}" else field.type}.")
+ return false
+ }
}
- if (field.isPrivate) {
- note("Using reflection when accessing ${field.name} in $fullName. Consider adding it to the @Constructor and making the field package-visible for improved performance.")
+ val readReflect = field.isPrivate && field.getter == null
+ val writeReflect = field.isPrivate && !constructor.fieldIds.contains(field.id)
+ when {
+ readReflect && writeReflect -> note("Using reflection when accessing ${field.name} in $fullName. Consider adding it to the @Constructor and a getter to the annotation for improved performance.")
+ writeReflect -> note("Using reflection when writing ${field.name} in $fullName. Consider adding it to the @Constructor for improved performance.")
+ readReflect -> note("Using reflection when reading ${field.name} in $fullName. Consider adding a getter to the annotation for improved performance.")
}
}
return true
@@ -179,7 +210,7 @@ class ConstructorInfo(val clazz: ClassInfo, val constructorElement: ExecutableEl
val invocation by lazy {
if (isPrivate) {
listOf(
- "Constructor<${clazz.fullName}> constructor = ${clazz.fullName}.class.getConstructor(${argTypes.map { "$it.class" }.joinToString(", ")});",
+ "$Constructor<${clazz.fullName}> constructor = ${clazz.fullName}.class.getConstructor(${argTypes.map { "$it.class" }.joinToString(", ")});",
"constructor.setAccessible(true);",
"object = constructor.newInstance(${args.joinToString(", ")});"
)
@@ -191,7 +222,17 @@ class ConstructorInfo(val clazz: ClassInfo, val constructorElement: ExecutableEl
class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
val name by lazy { fieldElement.simpleName.toString() }
- val type by lazy { fieldElement.asType().toString() }
+ val type by lazy {
+ fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "type" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()?.takeIf { it.isNotEmpty() }
+ ?: fieldElement.asType().toString()
+ }
+ var isParcelable: Boolean = false
+ var isIInterface: Boolean = false
val isPrivate by lazy { fieldElement.modifiers.contains(Modifier.PRIVATE) }
val id by lazy {
@@ -211,29 +252,102 @@ class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
?.toString()
?.toBoolean() == true
}
+ val useValueParcel by lazy {
+ fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "useValueParcel" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()
+ ?.toBoolean() == true
+ }
+ val getter by lazy {
+ fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "getter" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()?.takeIf { it.isNotEmpty() }
+ ?.replace("\$object", "object")
+ ?.replace("\$type", type)
+ ?: fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "getterName" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()?.takeIf { it.isNotEmpty() }
+ ?.let { "object.$it()" }
+ }
+ val subType by lazy {
+ fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "subClass" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()?.takeIf { it.isNotEmpty() }
+ }
+ val isList by lazy { type.startsWith("java.util.List<") || type.startsWith("java.util.ArrayList<") }
+ val isArray by lazy { type.endsWith("[]") }
+ val listItemType by lazy {
+ subType ?: when {
+ type.startsWith("java.util.List<") -> type.substring(15, type.length - 1)
+ type.startsWith("java.util.ArrayList<") -> type.substring(20, type.length - 1)
+ type.endsWith("[]") -> type.substring(0, type.length - 2)
+ else -> null
+ }
+ }
val variableName by lazy { "_$name\$000" }
val variableDeclaration by lazy { "$type $variableName;" }
val defaultValue by lazy {
- when (type) {
- "boolean" -> "false"
- "byte", "char", "short", "int", "long", "float", "double" -> "0"
- else -> "null"
- }
+ fieldElement.annotationMirrors
+ .first { it.annotationType.toString() == "$SafeParcelable.Field" }
+ .elementValues
+ .filter { it.key.simpleName.toString() == "defaultValue" }
+ .firstNotNullOfOrNull { it.value.value }
+ ?.toString()?.takeIf { it.isNotEmpty() }
+ ?: when (type) {
+ "boolean" -> "false"
+ "byte", "char", "short", "int", "long", "float", "double" -> "0"
+ else -> "null"
+ }
}
val setVariableDefault by lazy { "$variableName = $defaultValue;" }
val readVariableFromParcel by lazy {
when (type) {
- "int" -> "$variableName = $SafeParcelReader.readInt(parcel, header)"
- "byte" -> "$variableName = $SafeParcelReader.readByte(parcel, header)"
- "short" -> "$variableName = $SafeParcelReader.readShort(parcel, header)"
- "boolean" -> "$variableName = $SafeParcelReader.readBool(parcel, header)"
- "long" -> "$variableName = $SafeParcelReader.readLong(parcel, header)"
- "float" -> "$variableName = $SafeParcelReader.readFloat(parcel, header)"
- "double" -> "$variableName = $SafeParcelReader.readDouble(parcel, header)"
+ "int", "java.lang.Integer" -> "$variableName = $SafeParcelReader.readInt(parcel, header)"
+ "byte", "java.lang.Byte" -> "$variableName = $SafeParcelReader.readByte(parcel, header)"
+ "short", "java.lang.Short" -> "$variableName = $SafeParcelReader.readShort(parcel, header)"
+ "boolean", "java.lang.Boolean" -> "$variableName = $SafeParcelReader.readBool(parcel, header)"
+ "long", "java.lang.Long" -> "$variableName = $SafeParcelReader.readLong(parcel, header)"
+ "float", "java.lang.Float" -> "$variableName = $SafeParcelReader.readFloat(parcel, header)"
+ "double", "java.lang.Double" -> "$variableName = $SafeParcelReader.readDouble(parcel, header)"
"java.lang.String" -> "$variableName = $SafeParcelReader.readString(parcel, header)"
- else -> "$SafeParcelReader.skip(parcel, header)"
+ "android.os.Bundle" -> "$variableName = $SafeParcelReader.readBundle(parcel, header, ${clazz.fullName}.class.getClassLoader())"
+ "android.os.IBinder" -> "$variableName = $SafeParcelReader.readBinder(parcel, header)"
+ "java.lang.String[]" -> "$variableName = $SafeParcelReader.readStringArray(parcel, header)"
+ "byte[]" -> "$variableName = $SafeParcelReader.readByteArray(parcel, header)"
+ "byte[][]" -> "$variableName = $SafeParcelReader.readByteArrayArray(parcel, header)"
+ "float[]" -> "$variableName = $SafeParcelReader.readFloatArray(parcel, header)"
+ "int[]" -> "$variableName = $SafeParcelReader.readIntArray(parcel, header)"
+ "java.util.List", "java.util.ArrayList" -> when {
+ !useValueParcel -> "$variableName = $SafeParcelReader.readStringList(parcel, header)"
+ else -> "$variableName = $SafeParcelReader.readList(parcel, header, String.class.getClassloader())"
+ }
+// "java.util.List", "java.util.ArrayList" -> "$variableName = $SafeParcelReader.readIntegerList(parcel, header)"
+// "java.util.List", "java.util.ArrayList" -> "$variableName = $SafeParcelReader.readBooleanList(parcel, header)"
+// "java.util.List", "java.util.ArrayList" -> "$variableName = $SafeParcelReader.readLongList(parcel, header)"
+// "java.util.List", "java.util.ArrayList" -> "$variableName = $SafeParcelReader.readFloatList(parcel, header)"
+// "java.util.List", "java.util.ArrayList" -> "$variableName = $SafeParcelReader.readDoubleList(parcel, header)"
+ else -> when {
+ isList && isParcelable && !useValueParcel -> "$variableName = $SafeParcelReader.readParcelableList(parcel, header, $listItemType.CREATOR)"
+ isArray && isParcelable -> "$variableName = $SafeParcelReader.readParcelableArray(parcel, header, $listItemType.CREATOR)"
+ isList -> "$variableName = $SafeParcelReader.readList(parcel, header, $listItemType.class.getClassloader())"
+ isParcelable -> "$variableName = $SafeParcelReader.readParcelable(parcel, header, $type.CREATOR)"
+ !isList && isIInterface -> "$variableName = $type.Stub.asInterface($SafeParcelReader.readBinder(parcel, header))"
+ else -> throw UnsupportedOperationException("Field $name in ${clazz.fullName} has unsupported type $type.")
+ }
}
}
val readVariableFromParcelCase by lazy { "case $id: $readVariableFromParcel; break;" }
@@ -243,7 +357,16 @@ class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
"java.lang.Boolean", "java.lang.Byte", "java.lang.Char", "java.lang.Short", "java.lang.Integer", "java.lang.Long", "java.lang.Float", "java.lang.Double" ->
"$SafeParcelWriter.write(parcel, $id, $variableName);"
- else -> "$SafeParcelWriter.write(parcel, $id, $variableName, $mayNull);"
+ "java.util.List", "java.util.ArrayList" -> when {
+ !useValueParcel -> "$SafeParcelWriter.writeStringList(parcel, $id, $variableName, $mayNull);"
+ else -> "$SafeParcelWriter.write(parcel, $id, $variableName, $mayNull);"
+ }
+
+ else -> when {
+ isParcelable -> "$SafeParcelWriter.write(parcel, $id, $variableName, flags, $mayNull);"
+ isIInterface -> "$SafeParcelWriter.write(parcel, $id, $variableName.asBinder(), $mayNull);"
+ else -> "$SafeParcelWriter.write(parcel, $id, $variableName, $mayNull);"
+ }
}
}
@@ -276,14 +399,15 @@ class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
}
val setVariableFromField by lazy {
- if (isPrivate) {
- listOf(
+ when {
+ getter != null -> listOf("$variableName = $getter;")
+ isPrivate -> listOf(
"$Field $reflectionFieldName = ${clazz.fullName}.class.getDeclaredField(\"$name\");",
"$reflectionFieldName.setAccessible(true);",
"$variableName = $reflectionFieldGetter(object);"
)
- } else {
- listOf("$variableName = object.$name;")
+
+ else -> listOf("$variableName = object.$name;")
}
}
val setFieldFromVariable by lazy {
diff --git a/settings.gradle b/settings.gradle
index 392116057e792ca5b4661be0b4ab1813c7627525..0e18cf05b5db2d75260ed28436808cef374b48e6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,7 @@ def sublude(name) {
project(projectName).projectDir = file(name.substring(1).replace(':', '/'))
}
+include ':fake-signature'
include ':safe-parcel-processor'
include ':play-services-ads'
@@ -22,6 +23,7 @@ include ':play-services-clearcut'
include ':play-services-drive'
include ':play-services-droidguard'
include ':play-services-fido'
+include ':play-services-games'
include ':play-services-gcm'
include ':play-services-gmscompliance'
include ':play-services-iid'
@@ -31,6 +33,7 @@ include ':play-services-measurement-base'
include ':play-services-nearby'
include ':play-services-oss-licenses'
include ':play-services-pay'
+include ':play-services-phenotype'
include ':play-services-places'
include ':play-services-places-placereport'
include ':play-services-recaptcha'
@@ -72,10 +75,11 @@ sublude ':play-services-location:core'
sublude ':play-services-location:core:base'
sublude ':play-services-location:core:provider'
sublude ':play-services-location:core:system-api'
-include ':play-services-maps-core-mapbox'
-include ':play-services-maps-core-vtm'
-include ':play-services-maps-core-vtm:vtm-microg-theme'
+sublude ':play-services-maps:core:mapbox'
+sublude ':play-services-maps:core:vtm'
+sublude ':play-services-maps:core:vtm:microg-theme'
sublude ':play-services-nearby:core'
+sublude ':play-services-nearby:core:package'
sublude ':play-services-oss-licenses:core'
sublude ':play-services-pay:core'
sublude ':play-services-safetynet:core'