[android] #4510 - Remove onStart() and onStop() lifecycle methods from MapView.

This commit is contained in:
Justas Medeisis
2016-03-28 23:38:15 +03:00
committed by Brad Leege
parent fb15582d53
commit af4871f7bf
25 changed files with 9 additions and 290 deletions

View File

@@ -76,7 +76,6 @@ public final class MapFragment extends Fragment {
@Override
public void onStart() {
super.onStart();
mMap.onStart();
mMap.getMapAsync(mOnMapReadyCallback);
}
@@ -115,7 +114,6 @@ public final class MapFragment extends Fragment {
@Override
public void onStop() {
super.onStop();
mMap.onStop();
}
/**

View File

@@ -496,22 +496,6 @@ public class MapView extends FrameLayout {
mNativeMapView = null;
}
/**
* You must call this method from the parent's {@link Activity#onStart()} or {@link Fragment#onStart()}.
*/
@UiThread
public void onStart() {
mUserLocationView.onStart();
}
/**
* You must call this method from the parent's {@link Activity#onStop()} or {@link Fragment#onStop()}
*/
@UiThread
public void onStop() {
mUserLocationView.onStop();
}
/**
* You must call this method from the parent's {@link Activity#onPause()} or {@link Fragment#onPause()}.
*/

View File

@@ -76,7 +76,6 @@ public class SupportMapFragment extends Fragment {
@Override
public void onStart() {
super.onStart();
mMap.onStart();
mMap.getMapAsync(mOnMapReadyCallback);
}
@@ -115,7 +114,6 @@ public class SupportMapFragment extends Fragment {
@Override
public void onStop() {
super.onStop();
mMap.onStop();
}
/**

View File

@@ -198,17 +198,6 @@ public final class UserLocationView extends View {
mProjection = mapboxMap.getProjection();
}
public void onStart() {
if (mMyBearingTrackingMode == MyBearingTracking.COMPASS) {
mBearingChangeListener.onStart(getContext());
}
}
public void onStop() {
mBearingChangeListener.onStop();
cancelAnimations();
}
@Override
public void onDraw(Canvas canvas) {
super.onDraw(canvas);
@@ -395,9 +384,9 @@ public final class UserLocationView extends View {
if (myBearingTrackingMode == MyBearingTracking.COMPASS) {
mShowAccuracy = false;
mShowDirection = true;
mBearingChangeListener.onStart(getContext());
mBearingChangeListener.onResume();
} else {
mBearingChangeListener.onStop();
mBearingChangeListener.onPause();
if (myBearingTrackingMode == MyBearingTracking.GPS) {
mShowDirection = (mUserLocation != null) && mUserLocation.hasBearing();
} else {
@@ -433,12 +422,12 @@ public final class UserLocationView extends View {
mMagnetometer = mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
}
public void onStart(Context context) {
public void onResume() {
mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_GAME);
mSensorManager.registerListener(this, mMagnetometer, SensorManager.SENSOR_DELAY_GAME);
}
public void onStop() {
public void onPause() {
mSensorManager.unregisterListener(this, mAccelerometer);
mSensorManager.unregisterListener(this, mMagnetometer);
}
@@ -661,11 +650,16 @@ public final class UserLocationView extends View {
public void onPause() {
mPaused = true;
mBearingChangeListener.onPause();
cancelAnimations();
toggleGps(false);
}
public void onResume() {
mPaused = false;
if (mMyBearingTrackingMode == MyBearingTracking.COMPASS) {
mBearingChangeListener.onResume();
}
if (isEnabled()) {
toggleGps(true);
}

View File

@@ -86,12 +86,6 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
}
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -104,12 +98,6 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -87,12 +87,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
// nothing selected, nothing to do!
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -105,12 +99,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -126,12 +126,6 @@ public class CameraActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -144,12 +138,6 @@ public class CameraActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -70,12 +70,6 @@ public class CoordinateChangeActivity extends AppCompatActivity {
return first ? new LatLng(38.87000, -77.00800) : new LatLng(38.87031, -77.00897);
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -88,12 +82,6 @@ public class CoordinateChangeActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -140,12 +140,6 @@ public class DirectionsActivity extends AppCompatActivity {
.width(5));
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -158,12 +152,6 @@ public class DirectionsActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -107,13 +107,6 @@ public class DoubleMapActivity extends AppCompatActivity {
});
}
@Override
public void onStart() {
super.onStart();
mMapView.onStart();
mMapViewMini.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -128,13 +121,6 @@ public class DoubleMapActivity extends AppCompatActivity {
mMapViewMini.onPause();
}
@Override
public void onStop() {
super.onStop();
mMapView.onStop();
mMapViewMini.onStop();
}
@Override
public void onDestroy() {
super.onDestroy();

View File

@@ -87,13 +87,6 @@ public class DynamicMarkerChangeActivity extends AppCompatActivity {
mMarker.setIcon(mIconFactory.fromResource(first ? R.drawable.ic_chelsea : R.drawable.ic_arsenal));
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -106,12 +99,6 @@ public class DynamicMarkerChangeActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -107,18 +107,6 @@ public class GeocoderActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mapView.onStart();
}
@Override
protected void onStop() {
super.onStop();
mapView.onStop();
}
@Override
public void onPause() {
super.onPause();

View File

@@ -107,12 +107,6 @@ public class InfoWindowActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -125,12 +119,6 @@ public class InfoWindowActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -98,12 +98,6 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
return marker;
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -116,12 +110,6 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -57,12 +57,6 @@ public class InfoWindowConcurrentActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -75,12 +69,6 @@ public class InfoWindowConcurrentActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -83,12 +83,6 @@ public class LatLngBoundsActivity extends AppCompatActivity {
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -101,12 +95,6 @@ public class LatLngBoundsActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -91,12 +91,6 @@ public class ManualZoomActivity extends AppCompatActivity {
}
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -109,12 +103,6 @@ public class ManualZoomActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -58,12 +58,6 @@ public class MapPaddingActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -76,12 +70,6 @@ public class MapPaddingActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -56,12 +56,6 @@ public class MapboxMapActivity extends AppCompatActivity {
Snackbar.LENGTH_INDEFINITE).show();
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -74,12 +68,6 @@ public class MapboxMapActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -169,12 +169,6 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -193,12 +187,6 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
mMapView.onSaveInstanceState(outState);
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onDestroy() {
super.onDestroy();

View File

@@ -121,12 +121,6 @@ public class OfflineActivity extends AppCompatActivity
mOfflineManager.setAccessToken(ApiAccess.getToken(this));
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -139,12 +133,6 @@ public class OfflineActivity extends AppCompatActivity
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -116,12 +116,6 @@ public class PolylineActivity extends AppCompatActivity {
}};
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -134,12 +128,6 @@ public class PolylineActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -92,12 +92,6 @@ public class PressForMarkerActivity extends AppCompatActivity implements MapboxM
mMapboxMap.addMarker(marker);
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -117,12 +111,6 @@ public class PressForMarkerActivity extends AppCompatActivity implements MapboxM
outState.putParcelableArrayList(STATE_MARKER_LIST, mMarkerList);
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onDestroy() {
super.onDestroy();

View File

@@ -80,12 +80,6 @@ public class ScrollByActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
public void onResume() {
super.onResume();
@@ -98,12 +92,6 @@ public class ScrollByActivity extends AppCompatActivity {
mMapView.onPause();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

View File

@@ -45,18 +45,6 @@ public class TiltActivity extends AppCompatActivity {
});
}
@Override
protected void onStart() {
super.onStart();
mMapView.onStart();
}
@Override
protected void onStop() {
super.onStop();
mMapView.onStop();
}
@Override
public void onPause() {
super.onPause();