Crazy debloat

README.md

@@ -15,6 +15,7 @@ This fork tweaks MicroG to be usable by applications that require Google authent
   - Ads
   - Analytics
   - Car
+  - Feedback
   - Games
   - Location
   - Maps & Location

build.gradle

@@ -40,7 +40,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"
+        classpath "com.android.tools.build:gradle:${androidBuildGradleVersion}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
     }

play-services-api/src/main/aidl/com/google/android/gms/search/administration/internal/ISearchAdministrationService.aidl

@@ -1,5 +0,0 @@
-package com.google.android.gms.search.administration.internal;
-
-interface ISearchAdministrationService {
-
-}

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/ClearCorpusRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable ClearCorpusRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusInfoRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable GetCorpusInfoRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable GetCorpusStatusRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable GetCorpusStatusResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable RequestIndexingRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.corpora;
-
-parcelable RequestIndexingResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaCallbacks.aidl

@@ -1,9 +0,0 @@
-package com.google.android.gms.search.corpora.internal;
-
-import com.google.android.gms.search.corpora.RequestIndexingResponse;
-import com.google.android.gms.search.corpora.GetCorpusStatusResponse;
-
-interface ISearchCorporaCallbacks {
-    void onRequestIndexing(in RequestIndexingResponse response) = 1;
-    void onGetCorpusStatus(in GetCorpusStatusResponse response) = 3;
-}

play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaService.aidl

@@ -1,14 +0,0 @@
-package com.google.android.gms.search.corpora.internal;
-
-import com.google.android.gms.search.corpora.ClearCorpusRequest;
-import com.google.android.gms.search.corpora.GetCorpusStatusRequest;
-import com.google.android.gms.search.corpora.GetCorpusInfoRequest;
-import com.google.android.gms.search.corpora.RequestIndexingRequest;
-import com.google.android.gms.search.corpora.internal.ISearchCorporaCallbacks;
-
-interface ISearchCorporaService {
-    void requestIndexing(in RequestIndexingRequest request, ISearchCorporaCallbacks callbacks) = 1;
-    void clearCorpus(in ClearCorpusRequest request, ISearchCorporaCallbacks callbacks) = 2;
-    void getCorpusStatus(in GetCorpusStatusRequest request, ISearchCorporaCallbacks callbacks) = 3;
-    void getCorpusInfo(in GetCorpusInfoRequest request, ISearchCorporaCallbacks callbacks) = 4;
-}

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetCurrentExperimentIdsRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetCurrentExperimentIdsResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetGlobalSearchSourcesRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetGlobalSearchSourcesResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetPendingExperimentIdsRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable GetPendingExperimentIdsResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable SetExperimentIdsRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable SetExperimentIdsResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable SetIncludeInGlobalSearchRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.global;
-
-parcelable SetIncludeInGlobalSearchResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminCallbacks.aidl

@@ -1,16 +0,0 @@
-package com.google.android.gms.search.global.internal;
-
-import com.google.android.gms.search.global.GetCurrentExperimentIdsResponse;
-import com.google.android.gms.search.global.GetGlobalSearchSourcesResponse;
-import com.google.android.gms.search.global.GetPendingExperimentIdsResponse;
-import com.google.android.gms.search.global.SetExperimentIdsResponse;
-import com.google.android.gms.search.global.SetIncludeInGlobalSearchResponse;
-
-interface IGlobalSearchAdminCallbacks {
-    void onGetGlobalSearchSourcesResponse(in GetGlobalSearchSourcesResponse request) = 1;
-    void onSetExperimentIdsResponse(in SetExperimentIdsResponse response) = 2;
-    void onGetCurrentExperimentIdsResponse(in GetCurrentExperimentIdsResponse response) = 3;
-    void onGetPendingExperimentIdsResponse(in GetPendingExperimentIdsResponse response) = 4;
-
-    void onSetIncludeInGlobalSearchResponse(in SetIncludeInGlobalSearchResponse response) = 7;
-}

play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminService.aidl

