From dda1d9f357b12c1fd41353a07f48995b5bb7b7ac Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Thu, 24 Nov 2016 11:33:57 +0100
Subject: [PATCH] [android] - fixup timber merge (#7179)

---
 .../camera/CameraAnimationTypeActivity.java   | 36 ++++++++-----------
 .../camera/CameraPositionActivity.java        |  2 +-
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
index ba192504a..720b2358a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
@@ -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();
                         }
                     };
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
index 170a3cb43..b6394eac3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
@@ -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);
             }
         });