Refactor implementations out of google namespace

This commit is contained in:
mar-v-in 2014-06-16 13:41:09 +02:00
parent 38c099526e
commit 2c2574c6b0
27 changed files with 56 additions and 36 deletions

View File

@ -23,8 +23,12 @@ import android.os.RemoteException;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.model.internal.BitmapDescriptorFactoryImpl;
import org.microg.gms.maps.bitmap.BitmapDescriptorFactoryImpl;
import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
import org.microg.gms.maps.camera.CameraUpdateFactoryImpl;
import org.microg.gms.maps.MapFragmentImpl;
import org.microg.gms.maps.MapViewImpl;
import org.microg.gms.maps.ResourcesContainer;
public class CreatorImpl extends ICreator.Stub {
@Override

View File

@ -21,6 +21,7 @@ import android.os.Parcelable;
import com.google.android.gms.common.safeparcel.SafeReader;
import com.google.android.gms.common.safeparcel.SafeWriter;
import com.google.android.gms.dynamic.IObjectWrapper;
import org.microg.gms.maps.bitmap.BitmapDescriptor;
public class GroundOverlayOptions implements Parcelable {
public static Creator<GroundOverlayOptions> CREATOR = new Creator<GroundOverlayOptions>() {

View File

@ -21,6 +21,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import com.google.android.gms.common.safeparcel.SafeReader;
import com.google.android.gms.dynamic.ObjectWrapper;
import org.microg.gms.maps.bitmap.BitmapDescriptor;
public class MarkerOptions implements Parcelable {

View File

@ -21,6 +21,7 @@ import android.os.RemoteException;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.plus.internal.IPlusOneButtonCreator;
import org.microg.gms.plus.PlusOneButtonImpl;
public class PlusOneButtonCreatorImpl extends IPlusOneButtonCreator.Stub {
@Override

View File

@ -22,7 +22,7 @@ import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Log;
import com.google.android.gms.common.internal.AbstractGmsServiceBroker;
import org.microg.gms.AbstractGmsServiceBroker;
import com.google.android.gms.common.internal.IGmsCallbacks;
public class GoogleLocationManagerService extends Service {

View File

@ -14,11 +14,13 @@
* limitations under the License.
*/
package com.google.android.gms.common.internal;
package org.microg.gms;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import com.google.android.gms.common.internal.IGmsCallbacks;
import com.google.android.gms.common.internal.IGmsServiceBroker;
public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
@Override

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps;
import android.content.Context;
import android.location.Location;
@ -28,10 +28,13 @@ import android.widget.FrameLayout;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.internal.*;
import com.google.android.gms.maps.model.*;
import com.google.android.gms.maps.model.internal.*;
import com.google.android.maps.MapController;
import com.google.android.maps.MapView;
import org.microg.gms.maps.camera.CameraUpdate;
import org.microg.gms.maps.markup.*;
public class GoogleMapImpl {
private static final String TAG = GoogleMapImpl.class.getName();
@ -74,11 +77,11 @@ public class GoogleMapImpl {
return context;
}
MapView getMapView() {
public MapView getMapView() {
return mapView;
}
MapController getController() {
public MapController getController() {
return mapView != null ? mapView.getController() : null;
}

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps;
import android.app.Activity;
import android.content.Context;
@ -26,6 +26,8 @@ import android.view.ViewGroup;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.internal.IGoogleMapDelegate;
import com.google.android.gms.maps.internal.IMapFragmentDelegate;
public class MapFragmentImpl extends IMapFragmentDelegate.Stub {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps;
import android.content.Context;
import android.os.Bundle;
@ -23,6 +23,8 @@ import android.view.LayoutInflater;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.internal.IGoogleMapDelegate;
import com.google.android.gms.maps.internal.IMapViewDelegate;
public class MapViewImpl extends IMapViewDelegate.Stub {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps;
import android.content.res.Resources;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

View File

@ -14,13 +14,12 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.model.internal.AbstractBitmapDescriptor;
public class BitmapDescriptor {
private final IObjectWrapper remoteObject;

View File

@ -14,12 +14,13 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.graphics.Bitmap;
import android.os.RemoteException;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
public class BitmapDescriptorFactoryImpl extends IBitmapDescriptorFactoryDelegate.Stub {

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import com.google.android.gms.R;
import com.google.android.gms.maps.internal.ResourcesContainer;
import org.microg.gms.maps.ResourcesContainer;
public class DefaultBitmapDescriptor extends AbstractBitmapDescriptor {
private float hue;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
public class PathBitmapDescriptor {
public PathBitmapDescriptor(String absolutePath) {

View File

@ -14,15 +14,11 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.bitmap;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.util.Log;
import com.google.android.gms.maps.internal.ResourcesContainer;
public class ResourceBitmapDescriptor extends AbstractBitmapDescriptor {
private static final String TAG = ResourceBitmapDescriptor.class.getName();

View File

@ -14,7 +14,9 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps.camera;
import org.microg.gms.maps.GoogleMapImpl;
public interface CameraUpdate {
void update(GoogleMapImpl map);

View File

@ -14,16 +14,18 @@
* limitations under the License.
*/
package com.google.android.gms.maps.internal;
package org.microg.gms.maps.camera;
import android.os.RemoteException;
import android.util.Log;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.internal.ICameraUpdateFactoryDelegate;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import com.google.android.maps.GeoPoint;
import org.microg.gms.maps.GoogleMapImpl;
public class CameraUpdateFactoryImpl extends ICameraUpdateFactoryDelegate.Stub {
private static final String TAG = CameraUpdateFactoryImpl.class.getName();

View File

@ -14,11 +14,12 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.markup;
import android.os.RemoteException;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.internal.ICircleDelegate;
public class CircleImpl extends ICircleDelegate.Stub {
private LatLng center;

View File

@ -14,13 +14,14 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.markup;
import android.os.RemoteException;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.maps.model.GroundOverlayOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import com.google.android.gms.maps.model.internal.IGroundOverlayDelegate;
public class GroundOverlayImpl extends IGroundOverlayDelegate.Stub {
private LatLng position;

View File

@ -14,23 +14,23 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.markup;
import android.graphics.*;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
import android.util.Log;
import android.view.MotionEvent;
import com.google.android.gms.dynamic.IObjectWrapper;
import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.internal.GoogleMapImpl;
import com.google.android.gms.maps.model.internal.IMarkerDelegate;
import com.google.android.gms.maps.internal.IOnMarkerClickListener;
import com.google.android.gms.maps.model.BitmapDescriptor;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import com.google.android.maps.GeoPoint;
import com.google.android.maps.MapView;
import com.google.android.maps.Overlay;
import org.microg.gms.maps.bitmap.BitmapDescriptor;
import org.microg.gms.maps.bitmap.DefaultBitmapDescriptor;
import org.microg.gms.maps.GoogleMapImpl;
public class MarkerImpl extends IMarkerDelegate.Stub {
private static final String TAG = MarkerImpl.class.getName();

View File

@ -14,11 +14,12 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.markup;
import android.os.RemoteException;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.PolygonOptions;
import com.google.android.gms.maps.model.internal.IPolygonDelegate;
import java.util.List;

View File

@ -14,11 +14,12 @@
* limitations under the License.
*/
package com.google.android.gms.maps.model.internal;
package org.microg.gms.maps.markup;
import android.os.RemoteException;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.PolylineOptions;
import com.google.android.gms.maps.model.internal.IPolylineDelegate;
import java.util.Collections;
import java.util.List;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.android.gms.plus.plusone;
package org.microg.gms.plus;
import android.content.Context;
import android.util.AttributeSet;