Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TIMOB-9913 Android: Remove the unused references to Map View's "animate" property. #4582

Merged
merged 1 commit into from
Dec 2, 2013
Merged

TIMOB-9913 Android: Remove the unused references to Map View's "animate" property. #4582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 4 additions & 14 deletions android/modules/map/src/java/ti/modules/titanium/map/TiMapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public class TiMapView extends TiUIView
private static final int MSG_SET_LOCATION = 300;
private static final int MSG_SET_MAPTYPE = 301;
private static final int MSG_SET_REGIONFIT = 302;
private static final int MSG_SET_ANIMATE = 303;
private static final int MSG_SET_USERLOCATION = 304;
private static final int MSG_SET_SCROLLENABLED = 305;
private static final int MSG_CHANGE_ZOOM = 306;
Expand All @@ -82,7 +81,6 @@ public class TiMapView extends TiUIView

private boolean scrollEnabled;
private boolean regionFit;
private boolean animate;
private boolean userLocation;

private LocalMapView view;
Expand Down Expand Up @@ -522,7 +520,6 @@ public void onStop(Activity activity) {}
setNativeView(view);

this.regionFit = true;
this.animate = false;

final TiViewProxy fproxy = proxy;

Expand Down Expand Up @@ -572,12 +569,8 @@ public boolean handleMessage(Message msg)
regionFit = msg.arg1 == 1 ? true : false;
return true;

case MSG_SET_ANIMATE :
animate = msg.arg1 == 1 ? true : false;
return true;

case MSG_SET_SCROLLENABLED :
animate = msg.arg1 == 1 ? true : false;
scrollEnabled = msg.arg1 == 1 ? true : false;
if (view != null) {
view.setScrollable(scrollEnabled);
}
Expand Down Expand Up @@ -805,9 +798,6 @@ public void processProperties(KrollDict d)
if (d.containsKey(TiC.PROPERTY_REGION_FIT)) {
regionFit = d.getBoolean(TiC.PROPERTY_REGION_FIT);
}
if (d.containsKey(TiC.PROPERTY_ANIMATE)) {
animate = d.getBoolean(TiC.PROPERTY_ANIMATE);
}
if (d.containsKey(TiC.PROPERTY_USER_LOCATION)) {
doUserLocation(d.getBoolean(TiC.PROPERTY_USER_LOCATION));
}
Expand Down Expand Up @@ -982,10 +972,10 @@ public void selectAnnotation(boolean select, String title, AnnotationProxy selec
Log.e(TAG, "calling obtainMessage", Log.DEBUG_MODE);

KrollDict args = new KrollDict();
args.put("select", new Boolean(select));
args.put("select", Boolean.valueOf(select));
args.put("title", title);
args.put("animate", new Boolean(animate));
args.put("center", new Boolean(center));
args.put("animate", Boolean.valueOf(animate));
args.put("center", Boolean.valueOf(center));
if (selectedAnnotation != null) {
args.put("annotation", selectedAnnotation);
}
Expand Down
1 change: 0 additions & 1 deletion android/modules/map/src/java/ti/modules/titanium/map/ViewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import android.view.Window;

@Kroll.proxy(creatableInModule = MapModule.class, propertyAccessors = {
TiC.PROPERTY_ANIMATE,
TiC.PROPERTY_ANNOTATIONS,
TiC.PROPERTY_MAP_TYPE,
TiC.PROPERTY_REGION,
Expand Down
2 changes: 1 addition & 1 deletion apidoc/Titanium/Map/View.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ properties:
- name: animate
summary: Indicates if changes to the mapping region should be animated.
type: Boolean
platforms: [android, iphone, ipad]
platforms: [iphone, ipad]

- name: animated
summary: Indicates if changes to the mapping region should be animated.
Expand Down