tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - fixup timber merge (#7179)

Browse Source
This commit is contained in:
Tobrun
2016-11-24 11:33:57 +01:00
committed by GitHub
parent fe68b9bc4a
commit dda1d9f357
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
View File

@@ -4,7 +4,6 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -17,6 +16,8 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.mapboxsdk.testapp.R;
import timber.log.Timber;
public class CameraAnimationTypeActivity extends AppCompatActivity implements OnMapReadyCallback {
private static final LatLng LAT_LNG_LONDON_EYE = new LatLng(51.50325, -0.11968);
@@ -55,14 +56,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
@Override
public void onCameraChange(CameraPosition position) {
Timber.v(position.toString());
}
});
mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
@Override
public void onCameraChange(CameraPosition position) {
Log.e(MapboxConstants.TAG, "OnCameraChange: " + position);
Timber.w(position.toString());
}
});
@@ -101,18 +95,18 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
public void onCancel() {
Timber.i("Duration onCancel Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Ease onCancel Callback called.",
Toast.LENGTH_LONG).show();
CameraAnimationTypeActivity.this,
"Ease onCancel Callback called.",
Toast.LENGTH_LONG).show();
}
@Override
public void onFinish() {
Timber.i("Duration onFinish Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Ease onFinish Callback called.",
Toast.LENGTH_LONG).show();
CameraAnimationTypeActivity.this,
"Ease onFinish Callback called.",
Toast.LENGTH_LONG).show();
}
};
@@ -138,18 +132,18 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
public void onCancel() {
Timber.i("Duration onCancel Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Duration onCancel Callback called.",
Toast.LENGTH_LONG).show();
CameraAnimationTypeActivity.this,
"Duration onCancel Callback called.",
Toast.LENGTH_LONG).show();
}
@Override
public void onFinish() {
Timber.i("Duration onFinish Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Duration onFinish Callback called.",
Toast.LENGTH_LONG).show();
CameraAnimationTypeActivity.this,
"Duration onFinish Callback called.",
Toast.LENGTH_LONG).show();
}
};

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
View File

@@ -57,7 +57,7 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe
mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
@Override
public void onCameraChange(CameraPosition position) {
Log.e(MapboxConstants.TAG, "OnCameraChange: " + position);
Timber.w("OnCameraChange: " + position);
}
});