@@ -1,17 +0,0 @@
-package com.google.android.gms.search.global.internal;
-
-import com.google.android.gms.search.global.GetCurrentExperimentIdsRequest;
-import com.google.android.gms.search.global.GetGlobalSearchSourcesRequest;
-import com.google.android.gms.search.global.GetPendingExperimentIdsRequest;
-import com.google.android.gms.search.global.SetExperimentIdsRequest;
-import com.google.android.gms.search.global.SetIncludeInGlobalSearchRequest;
-import com.google.android.gms.search.global.internal.IGlobalSearchAdminCallbacks;
-
-interface IGlobalSearchAdminService {
-    void getGlobalSearchSources(in GetGlobalSearchSourcesRequest request, IGlobalSearchAdminCallbacks callbacks) = 1;
-    void setExperimentIds(in SetExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 2;
-    void getCurrentExperimentIds(in GetCurrentExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 3;
-    void getPendingExperimentIds(in GetPendingExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 4;
-
-    void setIncludeInGlobalSearch(in SetIncludeInGlobalSearchRequest request, IGlobalSearchAdminCallbacks callbacks) = 7;
-}

play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryRequest.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.queries;
-
-parcelable QueryRequest;

play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryResponse.aidl

@@ -1,3 +0,0 @@
-package com.google.android.gms.search.queries;
-
-parcelable QueryResponse;

play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesCallbacks.aidl

@@ -1,7 +0,0 @@
-package com.google.android.gms.search.queries.internal;
-
-import com.google.android.gms.search.queries.QueryResponse;
-
-interface ISearchQueriesCallbacks {
-    void onQuery(in QueryResponse response) = 1;
-}

play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesService.aidl

@@ -1,8 +0,0 @@
-package com.google.android.gms.search.queries.internal;
-
-import com.google.android.gms.search.queries.QueryRequest;
-import com.google.android.gms.search.queries.internal.ISearchQueriesCallbacks;
-
-interface ISearchQueriesService {
-    void query(in QueryRequest request, ISearchQueriesCallbacks callbacks) = 1;
-}

play-services-api/src/main/aidl/com/google/firebase/auth/api/internal/IFirebaseAuthService.aidl

@@ -1,5 +0,0 @@
-package com.google.firebase.auth.api.internal;
-
-interface IFirebaseAuthService {
-
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/CompoundHashParcelable.aidl

@@ -1,3 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-parcelable CompoundHashParcelable;

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/ConnectionConfig.aidl

@@ -1,3 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-parcelable ConnectionConfig;

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IConnectionAuthTokenProvider.aidl

@@ -1,7 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-import com.google.firebase.database.connection.idl.IGetTokenCallback;
-
-interface IConnectionAuthTokenProvider {
-    void zero(boolean var1, IGetTokenCallback var2) = 0;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IGetTokenCallback.aidl

@@ -1,6 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-interface IGetTokenCallback {
-    void zero(String s) = 0;
-    void onError(String s) = 1;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IListenHashProvider.aidl

@@ -1,11 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-import com.google.firebase.database.connection.idl.CompoundHashParcelable;
-
-interface IListenHashProvider {
-    String zzPY() = 0;
-
-    boolean zzPZ() = 1;
-
-    CompoundHashParcelable zzQF() = 2;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnection.aidl

@@ -1,44 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-import com.google.android.gms.dynamic.IObjectWrapper;
-
-import com.google.firebase.database.connection.idl.ConnectionConfig;
-import com.google.firebase.database.connection.idl.IConnectionAuthTokenProvider;
-import com.google.firebase.database.connection.idl.IListenHashProvider;
-import com.google.firebase.database.connection.idl.IPersistentConnectionDelegate;
-import com.google.firebase.database.connection.idl.IRequestResultCallback;
-
-
-interface IPersistentConnection {
-    void setup(in ConnectionConfig var1, IConnectionAuthTokenProvider var2, IObjectWrapper var3, IPersistentConnectionDelegate var4) = 0;
-
-    void initialize() = 1;
-
-    void shutdown() = 2;
-
-    void refreshAuthToken() = 3;
-
-    void listen(in List<String> var1, IObjectWrapper var2, IListenHashProvider var3, long var4, IRequestResultCallback var6) = 4;
-
-    void unlisten(in List<String> var1, IObjectWrapper var2) = 5;
-
-    void purgeOutstandingWrites() = 6;
-
-    void put(in List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) = 7;
-
-    void compareAndPut(in List<String> var1, IObjectWrapper var2, String var3, IRequestResultCallback var4) = 8;
-
-    void merge(in List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) = 9;
-
-    void onDisconnectPut(in List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) = 10;
-
-    void onDisconnectMerge(in List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) = 11;
-
-    void onDisconnectCancel(in List<String> var1, IRequestResultCallback var2) = 12;
-
-    void interrupt(String var1) = 13;
-
-    void resume(String var1) = 14;
-
-    boolean isInterrupted(String var1) = 15;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnectionDelegate.aidl

@@ -1,19 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-import com.google.android.gms.dynamic.IObjectWrapper;
-
-import com.google.firebase.database.connection.idl.RangeParcelable;
-
-interface IPersistentConnectionDelegate {
-    void zero(in List<String> var1, IObjectWrapper var2, boolean var3, long var4) = 0;
-
-    void one(in List<String> var1, in List<RangeParcelable> var2, IObjectWrapper var3, long var4) = 1;
-
-    void two() = 2;
-
-    void onDisconnect() = 3;
-
-    void four(boolean var1) = 4;
-
-    void five(IObjectWrapper var1) = 5;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IRequestResultCallback.aidl

@@ -1,5 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-interface IRequestResultCallback {
-    void zero(String var1, String var2) = 0;
-}

play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/RangeParcelable.aidl

@@ -1,3 +0,0 @@
-package com.google.firebase.database.connection.idl;
-
-parcelable RangeParcelable;

play-services-api/src/main/java/com/google/android/gms/search/corpora/ClearCorpusRequest.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-
-public class ClearCorpusRequest extends AutoSafeParcelable {
-    public static Creator<ClearCorpusRequest> CREATOR = new AutoCreator<ClearCorpusRequest>(ClearCorpusRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusInfoRequest.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-
-public class GetCorpusInfoRequest extends AutoSafeParcelable {
-    public static Creator<GetCorpusInfoRequest> CREATOR = new AutoCreator<GetCorpusInfoRequest>(GetCorpusInfoRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java

@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class GetCorpusStatusRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final String packageName;
-
-    @SafeParceled(2)
-    public final String corpus;
-
-    private GetCorpusStatusRequest() {
-        packageName = null;
-        corpus = null;
-    }
-
-    @Override
-    public String toString() {
-        return "GetCorpusStatusRequest{" +
-                "versionCode=" + versionCode +
-                ", packageName='" + packageName + '\'' +
-                ", corpus='" + corpus + '\'' +
-                '}';
-    }
-
-    public static Creator<GetCorpusStatusRequest> CREATOR = new AutoCreator<GetCorpusStatusRequest>(GetCorpusStatusRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import com.google.android.gms.appdatasearch.CorpusStatus;
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class GetCorpusStatusResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final CorpusStatus corpusStatus;
-
-    private GetCorpusStatusResponse() {
-        status = null;
-        corpusStatus = null;
-    }
-
-    public GetCorpusStatusResponse(Status status, CorpusStatus corpusStatus) {
-        this.status = status;
-        this.corpusStatus = corpusStatus;
-    }
-
-    public static Creator<GetCorpusStatusResponse> CREATOR = new AutoCreator<GetCorpusStatusResponse>(GetCorpusStatusResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class RequestIndexingRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final String packageName;
-
-    @SafeParceled(2)
-    public final String corpus;
-
-    @SafeParceled(3)
-    public final long sequenceNumber;
-
-    private RequestIndexingRequest() {
-        packageName = null;
-        corpus = null;
-        sequenceNumber = 0;
-    }
-
-    @Override
-    public String toString() {
-        return "RequestIndexingRequest{" +
-                "versionCode=" + versionCode +
-                ", packageName='" + packageName + '\'' +
-                ", corpus='" + corpus + '\'' +
-                ", sequenceNumber=" + sequenceNumber +
-                '}';
-    }
-
-    public static Creator<RequestIndexingRequest> CREATOR = new AutoCreator<RequestIndexingRequest>(RequestIndexingRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.corpora;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class RequestIndexingResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final boolean scheduledIndexing;
-
-    private RequestIndexingResponse() {
-        status = null;
-        scheduledIndexing = false;
-    }
-
-    public RequestIndexingResponse(Status status, boolean scheduledIndexing) {
-        this.status = status;
-        this.scheduledIndexing = scheduledIndexing;
-    }
-
-    public static Creator<RequestIndexingResponse> CREATOR = new AutoCreator<RequestIndexingResponse>(RequestIndexingResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class GetCurrentExperimentIdsRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    public static final Creator<GetCurrentExperimentIdsRequest> CREATOR = new AutoCreator<GetCurrentExperimentIdsRequest>(GetCurrentExperimentIdsRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-import java.util.Arrays;
-
-public class GetCurrentExperimentIdsResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final int[] experimentIds;
-
-    private GetCurrentExperimentIdsResponse() {
-        status = null;
-        experimentIds = null;
-    }
-
-    public GetCurrentExperimentIdsResponse(Status status, int[] experimentIds) {
-        this.status = status;
-        this.experimentIds = experimentIds;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("GetCurrentExperimentIdsResponse{");
-        sb.append("status=").append(status);
-        sb.append(", experimentIds=").append(Arrays.toString(experimentIds));
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<GetCurrentExperimentIdsResponse> CREATOR = new AutoCreator<GetCurrentExperimentIdsResponse>(GetCurrentExperimentIdsResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class GetGlobalSearchSourcesRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public boolean bool;
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("GetGlobalSearchSourcesRequest{");
-        sb.append("bool=").append(bool);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<GetGlobalSearchSourcesRequest> CREATOR = new AutoCreator<GetGlobalSearchSourcesRequest>(GetGlobalSearchSourcesRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import android.os.Parcelable;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-import java.util.Arrays;
-
-public class GetGlobalSearchSourcesResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final Parcelable[] sources;
-
-    private GetGlobalSearchSourcesResponse() {
-        status = null;
-        sources = null;
-    }
-
-    public GetGlobalSearchSourcesResponse(Status status, Parcelable[] sources) {
-        this.status = status;
-        this.sources = sources;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("GetGlobalSearchSourcesResponse{");
-        sb.append("status=").append(status);
-        sb.append(", sources=").append(Arrays.toString(sources));
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<GetGlobalSearchSourcesResponse> CREATOR = new AutoCreator<GetGlobalSearchSourcesResponse>(GetGlobalSearchSourcesResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class GetPendingExperimentIdsRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    public static final Creator<GetPendingExperimentIdsRequest> CREATOR = new AutoCreator<GetPendingExperimentIdsRequest>(GetPendingExperimentIdsRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-import java.util.Arrays;
-
-public class GetPendingExperimentIdsResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final int[] experimentIds;
-
-    private GetPendingExperimentIdsResponse() {
-        status = null;
-        experimentIds = null;
-    }
-
-    public GetPendingExperimentIdsResponse(Status status, int[] experimentIds) {
-        this.status = status;
-        this.experimentIds = experimentIds;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("GetPendingExperimentIdsResponse{");
-        sb.append("status=").append(status);
-        sb.append(", experimentIds=").append(Arrays.toString(experimentIds));
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<GetPendingExperimentIdsResponse> CREATOR = new AutoCreator<GetPendingExperimentIdsResponse>(GetPendingExperimentIdsResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsRequest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-import java.util.Arrays;
-
-public class SetExperimentIdsRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public byte[] experimentIds;
-
-    @SafeParceled(2)
-    public boolean enable;
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("SetExperimentIdsRequest{");
-        sb.append("experimentIds=").append(Arrays.toString(experimentIds));
-        sb.append(", enable=").append(enable);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<SetExperimentIdsRequest> CREATOR = new AutoCreator<SetExperimentIdsRequest>(SetExperimentIdsRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsResponse.java

@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class SetExperimentIdsResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    private SetExperimentIdsResponse() {
-        status = null;
-    }
-
-    public SetExperimentIdsResponse(Status status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("SetExperimentIdsResponse{");
-        sb.append("status=").append(status);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<SetExperimentIdsResponse> CREATOR = new AutoCreator<SetExperimentIdsResponse>(SetExperimentIdsResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class SetIncludeInGlobalSearchRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public String packageName;
-
-    @SafeParceled(2)
-    public String source;
-
-    @SafeParceled(3)
-    public boolean enabled;
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("SetIncludeInGlobalSearchRequest{");
-        sb.append("packageName='").append(packageName).append('\'');
-        sb.append(", source='").append(source).append('\'');
-        sb.append(", enabled=").append(enabled);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<SetIncludeInGlobalSearchRequest> CREATOR = new AutoCreator<SetIncludeInGlobalSearchRequest>(SetIncludeInGlobalSearchRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.java

@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.global;
-
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class SetIncludeInGlobalSearchResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    private SetIncludeInGlobalSearchResponse() {
-        status = null;
-    }
-
-    public SetIncludeInGlobalSearchResponse(Status status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("SetIncludeInGlobalSearchResponse{");
-        sb.append("status=").append(status);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public static final Creator<SetIncludeInGlobalSearchResponse> CREATOR = new AutoCreator<SetIncludeInGlobalSearchResponse>(SetIncludeInGlobalSearchResponse.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/queries/QueryRequest.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.queries;
-
-import com.google.android.gms.appdatasearch.QuerySpecification;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-import java.util.Arrays;
-
-public class QueryRequest extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    public int versionCode = 1;
-    @SafeParceled(1)
-    public String searchString;
-    @SafeParceled(2)
-    public String packageName;
-    @SafeParceled(3)
-    public String[] corpora;
-    @SafeParceled(4)
-    public int d;
-    @SafeParceled(5)
-    public int e;
-    @SafeParceled(6)
-    public QuerySpecification spec;
-
-    @Override
-    public String toString() {
-        return "QueryRequest{" +
-                "versionCode=" + versionCode +
-                ", searchString='" + searchString + '\'' +
-                ", packageName='" + packageName + '\'' +
-                ", corpora=" + Arrays.toString(corpora) +
-                ", d=" + d +
-                ", e=" + e +
-                ", spec=" + spec +
-                '}';
-    }
-
-    public static Creator<QueryRequest> CREATOR = new AutoCreator<QueryRequest>(QueryRequest.class);
-}

play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.search.queries;
-
-import com.google.android.gms.appdatasearch.SearchResults;
-import com.google.android.gms.common.api.Status;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
-
-public class QueryResponse extends AutoSafeParcelable {
-
-    @SafeParceled(1000)
-    private int versionCode = 1;
-
-    @SafeParceled(1)
-    public final Status status;
-
-    @SafeParceled(2)
-    public final SearchResults results;
-
-    private QueryResponse() {
-        status = null;
-        results = null;
-    }
-
-    public QueryResponse(Status status, SearchResults results) {
-        this.status = status;
-        this.results = results;
-    }
-
-    public static Creator<QueryResponse> CREATOR = new AutoCreator<QueryResponse>(QueryResponse.class);
-}

play-services-api/src/main/java/com/google/firebase/database/connection/idl/CompoundHashParcelable.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.firebase.database.connection.idl;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-
-public class CompoundHashParcelable extends AutoSafeParcelable {
-    public static final Creator<CompoundHashParcelable> CREATOR = new AutoCreator<CompoundHashParcelable>(CompoundHashParcelable.class);
-}

play-services-api/src/main/java/com/google/firebase/database/connection/idl/ConnectionConfig.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.firebase.database.connection.idl;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-
-public class ConnectionConfig extends AutoSafeParcelable {
-    public static final Creator<ConnectionConfig> CREATOR = new AutoCreator<ConnectionConfig>(ConnectionConfig.class);
-}

play-services-api/src/main/java/com/google/firebase/database/connection/idl/RangeParcelable.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.firebase.database.connection.idl;
-
-import org.microg.safeparcel.AutoSafeParcelable;
-
-public class RangeParcelable extends AutoSafeParcelable {
-    public static final Creator<RangeParcelable> CREATOR = new AutoCreator<RangeParcelable>(RangeParcelable.class);
-}

play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java

@@ -41,36 +41,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         this.supportedServices = supportedServices;
     }
 
-    @Deprecated
-    @Override
-    public void getPlusService(IGmsCallbacks callback, int versionCode, String packageName,
-                               String authPackage, String[] scopes, String accountName, Bundle params)
-            throws RemoteException {
-        Bundle extras = params == null ? new Bundle() : params;
-        extras.putString("auth_package", authPackage);
-        callGetService(GmsService.PLUS, callback, versionCode, packageName, extras, accountName, scopes);
-    }
-
-    @Deprecated
-    @Override
-    public void getPanoramaService(IGmsCallbacks callback, int versionCode, String packageName,
-                                   Bundle params) throws RemoteException {
-        callGetService(GmsService.PANORAMA, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getAppDataSearchService(IGmsCallbacks callback, int versionCode, String packageName)
-            throws RemoteException {
-        callGetService(GmsService.INDEX, callback, versionCode, packageName);
-    }
-
-    @Deprecated
-    @Override
-    public void getWalletService(IGmsCallbacks callback, int versionCode) throws RemoteException {
-        getWalletServiceWithPackageName(callback, versionCode, null);
-    }
-
     @Deprecated
     @Override
     public void getPeopleService(IGmsCallbacks callback, int versionCode, String packageName,
@@ -78,47 +48,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.PEOPLE, callback, versionCode, packageName, params);
     }
 
-    @Deprecated
-    @Override
-    public void getReportingService(IGmsCallbacks callback, int versionCode, String packageName,
-                                    Bundle params) throws RemoteException {
-        callGetService(GmsService.LOCATION_REPORTING, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getLocationService(IGmsCallbacks callback, int versionCode, String packageName,
-                                   Bundle params) throws RemoteException {
-        callGetService(GmsService.LOCATION, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getGoogleLocationManagerService(IGmsCallbacks callback, int versionCode,
-                                                String packageName, Bundle params) throws RemoteException {
-        callGetService(GmsService.LOCATION_MANAGER, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getGamesService(IGmsCallbacks callback, int versionCode, String packageName,
-                                String accountName, String[] scopes, String gamePackageName,
-                                IBinder popupWindowToken, String desiredLocale, Bundle params)
-            throws RemoteException {
-        Bundle extras = params == null ? new Bundle() : params;
-        extras.putString("com.google.android.gms.games.key.gamePackageName", gamePackageName);
-        extras.putString("com.google.android.gms.games.key.desiredLocale", desiredLocale);
-        //extras.putParcelable("com.google.android.gms.games.key.popupWindowToken", popupWindowToken);
-        callGetService(GmsService.GAMES, callback, versionCode, packageName, extras, accountName, scopes);
-    }
-
-    @Deprecated
-    @Override
-    public void getAppStateService(IGmsCallbacks callback, int versionCode, String packageName,
-                                   String accountName, String[] scopes) throws RemoteException {
-        callGetService(GmsService.APPSTATE, callback, versionCode, packageName, null, accountName, scopes);
-    }
-
     @Deprecated
     @Override
     public void getPlayLogService(IGmsCallbacks callback, int versionCode, String packageName,
@@ -126,27 +55,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.PLAY_LOG, callback, versionCode, packageName, params);
     }
 
-    @Deprecated
-    @Override
-    public void getAdMobService(IGmsCallbacks callback, int versionCode, String packageName,
-                                Bundle params) throws RemoteException {
-        callGetService(GmsService.ADREQUEST, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getDroidGuardService(IGmsCallbacks callback, int versionCode, String packageName,
-                                     Bundle params) throws RemoteException {
-        callGetService(GmsService.DROIDGUARD, callback, versionCode, packageName, params);
-    }
-
-    @Deprecated
-    @Override
-    public void getLockboxService(IGmsCallbacks callback, int versionCode, String packageName,
-                                  Bundle params) throws RemoteException {
-        callGetService(GmsService.LOCKBOX, callback, versionCode, packageName, params);
-    }
-
     @Deprecated
     @Override
     public void getCastMirroringService(IGmsCallbacks callback, int versionCode, String packageName,
@@ -154,13 +62,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.CAST_MIRRORING, callback, versionCode, packageName, params);
     }
 
-    @Deprecated
-    @Override
-    public void getNetworkQualityService(IGmsCallbacks callback, int versionCode,
-                                         String packageName, Bundle params) throws RemoteException {
-        callGetService(GmsService.NETWORK_QUALITY, callback, versionCode, packageName, params);
-    }
-
     @Deprecated
     @Override
     public void getGoogleIdentityService(IGmsCallbacks callback, int versionCode,
@@ -168,13 +69,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.ACCOUNT, callback, versionCode, packageName, params);
     }
 
-    @Deprecated
-    @Override
-    public void getGoogleFeedbackService(IGmsCallbacks callback, int versionCode,
-                                         String packageName, Bundle params) throws RemoteException {
-        callGetService(GmsService.FEEDBACK, callback, versionCode, packageName, params);
-    }
-
     @Deprecated
     @Override
     public void getCastService(IGmsCallbacks callback, int versionCode, String packageName,
@@ -182,34 +76,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.CAST, callback, versionCode, packageName, params);
     }
 
-    @Deprecated
-    @Override
-    public void getDriveService(IGmsCallbacks callback, int versionCode, String packageName,
-                                String[] scopes, String accountName, Bundle params) throws RemoteException {
-        callGetService(GmsService.DRIVE, callback, versionCode, packageName, params, accountName, scopes);
-    }
-
-    @Deprecated
-    @Override
-    public void getLightweightAppDataSearchService(IGmsCallbacks callback, int versionCode,
-                                                   String packageName) throws RemoteException {
-        callGetService(GmsService.LIGHTWEIGHT_INDEX, callback, versionCode, packageName);
-    }
-
-    @Deprecated
-    @Override
-    public void getSearchAdministrationService(IGmsCallbacks callback, int versionCode,
-                                               String packageName) throws RemoteException {
-        callGetService(GmsService.SEARCH_ADMINISTRATION, callback, versionCode, packageName);
-    }
-
-    @Deprecated
-    @Override
-    public void getAutoBackupService(IGmsCallbacks callback, int versionCode, String packageName,
-                                     Bundle params) throws RemoteException {
-        callGetService(GmsService.PHOTO_AUTO_BACKUP, callback, versionCode, packageName, params);
-    }
-
     @Deprecated
     @Override
     public void getAddressService(IGmsCallbacks callback, int versionCode, String packageName)
@@ -217,12 +83,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
         callGetService(GmsService.ADDRESS, callback, versionCode, packageName);
     }
 
-    @Deprecated
-    @Override
-    public void getWalletServiceWithPackageName(IGmsCallbacks callback, int versionCode, String packageName) throws RemoteException {
-        callGetService(GmsService.WALLET, callback, versionCode, packageName);
-    }
-
     private void callGetService(GmsService service, IGmsCallbacks callback, int gmsVersion,
                                 String packageName) throws RemoteException {
         callGetService(service, callback, gmsVersion, packageName, null);

play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl

@@ -7,33 +7,12 @@ import com.google.android.gms.common.internal.GetServiceRequest;
 import com.google.android.gms.common.internal.ValidateAccountRequest;
 
 interface IGmsServiceBroker {
-    void getPlusService(IGmsCallbacks callback, int code, String packageName, String authPackage, in String[] scopes, String accountName, in Bundle params) = 0;
-    void getPanoramaService(IGmsCallbacks callback, int code, String packageName, in Bundle params) = 1;
-    void getAppDataSearchService(IGmsCallbacks callback, int code, String packageName) = 2;
-    void getWalletService(IGmsCallbacks callback, int code) = 3;
     void getPeopleService(IGmsCallbacks callback, int code, String str, in Bundle params) = 4;
-    void getReportingService(IGmsCallbacks callback, int code, String str, in Bundle params) = 5;
-    void getLocationService(IGmsCallbacks callback, int code, String str, in Bundle params) = 6;
-    void getGoogleLocationManagerService(IGmsCallbacks callback, int code, String str, in Bundle params) = 7;
-    void getGamesService(IGmsCallbacks callback, int code, String packageName, String accountName, in String[] scopes, String gamePackageName, IBinder popupWindowToken, String desiredLocale, in Bundle params) = 8;
-    void getAppStateService(IGmsCallbacks callback, int code, String packageName, String accountName, in String[] scopes) = 9;
     void getPlayLogService(IGmsCallbacks callback, int code, String str, in Bundle params) = 10;
-    void getAdMobService(IGmsCallbacks callback, int code, String str, in Bundle params) = 11;
-    void getDroidGuardService(IGmsCallbacks callback, int code, String str, in Bundle params) = 12;
-    void getLockboxService(IGmsCallbacks callback, int code, String str, in Bundle params) = 13;
     void getCastMirroringService(IGmsCallbacks callback, int code, String str, in Bundle params) = 14;
-    void getNetworkQualityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 15;
     void getGoogleIdentityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 16;
-    void getGoogleFeedbackService(IGmsCallbacks callback, int code, String str, in Bundle params) = 17;
     void getCastService(IGmsCallbacks callback, int code, String str, IBinder binder, in Bundle params) = 18;
-    void getDriveService(IGmsCallbacks callback, int code, String str1, in String[] args, String str2, in Bundle params) = 19;
-    void getLightweightAppDataSearchService(IGmsCallbacks callback, int code, String str) = 20;
-    void getSearchAdministrationService(IGmsCallbacks callback, int code, String str) = 21;
-    void getAutoBackupService(IGmsCallbacks callback, int code, String str, in Bundle params) = 22;
     void getAddressService(IGmsCallbacks callback, int code, String str) = 23;
-
-    void getWalletServiceWithPackageName(IGmsCallbacks callback, int code, String packageName) = 41;
-
     void getService(IGmsCallbacks callback, in GetServiceRequest request) = 45;
     void validateAccount(IGmsCallbacks callback, in ValidateAccountRequest request) = 46;
 }

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

@@ -19,88 +19,21 @@ package org.microg.gms.common;
 public enum GmsService {
     UNKNOWN(-2),
     ANY(-1),
-    GAMES(1, "com.google.android.gms.games.service.START"),
-    PLUS(2, "com.google.android.gms.plus.service.START", "com.google.android.gms.plus.service.internal.START"),
-    PANORAMA(3, "com.google.android.gms.panorama.service.START"),
-    WALLET(4, "com.google.android.gms.wallet.service.BIND"),
     PEOPLE(5, "com.google.android.gms.people.service.START"),
-    LOCATION(6),
-    APPSTATE(7, "com.google.android.gms.appstate.service.START"),
-    ADREQUEST(8, "com.google.android.gms.ads.service.START"),
     ACCOUNT(9, "com.google.android.gms.accounts.ACCOUNT_SERVICE"),
     CAST(10, "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE"),
-    DRIVE(11, "com.google.android.gms.drive.ApiService.START"),
     ADDRESS(12, "com.google.android.gms.identity.service.BIND"),
-    CAR(13, "com.google.android.gms.car.service.START"),
-    WEARABLE(14, "com.google.android.gms.wearable.BIND"),
     AUTH(16, "com.google.android.gms.auth.service.START"),
-    FITNESS(17, "com.google.android.gms.fitness.GoogleFitnessService.START"),
-    REMINDERS(18, "com.google.android.gms.reminders.service.START"),
-    LIGHTWEIGHT_INDEX(19, "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE"),
-    DEVICE_CONNECTION(20, "com.google.android.gms.deviceconnection.service.START"),
-    INDEX(21, "com.google.android.gms.icing.INDEX_SERVICE"),
-    LOCATION_REPORTING(22, "com.google.android.gms.location.reporting.service.START", "com.google.android.location.reporting.service.START"),
-    LOCATION_MANAGER(23, "com.google.android.location.internal.GoogleLocationManagerService.START"),
     PLAY_LOG(24, "com.google.android.gms.playlog.service.START"),
-    DROIDGUARD(25, "com.google.android.gms.droidguard.service.START"),
-    LOCKBOX(26, "com.google.android.gms.lockbox.service.START"),
     CAST_MIRRORING(27, "com.google.android.gms.cast_mirroring.service.START"),
-    NETWORK_QUALITY(28, "com.google.android.gms.mdm.services.START"),
-    FEEDBACK(29, "com.google.android.gms.feedback.internal.IFeedbackService"),
-    SEARCH_ADMINISTRATION(30),
-    PHOTO_AUTO_BACKUP(31, "com.google.android.gms.photos.autobackup.service.START"),
-    SEARCH_QUERIES(32),
-    SEARCH_GLOBAL(33),
-    UDC(35, "com.google.android.gms.udc.service.START"),
-    SEARCH_CORPORA(36),
-    DEVICE_MANAGER(37, "com.google.android.gms.mdm.services.DeviceManagerApiService.START"),
-    PSEUDONYMOUS_ID(38, "com.google.android.gms.pseudonymous.service.START"),
     COMMON(39, "com.google.android.gms.common.service.START"),
     CLEARCUT_LOGGER(40, "com.google.android.gms.clearcut.service.START"),
-    USAGE_REPORTING(41, "com.google.android.gms.usagereporting.service.START"),
-    KIDS(42, "com.google.android.gms.kids.service.START"),
-    DOWNLOAD(43, "com.google.android.gms.common.download.START"),
     SIGN_IN(44, "com.google.android.gms.signin.service.START"),
-    SAFETY_NET_CLIENT(45, "com.google.android.gms.safetynet.service.START"),
-    GSERVICES(46, "com.google.android.gms.ads.gservice.START"),
     CONTEXT_MANAGER(47, "com.google.android.contextmanager.service.ContextManagerService.START"),
-    AUDIO_MODEM(48, "com.google.android.gms.audiomodem.service.AudioModemService.START"),
-    NEARBY_SHARING(49, "com.google.android.gms.nearby.sharing.service.NearbySharingService.START"),
-    LIGHTWEIGHT_NETWORK_QUALITY(50, "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START"),
     PHENOTYPE(51, "com.mgoogle.android.gms.phenotype.service.START"),
-    VOICE_UNLOCK(52, "com.google.android.gms.speech.service.START"),
-    NEARBY_CONNECTIONS(54, "com.google.android.gms.nearby.connection.service.START"),
-    FITNESS_SENSORS(55, "com.google.android.gms.fitness.SensorsApi"),
-    FITNESS_RECORDING(56, "com.google.android.gms.fitness.RecordingApi"),
-    FITNESS_HISTORY(57, "com.google.android.gms.fitness.HistoryApi"),
-    FITNESS_SESSIONS(58, "com.google.android.gms.fitness.SessionsApi"),
-    FITNESS_BLE(59, "com.google.android.gms.fitness.BleApi"),
-    FITNESS_CONFIG(60, "com.google.android.gms.fitness.ConfigApi"),
-    FITNESS_INTERNAL(61, "com.google.android.gms.fitness.InternalApi"),
-    NEARBY_MESSAGES(62, "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START"),
-    HELP(63, "com.google.android.gms.googlehelp.service.GoogleHelpService.START"),
-    CONFIG(64, "com.google.android.gms.config.START"),
-    GEODATA(65, "com.google.android.gms.location.places.GeoDataApi"),
-    SEARCH_IME(66),
-    PLACE_DETECTION(67, "com.google.android.gms.location.places.PlaceDetectionApi"),
     CREDENTIALS(68, "com.google.android.gms.auth.api.credentials.service.START"),
-    NEARBY_BOOTSTRAP(69, "com.google.android.gms.nearby.bootstrap.service.NearbyBootstrapService.START"),
-    PLUS_INTERNAL(70),
-    SOURCE_DEVICE(75, "com.google.android.gms.smartdevice.d2d.SourceDeviceService.START"),
-    TARGET_DEVICE(76, "com.google.android.gms.smartdevice.d2d.TargetDeviceService.START"),
-    APP_INVITE(77, "com.google.android.gms.appinvite.service.START"),
-    TAP_AND_PAY(79, "com.google.android.gms.tapandpay.service.BIND"),
-    ACCOUNTS(81, "com.google.android.gms.smartdevice.setup.accounts.AccountsService.START"),
-    TRUST_AGENT(85, "com.google.android.gms.trustagent.StateApi.START"),
     MEASUREMENT(93, "com.google.android.gms.measurement.START"),
-    FREIGHTER(98, "com.google.android.gms.freighter.service.START"),
-    BLE(111, "com.google.android.gms.beacon.internal.IBleService.START"),
-    APP_INDEXING(113),
     GASS(116, "com.google.android.gms.gass.START"),
-    WORK_ACCOUNT(120),
-    AD_CACHE(123, "com.google.android.gms.ads.service.CACHE"),
-    DYNAMIC_LINKS(131, "com.google.firebase.dynamiclinks.service.START"),
-    NEARBY_EXPOSURE(236, "com.google.android.gms.nearby.exposurenotification.START"),
     ;
 
     public int SERVICE_ID;
@@ -113,11 +46,6 @@ public enum GmsService {
         this.SECONDARY_ACTIONS = actions;
     }
 
-    public interface ADVERTISING_ID {
-        // Has no service id
-        String ACTION = "com.google.android.gms.ads.identifier.service.START";
-    }
-
     public static GmsService byServiceId(int serviceId) {
         for (GmsService service : values()) {
             if (service.SERVICE_ID == serviceId) return service;

play-services-core-proto/src/main/proto/snet.proto

@@ -1,34 +0,0 @@
-option java_package = "org.microg.gms.snet";
-
-option java_outer_classname = "SafetyNetProto";
-
-message SELinuxState {
-    optional bool supported = 1;
-    optional bool enabled = 2;
-}
-
-message FileState {
-    optional string fileName = 1;
-    optional bytes digest = 2;
-}
-
-message SafetyNetData {
-    optional bytes nonce = 1;
-    optional string packageName = 2;
-    repeated bytes signatureDigest = 3;
-    optional bytes fileDigest = 4;
-    optional int32 gmsVersionCode = 5;
-    repeated FileState suCandidates = 6;
-    optional SELinuxState seLinuxState = 7;
-    optional int64 currentTimeMs = 8;
-    optional bool googleCn = 9;
-}
-
-message AttestRequest {
-    optional bytes safetyNetData = 1;
-    optional string droidGuardResult = 2;
-}
-
-message AttestResponse {
-    optional string result = 2;
-}

play-services-core/build.gradle

@@ -20,8 +20,8 @@ apply plugin: 'kotlin-android-extensions'
 
 dependencies {
     implementation "com.squareup.wire:wire-runtime:$wireVersion"
-    implementation "de.hdodenhof:circleimageview:1.3.0"
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation "org.conscrypt:conscrypt-android:2.1.0"
+    implementation 'org.conscrypt:conscrypt-android:2.4.0'
     // TODO: Switch to upstream once raw requests are merged
     // https://github.com/vitalidze/chromecast-java-api-v2/pull/99
     // implementation "su.litvak.chromecast:api-v2:0.10.4"
@@ -29,8 +29,8 @@ dependencies {
 
     // Specified manually due to
     // https://github.com/vitalidze/chromecast-java-api-v2/issues/91
-    api "org.slf4j:slf4j-api:1.7.25"
+    api 'org.slf4j:slf4j-api:1.7.30'
-    api "uk.uuid.slf4j:slf4j-android:1.7.25-1"
+    api 'uk.uuid.slf4j:slf4j-android:1.7.30-0'
 
     implementation project(':play-services-base-core')
     implementation project(':play-services-core-proto')
@@ -40,7 +40,7 @@ dependencies {
 
     // AndroidX UI
     implementation "androidx.multidex:multidex:$multidexVersion"
-    implementation "androidx.appcompat:appcompat:$appcompatVersion"
+    implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
 
@@ -51,6 +51,7 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation project(path: ':play-services-basement')
 }
 
 android {

play-services-core/microg-ui-tools/build.gradle

@@ -38,7 +38,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:$appcompatVersion"
+    implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.preference:preference:$preferenceVersion"
 }
 

play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/ripple_material_dark">
-    <item android:drawable="@color/switchbar_background_color"/>
-</ripple>
-

play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013-2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<color xmlns:android="http://schemas.android.com/apk/res/android"
-       android:color="@color/switchbar_background_color"/>
-

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

@@ -1,51 +0,0 @@
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~ Copyright (C) 2014-2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<RelativeLayout android:id="@+id/app_bar"
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="@drawable/switchbar_background"
-                android:clickable="true"
-                android:gravity="center_vertical">
-
-    <ImageView
-        android:id="@+id/app_icon"
-        android:layout_width="72dp"
-        android:layout_height="40dp"
-        android:layout_centerVertical="true"
-        android:gravity="end"/>
-
-    <TextView
-        android:id="@+id/app_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="72dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="72dp"
-        android:gravity="start"
-        android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimaryInverse"
-        android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
-
-</RelativeLayout>
-

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

@@ -95,13 +95,11 @@
                 android:textColor="?android:attr/textColorPrimaryInverse"/>
 
             <View
-                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="0.25dp"
                 android:background="@android:color/white"/>
 
             <androidx.appcompat.widget.ButtonBarLayout
-                android:id="@+id/buttonBar"
                 style="?attr/buttonBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

play-services-core/microg-ui-tools/src/main/res/values-de/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Alle Rechte vorbehalten.</string>
 
-    <string name="self_check_title">Selbstprüfung</string>
-
-    <string name="self_check_cat_permissions">Berechtigungen erteilt</string>
-    <string name="self_check_name_permission">%1$s:</string>
-    <string name="self_check_resolution_permission">Hier drücken um die Berechtigung \"%1$s\" zu erteilen. Verweigern einer Berechtigung kann zu Fehlverhalten in anderen Anwendungen führen.</string>
-
     <string name="about_root_title">microG UI Demo</string>
     <string name="about_root_summary">Zusammenfassung</string>
     <string name="about_root_version">Version v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values-fr/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Tous droits réservés.</string>
 
-    <string name="self_check_title">Auto-vérification.</string>
-
-    <string name="self_check_cat_permissions">Autorisations accordées</string>
-    <string name="self_check_name_permission">Autorisation à %1$s :</string>
-    <string name="self_check_resolution_permission">Touchez ici pour accorder l’autorisation %1$s. Des applications peuvent mal se comporter si vous ne le faites pas.</string>
-
     <string name="about_root_version">Version v0.1.0</string>
     <string name="about_root_libraries">Librairies incluses</string>
 

play-services-core/microg-ui-tools/src/main/res/values-it/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Tutti i diritti sono riservati.</string>
 
-    <string name="self_check_title">Auto-controllo</string>
-
-    <string name="self_check_cat_permissions">Autorizzazione concessa</string>
-    <string name="self_check_name_permission">Autorizzazione a %1$s:</string>
-    <string name="self_check_resolution_permission">Tocca qui per concedere l\'autorizzazione a %1$s. Negare l\'autorizzazione può comportare il funzionamento anomalo di altre applicazioni.</string>
-
     <string name="about_root_title">microG UI Demo</string>
     <string name="about_root_summary">Sommario</string>
     <string name="about_root_version">Versione v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Wszelkie prawa zastrzeżone.</string>
 
-    <string name="self_check_title">Samo-sprawdzenie</string>
-
-    <string name="self_check_cat_permissions">Udzielono uprawnień</string>
-    <string name="self_check_name_permission">Uprawnienie do %1$s:</string>
-    <string name="self_check_resolution_permission">Stuknij, aby udzielić uprawnienia na %1$s. Nieudzielenie uprawnienia może powodować problemy z aplikacjami.</string>
-
     <string name="about_root_title">Demo microG UI</string>
     <string name="about_root_summary">Podsumowanie</string>
     <string name="about_root_version">Wersja v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values-ru/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Все права защищены.</string>
 
-    <string name="self_check_title">Проверка работоспособности</string>
-
-    <string name="self_check_cat_permissions">Права доступа предоставлены</string>
-    <string name="self_check_name_permission">Разрешение для %1$s:</string>
-    <string name="self_check_resolution_permission">Нажмите здесь, чтобы дать разрешение на %1$s. Непредоставление разрешения может привести некорректной работе приложения.</string>
-
     <string name="about_root_title">microG UI Demo</string>
     <string name="about_root_summary">Сводка</string>
     <string name="about_root_version">Версия v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values-sr/strings.xml

@@ -17,10 +17,4 @@
 
 <resources>
 
-    <string name="self_check_title">микроГ самопровера</string>
+</resources>
-
-    <string name="self_check_cat_permissions">Дозволе одобрене</string>
-    <string name="self_check_name_permission">Дозволе за %1$s:</string>
-    <string name="self_check_resolution_permission">Тапните овде да одобрите дозволе за %1$s. Не одобравање дозвола може да резултира чудним понашањем апликација.</string>
-
-    </resources>

play-services-core/microg-ui-tools/src/main/res/values-uk/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">Всі права захищено.</string>
 
-    <string name="self_check_title">Само-тестування</string>
-
-    <string name="self_check_cat_permissions">Доступ надано</string>
-    <string name="self_check_name_permission">Доступ до %1$s:</string>
-    <string name="self_check_resolution_permission">Торкніться, аби надати доступ до %1$s. Без доступу не гарантується робота додатку належним чином.</string>
-
     <string name="about_root_title">Демонстрація microG UI</string>
     <string name="about_root_summary">Резюме</string>
     <string name="about_root_version">Версія v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values-zh-rTW/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">保留所有權利。</string>
 
-    <string name="self_check_title">自我檢查</string>
-
-    <string name="self_check_cat_permissions">允許權限</string>
-    <string name="self_check_name_permission">給 %1$s的權限：</string>
-    <string name="self_check_resolution_permission">按這裡給%1$s權限。不允許權限可能導致程式運作不正常。</string>
-
     <string name="about_root_title">microG UI Demo</string>
     <string name="about_root_summary">大綱</string>
     <string name="about_root_version">版本 v0.1.0</string>

play-services-core/microg-ui-tools/src/main/res/values/strings.xml

@@ -21,12 +21,6 @@
     <string name="about_name_version_str">%1$s %2$s</string>
     <string name="about_default_license">All rights reserved.</string>
 
-    <string name="self_check_title">Self-Check</string>
-
-    <string name="self_check_cat_permissions">Permissions granted</string>
-    <string name="self_check_name_permission">Permission to %1$s:</string>
-    <string name="self_check_resolution_permission">Touch here to grant permission to %1$s. Not granting the permission can result in misbehaving applications.</string>
-
     <string name="about_root_title">microG UI Demo</string>
     <string name="about_root_summary">Summary</string>
     <string name="about_root_version">Version v0.1.0</string>

play-services-core/src/main/AndroidManifest.xml

@@ -188,16 +188,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- DroidGuard -->
-
-        <service android:name="org.microg.gms.droidguard.DroidGuardService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.droidguard.service.START" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </service>
-
         <!-- Auth -->
 
         <service android:name="org.microg.gms.auth.loginservice.GoogleLoginService">
@@ -216,12 +206,6 @@
                 android:value="1" />
         </service>
 
-        <service android:name="com.google.android.gms.auth.FirebaseAuthService">
-            <intent-filter>
-                <action android:name="com.google.firebase.auth.api.gms.service.START" />
-            </intent-filter>
-        </service>
-
         <activity
             android:name="org.microg.tools.AccountPickerActivity"
             android:excludeFromRecents="true"
@@ -353,23 +337,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </service>
-        <service android:name="org.microg.gms.mdm.NetworkQualityService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.mdm.services.START" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </service>
-        <service android:name="org.microg.gms.icing.LightweightIndexService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE" />
-            </intent-filter>
-        </service>
-        <service android:name="org.microg.gms.icing.IndexService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.icing.INDEX_SERVICE" />
-            </intent-filter>
-        </service>
 
         <service android:name="org.microg.gms.playlog.PlayLogService">
             <intent-filter>
@@ -401,32 +368,12 @@
 
         <service android:name="org.microg.gms.DummyService">
             <intent-filter>
-                <action android:name="com.google.android.gms.plus.service.START" />
-                <action android:name="com.google.android.gms.plus.service.internal.START" />
-                <action android:name="com.google.android.gms.panorama.service.START" />
-                <action android:name="com.google.android.gms.appstate.service.START" />
-                <action android:name="com.google.android.gms.ads.service.START" />
                 <action android:name="com.google.android.gms.accounts.ACCOUNT_SERVICE" />
                 <action android:name="com.google.android.gms.identity.service.BIND" />
-                <action android:name="com.google.android.gms.wearable.BIND" />
                 <action android:name="com.google.android.gms.auth.service.START" />
-                <action android:name="com.google.android.gms.fitness.GoogleFitnessService.START" />
-                <action android:name="com.google.android.gms.deviceconnection.service.START" />
-                <action android:name="com.google.android.gms.droidguard.service.START" />
-                <action android:name="com.google.android.gms.lockbox.service.START" />
                 <action android:name="com.google.android.gms.cast_mirroring.service.START" />
-                <action android:name="com.google.android.gms.photos.autobackup.service.START" />
-                <action android:name="com.google.android.gms.udc.service.START" />
-                <action android:name="com.google.android.gms.mdm.services.DeviceManagerApiService.START" />
-                <action android:name="com.google.android.gms.pseudonymous.service.START" />
                 <action android:name="com.google.android.gms.common.service.START" />
-                <action android:name="com.google.android.gms.usagereporting.service.START" />
-                <action android:name="com.google.android.gms.kids.service.START" />
-                <action android:name="com.google.android.gms.common.download.START" />
                 <action android:name="com.google.android.contextmanager.service.ContextManagerService.START" />
-                <action android:name="com.google.android.gms.audiomodem.service.AudioModemService.START" />
-                <action android:name="com.google.android.gms.nearby.sharing.service.NearbySharingService.START" />
-                <action android:name="com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START" />
                 <action android:name="com.mgoogle.android.gms.phenotype.service.START" />
                 <action android:name="com.google.android.gms.auth.api.credentials.service.START" />
                 <action android:name="com.google.android.gms.gass.START" />

play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.auth;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-import org.microg.gms.auth.firebase.FirebaseAuthServiceImpl;
-
-public class FirebaseAuthService extends Service {
-    public IBinder onBind(Intent intent) {
-        return new FirebaseAuthServiceImpl(this);
-    }
-}

play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.gms.dynamite.descriptors.com.google.android.gms.firebase_database;
-
-public class ModuleDescriptor {
-    public static final String MODULE_ID = "com.google.android.gms.firebase_database";
-    public static final int MODULE_VERSION = 3;
-}

play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java

@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.firebase.database.connection.idl;
-
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.dynamic.IObjectWrapper;
-
-import java.util.List;
-
-public class IPersistentConnectionImpl extends IPersistentConnection.Stub {
-    private static final String TAG = "GmsFirebaseDbConImpl";
-
-    @Override
-    public void setup(ConnectionConfig var1, IConnectionAuthTokenProvider var2, IObjectWrapper var3, IPersistentConnectionDelegate var4) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: setup");
-
-    }
-
-    @Override
-    public void initialize() throws RemoteException {
-        Log.d(TAG, "unimplemented Method: initialize");
-
-    }
-
-    @Override
-    public void shutdown() throws RemoteException {
-        Log.d(TAG, "unimplemented Method: shutdown");
-
-    }
-
-    @Override
-    public void refreshAuthToken() throws RemoteException {
-        Log.d(TAG, "unimplemented Method: refreshAuthToken");
-
-    }
-
-    @Override
-    public void listen(List<String> var1, IObjectWrapper var2, IListenHashProvider var3, long var4, IRequestResultCallback var6) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: listen");
-
-    }
-
-    @Override
-    public void unlisten(List<String> var1, IObjectWrapper var2) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: unlisten");
-
-    }
-
-    @Override
-    public void purgeOutstandingWrites() throws RemoteException {
-        Log.d(TAG, "unimplemented Method: purgeOutstandingWrites");
-
-    }
-
-    @Override
-    public void put(List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: put");
-
-    }
-
-    @Override
-    public void compareAndPut(List<String> var1, IObjectWrapper var2, String var3, IRequestResultCallback var4) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: compareAndPut");
-
-    }
-
-    @Override
-    public void merge(List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: merge");
-
-    }
-
-    @Override
-    public void onDisconnectPut(List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: onDisconnectPut");
-
-    }
-
-    @Override
-    public void onDisconnectMerge(List<String> var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: onDisconnectMerge");
-
-    }
-
-    @Override
-    public void onDisconnectCancel(List<String> var1, IRequestResultCallback var2) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: onDisconnectCancel");
-
-    }
-
-    @Override
-    public void interrupt(String var1) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: interrupt");
-
-    }
-
-    @Override
-    public void resume(String var1) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: resume");
-
-    }
-
-    @Override
-    public boolean isInterrupted(String var1) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: isInterrupted");
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.auth.firebase;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.firebase.auth.api.internal.IFirebaseAuthService;
-
-public class FirebaseAuthServiceImpl extends IFirebaseAuthService.Stub {
-    private static final String TAG = "GmsFirebaseAuthImpl";
-
-    private Context context;
-
-    public FirebaseAuthServiceImpl(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java

@@ -441,11 +441,6 @@ public class LoginActivity extends AssistantActivity {
             return SDK_INT;
         }
 
-        @JavascriptInterface
-        public final void getDroidGuardResult(String s) {
-            Log.d(TAG, "JSBridge: getDroidGuardResult: " + s);
-        }
-
         @JavascriptInterface
         public final int getDeviceDataVersionInfo() {
             return 1;

play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.droidguard;
-
-import android.util.Log;
-
-import com.google.android.gms.common.internal.GetServiceRequest;
-import com.google.android.gms.common.internal.IGmsCallbacks;
-
-import org.microg.gms.BaseService;
-import org.microg.gms.common.GmsService;
-
-public class DroidGuardService extends BaseService {
-
-    public DroidGuardService() {
-        super("GmsDroidGuardSvc", GmsService.DROIDGUARD);
-    }
-
-    @Override
-    public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) {
-        // TODO
-        Log.d(TAG, "handleServiceRequest");
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java

@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.appdatasearch.CorpusStatus;
-import com.google.android.gms.appdatasearch.PIMEUpdateResponse;
-import com.google.android.gms.appdatasearch.RequestIndexingSpecification;
-import com.google.android.gms.appdatasearch.SuggestSpecification;
-import com.google.android.gms.appdatasearch.SuggestionResults;
-import com.google.android.gms.appdatasearch.internal.IAppDataSearch;
-
-public class AppDataSearchImpl extends IAppDataSearch.Stub {
-    private static final String TAG = "GmsIcingAppDataImpl";
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-
-    @Override
-    public SuggestionResults getSuggestions(String var1, String packageName, String[] accounts, int maxNum, SuggestSpecification specs) throws RemoteException {
-        return new SuggestionResults("Unknown error");
-    }
-
-    @Override
-    public boolean requestIndexing(String packageName, String accountName, long l, RequestIndexingSpecification specs) throws RemoteException {
-        Log.d(TAG, "requestIndexing: " + accountName + " @ " + packageName + ", " + l);
-        return true;
-    }
-
-    @Override
-    public CorpusStatus getStatus(String packageName, String accountName) throws RemoteException {
-        Log.d(TAG, "getStatus: " + accountName + " @ " + packageName);
-        CorpusStatus status = new CorpusStatus();
-        status.found = true;
-        return status;
-    }
-
-    @Override
-    public PIMEUpdateResponse requestPIMEUpdate(String s1, String s2, int i, byte[] bs) throws RemoteException {
-        Log.d(TAG, "requestPIMEUpdate: " + s1 + ", " + s2 + ", " + i + ", " + (bs == null ? "null" : new String(bs)));
-        return new PIMEUpdateResponse();
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.search.global.GetCurrentExperimentIdsRequest;
-import com.google.android.gms.search.global.GetCurrentExperimentIdsResponse;
-import com.google.android.gms.search.global.GetGlobalSearchSourcesRequest;
-import com.google.android.gms.search.global.GetGlobalSearchSourcesResponse;
-import com.google.android.gms.search.global.GetPendingExperimentIdsRequest;
-import com.google.android.gms.search.global.GetPendingExperimentIdsResponse;
-import com.google.android.gms.search.global.SetExperimentIdsRequest;
-import com.google.android.gms.search.global.SetExperimentIdsResponse;
-import com.google.android.gms.search.global.SetIncludeInGlobalSearchRequest;
-import com.google.android.gms.search.global.SetIncludeInGlobalSearchResponse;
-import com.google.android.gms.search.global.internal.IGlobalSearchAdminCallbacks;
-import com.google.android.gms.search.global.internal.IGlobalSearchAdminService;
-
-public class GlobalSearchAdminImpl extends IGlobalSearchAdminService.Stub {
-    private static final String TAG = "GmsIcingGlobalImpl";
-
-    @Override
-    public void getGlobalSearchSources(GetGlobalSearchSourcesRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "getGlobalSearchSources: " + request);
-        callbacks.onGetGlobalSearchSourcesResponse(new GetGlobalSearchSourcesResponse(Status.SUCCESS, new Parcelable[0]));
-    }
-
-    @Override
-    public void setExperimentIds(SetExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "setExperimentIds: " + request);
-        callbacks.onSetExperimentIdsResponse(new SetExperimentIdsResponse(Status.SUCCESS));
-    }
-
-    @Override
-    public void getCurrentExperimentIds(GetCurrentExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "getCurrentExperimentIds: " + request);
-        callbacks.onGetCurrentExperimentIdsResponse(new GetCurrentExperimentIdsResponse(Status.SUCCESS, new int[0]));
-    }
-
-    @Override
-    public void getPendingExperimentIds(GetPendingExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "getPendingExperimentIds: " + request);
-        callbacks.onGetPendingExperimentIdsResponse(new GetPendingExperimentIdsResponse(Status.SUCCESS, new int[0]));
-    }
-
-    @Override
-    public void setIncludeInGlobalSearch(SetIncludeInGlobalSearchRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "setIncludeInGlobalSearch: " + request);
-        callbacks.onSetIncludeInGlobalSearchResponse(new SetIncludeInGlobalSearchResponse(Status.SUCCESS));
-    }
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/IndexService.java

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.common.api.CommonStatusCodes;
-import com.google.android.gms.common.internal.GetServiceRequest;
-import com.google.android.gms.common.internal.IGmsCallbacks;
-
-import org.microg.gms.BaseService;
-import org.microg.gms.common.GmsService;
-
-public class IndexService extends BaseService {
-    private AppDataSearchImpl appDataSearch = new AppDataSearchImpl();
-    private GlobalSearchAdminImpl globalSearchAdmin = new GlobalSearchAdminImpl();
-    private SearchCorporaImpl searchCorpora = new SearchCorporaImpl();
-    private SearchQueriesImpl searchQueries = new SearchQueriesImpl();
-
-    public IndexService() {
-        super("GmsIcingIndexSvc",
-                GmsService.INDEX, GmsService.SEARCH_ADMINISTRATION, GmsService.SEARCH_CORPORA,
-                GmsService.SEARCH_GLOBAL, GmsService.SEARCH_IME, GmsService.SEARCH_QUERIES);
-    }
-
-    @Override
-    public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException {
-        switch (service) {
-            case INDEX:
-                callback.onPostInitComplete(0, appDataSearch.asBinder(), null);
-                break;
-            case SEARCH_ADMINISTRATION:
-                Log.w(TAG, "Service not yet implemented: " + service);
-                callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null);
-                break;
-            case SEARCH_QUERIES:
-                callback.onPostInitComplete(0, searchQueries.asBinder(), null);
-                break;
-            case SEARCH_GLOBAL:
-                callback.onPostInitComplete(0, globalSearchAdmin.asBinder(), null);
-                break;
-            case SEARCH_CORPORA:
-                callback.onPostInitComplete(0, searchCorpora.asBinder(), null);
-                break;
-            case SEARCH_IME:
-                Log.w(TAG, "Service not yet implemented: " + service);
-                callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null);
-                break;
-        }
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.appdatasearch.UsageInfo;
-import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearch;
-import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearchCallbacks;
-
-import java.util.Arrays;
-
-public class LightweightAppDataSearchImpl extends ILightweightAppDataSearch.Stub {
-    private static final String TAG = "GmsIcingLightSearchImpl";
-
-    public void view(ILightweightAppDataSearchCallbacks callbacks, String packageName, UsageInfo[] usageInfos) {
-        Log.d(TAG, "view: " + Arrays.toString(usageInfos));
-    }
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.RemoteException;
-
-import com.google.android.gms.common.internal.GetServiceRequest;
-import com.google.android.gms.common.internal.IGmsCallbacks;
-
-import org.microg.gms.BaseService;
-import org.microg.gms.common.GmsService;
-
-public class LightweightIndexService extends BaseService {
-    private LightweightAppDataSearchImpl appDataSearch = new LightweightAppDataSearchImpl();
-
-    public LightweightIndexService() {
-        super("GmsIcingLightIndexSvc", GmsService.LIGHTWEIGHT_INDEX);
-    }
-
-    @Override
-    public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException {
-        callback.onPostInitComplete(0, appDataSearch.asBinder(), null);
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.appdatasearch.CorpusStatus;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.search.corpora.ClearCorpusRequest;
-import com.google.android.gms.search.corpora.GetCorpusInfoRequest;
-import com.google.android.gms.search.corpora.GetCorpusStatusRequest;
-import com.google.android.gms.search.corpora.GetCorpusStatusResponse;
-import com.google.android.gms.search.corpora.RequestIndexingRequest;
-import com.google.android.gms.search.corpora.RequestIndexingResponse;
-import com.google.android.gms.search.corpora.internal.ISearchCorporaCallbacks;
-import com.google.android.gms.search.corpora.internal.ISearchCorporaService;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SearchCorporaImpl extends ISearchCorporaService.Stub {
-    private static final String TAG = "GmsIcingCorporaImpl";
-
-    // We count the sequence number here to make clients happy.
-    private Map<String, Long> corpusSequenceNumbers = new HashMap<String, Long>();
-
-    @Override
-    public void requestIndexing(RequestIndexingRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "requestIndexing: " + request);
-        corpusSequenceNumbers.put(request.packageName + "/" + request.corpus, request.sequenceNumber);
-        callbacks.onRequestIndexing(new RequestIndexingResponse(Status.SUCCESS, true));
-    }
-
-    @Override
-    public void clearCorpus(ClearCorpusRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "clearCorpus");
-    }
-
-    @Override
-    public void getCorpusStatus(GetCorpusStatusRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "getCorpusStatus: " + request);
-        CorpusStatus status = new CorpusStatus();
-        String numIndex = request.packageName + "/" + request.corpus;
-        if (corpusSequenceNumbers.containsKey(numIndex)) {
-            status.found = true;
-            status.lastIndexedSeqno = corpusSequenceNumbers.get(numIndex);
-            status.lastCommittedSeqno = status.lastIndexedSeqno;
-        }
-        callbacks.onGetCorpusStatus(new GetCorpusStatusResponse(Status.SUCCESS, status));
-    }
-
-    @Override
-    public void getCorpusInfo(GetCorpusInfoRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "getCorpusInfo");
-    }
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.icing;
-
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.search.queries.QueryRequest;
-import com.google.android.gms.search.queries.QueryResponse;
-import com.google.android.gms.search.queries.internal.ISearchQueriesCallbacks;
-import com.google.android.gms.search.queries.internal.ISearchQueriesService;
-
-public class SearchQueriesImpl extends ISearchQueriesService.Stub {
-    private static final String TAG = "GmsIcingQueriesImpl";
-
-    @Override
-    public void query(QueryRequest request, ISearchQueriesCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "query: " + request);
-        callbacks.onQuery(new QueryResponse(Status.CANCELED, null));
-    }
-
-    @Override
-    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-        if (super.onTransact(code, data, reply, flags)) return true;
-        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);
-        return false;
-    }
-}

play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2013-2017 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.microg.gms.mdm;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.util.Log;
-
-public class NetworkQualityService extends Service {
-    private static final String TAG = "GmsMdmQualitySvc";
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        Log.d(TAG, "onBind: " + intent);
-        return null;
-    }
-}

play-services-core/src/main/kotlin/org/microg/gms/ui/Utils.kt

@@ -39,14 +39,9 @@ fun NavController.navigate(context: Context, @IdRes resId: Int, args: Bundle? =
 
 val Context.systemAnimationsEnabled: Boolean
     get() {
-        val duration: Float
+
-        val transition: Float
+        val duration: Float = Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        val transition: Float = Settings.Global.getFloat(contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE, 1f)
-            duration = Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
+
-            transition = Settings.Global.getFloat(contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE, 1f)
-        } else {
-            duration = Settings.System.getFloat(contentResolver, Settings.System.ANIMATOR_DURATION_SCALE, 1f)
-            transition = Settings.System.getFloat(contentResolver, Settings.System.TRANSITION_ANIMATION_SCALE, 1f)
-        }
         return duration != 0f && transition != 0f
     }

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

@@ -22,13 +22,11 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/dialog_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <FrameLayout
-            android:id="@+id/desc_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingEnd="16dip"
@@ -38,13 +36,11 @@
             android:paddingTop="18dip">
 
             <LinearLayout
-                android:id="@+id/perm_desc_root"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:id="@+id/permission_icon"
                     android:layout_width="36dip"
                     android:layout_height="36dip"
                     android:scaleType="fitCenter"
@@ -77,7 +73,6 @@
             android:paddingStart="20dip">
 
             <android.support.v7.widget.ButtonBarLayout
-                android:id="@+id/button_group"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="bottom"
@@ -88,7 +83,6 @@
                 android:paddingTop="4dp">
 
                 <TextView
-                    android:id="@+id/current_page_text"
                     style="?android:attr/textAppearanceSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~ Copyright (C) 2013-2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!-- text that appears when the recent app list is empty -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:minHeight="?android:attr/listPreferredItemHeight"
-              android:gravity="center_vertical"
-              android:paddingEnd="?android:attr/scrollbarSize"
-              android:background="?attr/selectableItemBackground"
-              android:paddingRight="?android:attr/scrollbarSize">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dip"
-        android:layout_marginEnd="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1"
-        android:layout_marginLeft="15dip"
-        android:layout_marginRight="6dip">
-
-        <TextView android:id="@android:id/title"
-                  android:gravity="center"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:textColor="?android:attr/textColorSecondary" />
-
-    </RelativeLayout>
-
-</LinearLayout>
-

play-services-core/src/main/res/menu/pick_place.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013-2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<menu xmlns:tools="http://schemas.android.com/tools"
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu_action_search"
-        android:icon="@drawable/ic_magnify"
-        android:title="@android:string/search_go"
-        app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom|collapseActionView"
-        tools:ignore="AppCompatResource"/>
-</menu>

play-services-core/src/main/res/navigation/nav_settings.xml

@@ -2,7 +2,6 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_settings"
     app:startDestination="@id/settingsFragment">
 
     <fragment

play-services-core/src/main/res/values-de/strings.xml

@@ -48,7 +48,6 @@ Dies kann einige Minuten dauern."</string>
     <string name="service_name_mcs">Google Cloud Messaging</string>
 
     <string name="service_status_disabled">Deaktiviert</string>
-    <string name="service_status_enabled">Aktiviert</string>
     <string name="service_status_automatic">Automatisch</string>
 
     <string name="menu_advanced">Erweitert</string>
@@ -61,11 +60,6 @@ Dies kann einige Minuten dauern."</string>
 
     <!-- Self check -->
 
-    <string name="self_check_cat_system">System</string>
-
-    <string name="self_check_name_battery_optimizations">Batterieoptimierung deaktiviert:</string>
-    <string name="self_check_resolution_battery_optimizations">Hier drücken um Batterieoptimierungen für microG zu deaktivieren. Wenn das nicht geschieht funktionieren einige Apps nicht ordnungsgemäß.</string>
-
     <!-- Settings strings -->
 
     <string name="prefcat_about">Infos</string>
@@ -86,13 +80,11 @@ Dies kann einige Minuten dauern."</string>
     <string name="pref_add_account_title">Konto</string>
     <string name="pref_add_account_summary">Google Konto hinzufügen</string>
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging ist ein Push-Nachrichten-Dienst, der von vielen Apps genutzt wird. Zur Benutzung muss Geräte Check-In aktiviert werden.</string>
-    <string name="pref_gcm_apps_title">Apps die Cloud Messaging benutzen</string>
     <string name="pref_gcm_confirm_new_apps_title">Neue Apps bestätigen</string>
     <string name="pref_gcm_confirm_new_apps_summary">Frage nach bevor neue Apps sich für Push-Nachrichten registrieren</string>
     <string name="pref_about_title">Über microG Services Core</string>
 
     <string name="gcm_unregister_app">Abmelden</string>
-    <string name="gcm_not_registered">Nicht registriert</string>
     <string name="gcm_no_message_yet">Bisher keine Nachrichten erhalten</string>
     <string name="gcm_last_message_at">Letzte Nachricht: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
     <string name="gcm_registered">Registriert</string>
@@ -104,8 +96,4 @@ Dies kann einige Minuten dauern."</string>
     <string name="gcm_network_state_disconnected">Nicht verbunden</string>
     <string name="gcm_network_state_connected">Verbunden seit <xliff:g example="2 hours ago">%1$s</xliff:g></string>
 
-    <string name="pref_snet_status_official_info">offizieller Server</string>
-    <string name="pref_snet_status_third_party_info">Dritt-Server</string>
-    <string name="pref_snet_status_self_signed_info">selbst-signiertes Zertifikat</string>
-
 </resources>

play-services-core/src/main/res/values-fr/strings.xml

@@ -47,7 +47,6 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="service_name_mcs">Google Cloud Messaging</string>
 
     <string name="service_status_disabled">Désactivé</string>
-    <string name="service_status_enabled">Activé</string>
     <string name="service_status_automatic">Automatique</string>
 
     <string name="menu_advanced">Avancé</string>
@@ -60,11 +59,6 @@ Ceci peut prendre plusieurs minutes."</string>
 
     <!-- Self check -->
 
-    <string name="self_check_cat_system">Système</string>
-
-    <string name="self_check_name_battery_optimizations">Optimisations de la batterie ignorées : </string>
-    <string name="self_check_resolution_battery_optimizations">Appuyez ici pour désactiver les optimisations de la batterie. Des applications peuvent mal se comporter si vous ne le faites pas.</string>
-
     <!-- Settings strings -->
 
     <string name="prefcat_about">À propos</string>
@@ -83,14 +77,12 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="pref_auth_trust_google_summary">Si désactivé, l’utilisateur est interrogé avant que la demande d’autorisation d’une application soit envoyée à Google. Certaines applications échoueront à utiliser le compte Google si ceci est désactivé.</string>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging est un fournisseur de notifications push utilisé par beaucoup d’applications tierces. Pour l’utiliser vous devez activer l’enregistrement du terminal.</string>
-    <string name="pref_gcm_apps_title">Applications utilisant Google Cloud Messaging</string>
     <string name="pref_gcm_confirm_new_apps_title">Confirmation pour les nouvelles applications</string>
     <string name="pref_gcm_confirm_new_apps_summary">Demander avant d’enregistrer une nouvelle application auprès de Google Cloud Messaging</string>
 
     <string name="pref_about_title">À propos de microG Services Core</string>
 
     <string name="gcm_unregister_app">Désenregistrer</string>
-    <string name="gcm_not_registered">Non enregistrée</string>
     <string name="gcm_no_message_yet">Aucun message reçu pour l’instant</string>
     <string name="gcm_last_message_at">Dernier message : <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
     <string name="gcm_registered">Enregistrée</string>