diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl index ae5e402b..0f78cf48 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl @@ -9,6 +9,10 @@ import com.google.android.gms.maps.internal.ILocationSourceDelegate; import com.google.android.gms.maps.internal.IUiSettingsDelegate; import com.google.android.gms.maps.internal.IProjectionDelegate; import com.google.android.gms.maps.internal.IOnCameraChangeListener; +import com.google.android.gms.maps.internal.IOnCameraIdleListener; +import com.google.android.gms.maps.internal.IOnCameraMoveCanceledListener; +import com.google.android.gms.maps.internal.IOnCameraMoveListener; +import com.google.android.gms.maps.internal.IOnCameraMoveStartedListener; import com.google.android.gms.maps.internal.IOnMapClickListener; import com.google.android.gms.maps.internal.IOnMapLongClickListener; import com.google.android.gms.maps.internal.IOnMarkerClickListener; @@ -33,61 +37,86 @@ import com.google.android.gms.maps.model.internal.IGroundOverlayDelegate; import com.google.android.gms.maps.model.internal.ITileOverlayDelegate; interface IGoogleMapDelegate { - CameraPosition getCameraPosition(); + CameraPosition getCameraPosition() = 0; - float getMaxZoomLevel(); - float getMinZoomLevel(); + float getMaxZoomLevel() = 1; + float getMinZoomLevel() = 2; - void moveCamera(IObjectWrapper cameraUpdate); - void animateCamera(IObjectWrapper cameraUpdate); - void animateCameraWithCallback(IObjectWrapper cameraUpdate, ICancelableCallback callback); - void animateCameraWithDurationAndCallback(IObjectWrapper cameraUpdate, int duration, ICancelableCallback callback); - void stopAnimation(); + void moveCamera(IObjectWrapper cameraUpdate) = 3; + void animateCamera(IObjectWrapper cameraUpdate) = 4; + void animateCameraWithCallback(IObjectWrapper cameraUpdate, ICancelableCallback callback) = 5; + void animateCameraWithDurationAndCallback(IObjectWrapper cameraUpdate, int duration, ICancelableCallback callback) = 6; + void stopAnimation() = 7; - IPolylineDelegate addPolyline(in PolylineOptions options); - IPolygonDelegate addPolygon(in PolygonOptions options); - IMarkerDelegate addMarker(in MarkerOptions options); - IGroundOverlayDelegate addGroundOverlay(in GroundOverlayOptions options); - ITileOverlayDelegate addTileOverlay(in TileOverlayOptions options); + IPolylineDelegate addPolyline(in PolylineOptions options) = 8; + IPolygonDelegate addPolygon(in PolygonOptions options) = 9; + IMarkerDelegate addMarker(in MarkerOptions options) = 10; + IGroundOverlayDelegate addGroundOverlay(in GroundOverlayOptions options) = 11; + ITileOverlayDelegate addTileOverlay(in TileOverlayOptions options) = 12; + ICircleDelegate addCircle(in CircleOptions options) = 34; - void clear(); + void clear() = 13; - int getMapType(); - void setMapType(int type); - boolean isTrafficEnabled(); - void setTrafficEnabled(boolean traffic); - boolean isIndoorEnabled(); - void setIndoorEnabled(boolean indoor); + int getMapType() = 14; + void setMapType(int type) = 15; + boolean isTrafficEnabled() = 16; + void setTrafficEnabled(boolean traffic) = 17; + boolean isIndoorEnabled() = 18; + void setIndoorEnabled(boolean indoor) = 19; - boolean isMyLocationEnabled(); - void setMyLocationEnabled(boolean myLocation); - Location getMyLocation(); - void setLocationSource(ILocationSourceDelegate locationSource); + boolean isMyLocationEnabled() = 20; + void setMyLocationEnabled(boolean myLocation) = 21; + Location getMyLocation() = 22; + void setLocationSource(ILocationSourceDelegate locationSource) = 23; - IUiSettingsDelegate getUiSettings(); - IProjectionDelegate getProjection(); + IUiSettingsDelegate getUiSettings() = 24; + IProjectionDelegate getProjection() = 25; - void setOnCameraChangeListener(IOnCameraChangeListener listener); - void setOnMapClickListener(IOnMapClickListener listener); - void setOnMapLongClickListener(IOnMapLongClickListener listener); - void setOnMarkerClickListener(IOnMarkerClickListener listener); - void setOnMarkerDragListener(IOnMarkerDragListener listener); - void setOnInfoWindowClickListener(IOnInfoWindowClickListener listener); - void setInfoWindowAdapter(IInfoWindowAdapter adapter); + void setOnCameraChangeListener(IOnCameraChangeListener listener) = 26; + void setOnMapClickListener(IOnMapClickListener listener) = 27; + void setOnMapLongClickListener(IOnMapLongClickListener listener) = 28; + void setOnMarkerClickListener(IOnMarkerClickListener listener) = 29; + void setOnMarkerDragListener(IOnMarkerDragListener listener) = 30; + void setOnInfoWindowClickListener(IOnInfoWindowClickListener listener) = 31; + void setInfoWindowAdapter(IInfoWindowAdapter adapter) = 32; - IObjectWrapper getTestingHelper(); + IObjectWrapper getTestingHelper() = 33; - ICircleDelegate addCircle(in CircleOptions options); + void setOnMyLocationChangeListener(IOnMyLocationChangeListener listener) = 35; + void setOnMyLocationButtonClickListener(IOnMyLocationButtonClickListener listener) = 36; - void setOnMyLocationChangeListener(IOnMyLocationChangeListener listener); - void setOnMyLocationButtonClickListener(IOnMyLocationButtonClickListener listener); + void snapshot(ISnapshotReadyCallback callback, IObjectWrapper bitmap) = 37; - void snapshot(ISnapshotReadyCallback callback, IObjectWrapper bitmap); + void setPadding(int left, int top, int right, int bottom) = 38; - void setPadding(int left, int top, int right, int bottom); + boolean isBuildingsEnabled() = 39; + void setBuildingsEnabled(boolean buildings) = 40; - boolean isBuildingsEnabled(); - void setBuildingsEnabled(boolean buildings); + void setOnMapLoadedCallback(IOnMapLoadedCallback callback) = 41; - void setOnMapLoadedCallback(IOnMapLoadedCallback callback); + //IIndoorBuildingDelegate getIndoorBuilding() = 43; + //void setIndoorStateChangeListener(IOnIndoorStateChangeListener listener) = 44; + + //void a(boolean a) = 50; + + //void setOnMapReadyCallback(IOnMapReadyCallback callback) = 52; + + //void setSnapshotReadyCallback(ISnapshotReadyCallback callback) = 70; + + //void setPoiClickListener(IOnPoiClickListener listener) = 79; + + //void setInfoWindowLongClickListener(IOnInfoWindowLongClickListener listener) = 83; + //void setPolygonClickListener(IOnPolygonClickListener listener) = 84; + //void setInfoWindowCloseListener(IOnInfoWindowCloseListener listener) = 85; + //void setPolylineClickListener(IOnPolylineClickListener listener) = 86; + //void setCircleClickListener(IOnCircleClickListener listener) = 88; + + //boolean setMapStyle(in MapStyleOptions options) = 90; + + //void setBounds(in LatLngBounds bounds) = 94; + + void setCameraMoveStartedListener(IOnCameraMoveStartedListener listener) = 95; + void setCameraMoveListener(IOnCameraMoveListener listener) = 96; + void setCameraMoveCanceledListener(IOnCameraMoveCanceledListener listener) = 97; + void setCameraIdleListener(IOnCameraIdleListener listener) = 98; } diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraIdleListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraIdleListener.aidl new file mode 100644 index 00000000..caa686a8 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraIdleListener.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.maps.internal; + +interface IOnCameraIdleListener { + void onCameraIdle(); +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveCanceledListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveCanceledListener.aidl new file mode 100644 index 00000000..bb1494e8 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveCanceledListener.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.maps.internal; + +interface IOnCameraMoveCanceledListener { + void onCameraMoveCanceled(); +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveListener.aidl new file mode 100644 index 00000000..6b404d65 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveListener.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.maps.internal; + +interface IOnCameraMoveListener { + void onCameraMove(); +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveStartedListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveStartedListener.aidl new file mode 100644 index 00000000..2a5f65d9 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveStartedListener.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.maps.internal; + +interface IOnCameraMoveStartedListener { + void onCameraMoveStarted(int i); +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wallet/internal/IOwService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wallet/internal/IOwService.aidl new file mode 100644 index 00000000..d9cb9209 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wallet/internal/IOwService.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.wallet.internal; + +interface IOwService { + +} diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java index db4b41f7..710b0181 100644 --- a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java +++ b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java @@ -25,6 +25,7 @@ import org.microg.safeparcel.SafeParceled; import java.util.Arrays; import java.util.List; +import java.util.Locale; @PublicApi public class Credential extends AutoSafeParcelable { @@ -127,11 +128,11 @@ public class Credential extends AutoSafeParcelable { @PublicApi(exclude = true) public String getAsString() { if (TextUtils.isEmpty(accountType)) { - return id.toLowerCase() + "|"; + return id.toLowerCase(Locale.US) + "|"; } else { Uri uri = Uri.parse(accountType); - return id.toLowerCase() + "|" + (TextUtils.isEmpty(uri.getScheme()) ? "" : uri.getScheme().toLowerCase()) + "://" + - (TextUtils.isEmpty(uri.getHost()) ? "unknown" : uri.getHost().toLowerCase()) + ":" + uri.getPort(); + return id.toLowerCase(Locale.US) + "|" + (TextUtils.isEmpty(uri.getScheme()) ? "" : uri.getScheme().toLowerCase(Locale.US)) + "://" + + (TextUtils.isEmpty(uri.getHost()) ? "unknown" : uri.getHost().toLowerCase(Locale.US)) + ":" + uri.getPort(); } }