Add (empty) Wallet API and update Maps API

also fix small lint issue
This commit is contained in:
Marvin W 2016-12-02 16:15:31 +01:00
parent 0b4f43c6a6
commit bfae24a17c
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
7 changed files with 100 additions and 45 deletions

View File

@ -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.IUiSettingsDelegate;
import com.google.android.gms.maps.internal.IProjectionDelegate; import com.google.android.gms.maps.internal.IProjectionDelegate;
import com.google.android.gms.maps.internal.IOnCameraChangeListener; 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.IOnMapClickListener;
import com.google.android.gms.maps.internal.IOnMapLongClickListener; import com.google.android.gms.maps.internal.IOnMapLongClickListener;
import com.google.android.gms.maps.internal.IOnMarkerClickListener; 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; import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;
interface IGoogleMapDelegate { interface IGoogleMapDelegate {
CameraPosition getCameraPosition(); CameraPosition getCameraPosition() = 0;
float getMaxZoomLevel(); float getMaxZoomLevel() = 1;
float getMinZoomLevel(); float getMinZoomLevel() = 2;
void moveCamera(IObjectWrapper cameraUpdate); void moveCamera(IObjectWrapper cameraUpdate) = 3;
void animateCamera(IObjectWrapper cameraUpdate); void animateCamera(IObjectWrapper cameraUpdate) = 4;
void animateCameraWithCallback(IObjectWrapper cameraUpdate, ICancelableCallback callback); void animateCameraWithCallback(IObjectWrapper cameraUpdate, ICancelableCallback callback) = 5;
void animateCameraWithDurationAndCallback(IObjectWrapper cameraUpdate, int duration, ICancelableCallback callback); void animateCameraWithDurationAndCallback(IObjectWrapper cameraUpdate, int duration, ICancelableCallback callback) = 6;
void stopAnimation(); void stopAnimation() = 7;
IPolylineDelegate addPolyline(in PolylineOptions options); IPolylineDelegate addPolyline(in PolylineOptions options) = 8;
IPolygonDelegate addPolygon(in PolygonOptions options); IPolygonDelegate addPolygon(in PolygonOptions options) = 9;
IMarkerDelegate addMarker(in MarkerOptions options); IMarkerDelegate addMarker(in MarkerOptions options) = 10;
IGroundOverlayDelegate addGroundOverlay(in GroundOverlayOptions options); IGroundOverlayDelegate addGroundOverlay(in GroundOverlayOptions options) = 11;
ITileOverlayDelegate addTileOverlay(in TileOverlayOptions options); ITileOverlayDelegate addTileOverlay(in TileOverlayOptions options) = 12;
ICircleDelegate addCircle(in CircleOptions options) = 34;
void clear(); void clear() = 13;
int getMapType(); int getMapType() = 14;
void setMapType(int type); void setMapType(int type) = 15;
boolean isTrafficEnabled(); boolean isTrafficEnabled() = 16;
void setTrafficEnabled(boolean traffic); void setTrafficEnabled(boolean traffic) = 17;
boolean isIndoorEnabled(); boolean isIndoorEnabled() = 18;
void setIndoorEnabled(boolean indoor); void setIndoorEnabled(boolean indoor) = 19;
boolean isMyLocationEnabled(); boolean isMyLocationEnabled() = 20;
void setMyLocationEnabled(boolean myLocation); void setMyLocationEnabled(boolean myLocation) = 21;
Location getMyLocation(); Location getMyLocation() = 22;
void setLocationSource(ILocationSourceDelegate locationSource); void setLocationSource(ILocationSourceDelegate locationSource) = 23;
IUiSettingsDelegate getUiSettings(); IUiSettingsDelegate getUiSettings() = 24;
IProjectionDelegate getProjection(); IProjectionDelegate getProjection() = 25;
void setOnCameraChangeListener(IOnCameraChangeListener listener); void setOnCameraChangeListener(IOnCameraChangeListener listener) = 26;
void setOnMapClickListener(IOnMapClickListener listener); void setOnMapClickListener(IOnMapClickListener listener) = 27;
void setOnMapLongClickListener(IOnMapLongClickListener listener); void setOnMapLongClickListener(IOnMapLongClickListener listener) = 28;
void setOnMarkerClickListener(IOnMarkerClickListener listener); void setOnMarkerClickListener(IOnMarkerClickListener listener) = 29;
void setOnMarkerDragListener(IOnMarkerDragListener listener); void setOnMarkerDragListener(IOnMarkerDragListener listener) = 30;
void setOnInfoWindowClickListener(IOnInfoWindowClickListener listener); void setOnInfoWindowClickListener(IOnInfoWindowClickListener listener) = 31;
void setInfoWindowAdapter(IInfoWindowAdapter adapter); 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 snapshot(ISnapshotReadyCallback callback, IObjectWrapper bitmap) = 37;
void setOnMyLocationButtonClickListener(IOnMyLocationButtonClickListener listener);
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 setOnMapLoadedCallback(IOnMapLoadedCallback callback) = 41;
void setBuildingsEnabled(boolean buildings);
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;
} }

View File

@ -0,0 +1,5 @@
package com.google.android.gms.maps.internal;
interface IOnCameraIdleListener {
void onCameraIdle();
}

View File

@ -0,0 +1,5 @@
package com.google.android.gms.maps.internal;
interface IOnCameraMoveCanceledListener {
void onCameraMoveCanceled();
}

View File

@ -0,0 +1,5 @@
package com.google.android.gms.maps.internal;
interface IOnCameraMoveListener {
void onCameraMove();
}

View File

@ -0,0 +1,5 @@
package com.google.android.gms.maps.internal;
interface IOnCameraMoveStartedListener {
void onCameraMoveStarted(int i);
}

View File

@ -0,0 +1,5 @@
package com.google.android.gms.wallet.internal;
interface IOwService {
}

View File

@ -25,6 +25,7 @@ import org.microg.safeparcel.SafeParceled;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Locale;
@PublicApi @PublicApi
public class Credential extends AutoSafeParcelable { public class Credential extends AutoSafeParcelable {
@ -127,11 +128,11 @@ public class Credential extends AutoSafeParcelable {
@PublicApi(exclude = true) @PublicApi(exclude = true)
public String getAsString() { public String getAsString() {
if (TextUtils.isEmpty(accountType)) { if (TextUtils.isEmpty(accountType)) {
return id.toLowerCase() + "|"; return id.toLowerCase(Locale.US) + "|";
} else { } else {
Uri uri = Uri.parse(accountType); Uri uri = Uri.parse(accountType);
return id.toLowerCase() + "|" + (TextUtils.isEmpty(uri.getScheme()) ? "" : uri.getScheme().toLowerCase()) + "://" + return id.toLowerCase(Locale.US) + "|" + (TextUtils.isEmpty(uri.getScheme()) ? "" : uri.getScheme().toLowerCase(Locale.US)) + "://" +
(TextUtils.isEmpty(uri.getHost()) ? "unknown" : uri.getHost().toLowerCase()) + ":" + uri.getPort(); (TextUtils.isEmpty(uri.getHost()) ? "unknown" : uri.getHost().toLowerCase(Locale.US)) + ":" + uri.getPort();
} }
} }