Rename Java packages from sonar to flipper

Summary:
This soft-breaks Android Studio support because folder names no longer map to package names, but this will be mitigated by future diffs.

Steps taken for rename:

```
cd xplat/sonar/android/;
ambr 'com.facebook.sonar' 'com.facebook.flipper'
```

Reviewed By: danielbuechele

Differential Revision: D9850009

fbshipit-source-id: d26d8ab783e7050e4e2fbdd0c35eae3f97879464

android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -14,7 +14,7 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import com.facebook.sonar.core.SonarClient;
+import com.facebook.flipper.core.SonarClient;
 
 public final class AndroidSonarClient {
   private static boolean sIsInitialized = false;

android/src/main/java/com/facebook/sonar/android/EventBase.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridClassBase;
 import com.facebook.proguard.annotations.DoNotStrip;

android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java

@@ -5,16 +5,16 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarClient;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarStateUpdateListener;
-import com.facebook.sonar.core.StateSummary;
+import com.facebook.flipper.core.SonarClient;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarStateUpdateListener;
+import com.facebook.flipper.core.StateSummary;
 
 @DoNotStrip
 class SonarClientImpl implements SonarClient {

android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java

@@ -5,16 +5,16 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
 
 @DoNotStrip
 class SonarConnectionImpl implements SonarConnection {

android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java

@@ -5,15 +5,15 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarResponder;
 
 @DoNotStrip
 class SonarResponderImpl implements SonarResponder {

android/src/main/java/com/facebook/sonar/android/SonarThread.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import android.os.Process;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/android/diagnostics/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-        <activity android:name="com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity"
+        <activity android:name="com.facebook.flipper.android.diagnostics.SonarDiagnosticActivity"
                  android:exported="true" />
     </application>
 </manifest>

android/src/main/java/com/facebook/sonar/android/diagnostics/SonarDiagnosticActivity.java

@@ -1,14 +1,14 @@
-package com.facebook.sonar.android.diagnostics;
+package com.facebook.flipper.android.diagnostics;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.widget.Toast;
-import com.facebook.sonar.android.AndroidSonarClient;
-import com.facebook.sonar.core.SonarClient;
-import com.facebook.sonar.core.SonarStateUpdateListener;
-import com.facebook.sonar.core.StateSummary;
-import com.facebook.sonar.core.StateSummary.StateElement;
+import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.core.SonarClient;
+import com.facebook.flipper.core.SonarStateUpdateListener;
+import com.facebook.flipper.core.StateSummary;
+import com.facebook.flipper.core.StateSummary.StateElement;
 import android.widget.LinearLayout;
 import android.view.View;
 import android.widget.TextView;

android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android.utils;
+package com.facebook.flipper.android.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;

android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public abstract class ErrorReportingRunnable implements Runnable {
 

android/src/main/java/com/facebook/sonar/core/SonarArray.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.ArrayList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/core/SonarClient.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarClient {
   void addPlugin(SonarPlugin plugin);

android/src/main/java/com/facebook/sonar/core/SonarConnection.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A connection between a SonarPlugin and the desktop Sonar application. Register request handlers

android/src/main/java/com/facebook/sonar/core/SonarDynamic.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import javax.annotation.Nullable;
 import org.json.JSONArray;

android/src/main/java/com/facebook/sonar/core/SonarObject.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.Arrays;
 import org.json.JSONArray;

android/src/main/java/com/facebook/sonar/core/SonarPlugin.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A SonarPlugin is an object which exposes an API to the Desktop Sonar application. When a

android/src/main/java/com/facebook/sonar/core/SonarReceiver.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A receiver of a remote method call issued by the Sonar desktop application. If the given

android/src/main/java/com/facebook/sonar/core/SonarResponder.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * FlipperResponder is used to asyncronously response to a messaged recieved from the Sonar desktop

android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java

@@ -1,11 +1,11 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarStateUpdateListener {
 
   /**
    * Called when the state of the sonar client changes.
-   * Typical implementations will subscribe by calling {@link com.facebook.sonar.core.SonarClient#subscribeForUpdates()}, to start receiving update events.
-   * Calling {@link com.facebook.sonar.core.SonarClient#getState()} will retrieve the updated state.
+   * Typical implementations will subscribe by calling {@link com.facebook.flipper.core.SonarClient#subscribeForUpdates()}, to start receiving update events.
+   * Calling {@link com.facebook.flipper.core.SonarClient#getState()} will retrieve the updated state.
    */
   void onUpdate();
 

android/src/main/java/com/facebook/sonar/core/SonarValue.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarValue {
   SonarObject toSonarObject();

android/src/main/java/com/facebook/sonar/core/StateElement.java

@@ -1,4 +1,4 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public class StateElement {
     private final String mName;

android/src/main/java/com/facebook/sonar/core/StateSummary.java

@@ -1,4 +1,4 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.List;
 import java.util.ArrayList;

android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java

@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
 import javax.annotation.Nullable;
 
 /**

android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java

@@ -5,15 +5,15 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
 import android.os.Handler;
 import android.os.Looper;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 
 public abstract class MainThreadSonarReceiver implements SonarReceiver {
 

android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
 import java.util.LinkedList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java

@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.plugins.console.iface.ConsoleCommandReceiver;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
 
 public class ConsoleSonarPlugin implements SonarPlugin {
 

android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java

@@ -5,9 +5,9 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.plugins.console.iface.ScriptingEnvironment;
+import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
 import java.util.HashMap;
 import java.util.Map;
 import org.mozilla.javascript.Context;

android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java

@@ -5,9 +5,9 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.plugins.console.iface.ScriptingSession;
+import com.facebook.flipper.plugins.console.iface.ScriptingSession;
 import java.io.Closeable;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java

@@ -5,14 +5,14 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import android.support.annotation.Nullable;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
 import org.json.JSONObject;
 
 /**

android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import org.json.JSONException;
 import org.json.JSONObject;

android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 public interface ScriptingEnvironment {
 

android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import org.json.JSONException;
 import org.json.JSONObject;

android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Activity;
 import android.app.Application;
@@ -14,8 +14,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AndroidRootResolver;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AndroidRootResolver.Root;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AndroidRootResolver;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AndroidRootResolver.Root;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;

android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Canvas;
 import android.graphics.Color;

android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -15,20 +15,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.TextView;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.plugins.inspector.descriptors.ActivityDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ApplicationDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DialogDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DialogFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DrawableDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.FragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ObjectDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.SupportDialogFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.SupportFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.TextViewDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ViewDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ViewGroupDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.WindowDescriptor;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.plugins.inspector.descriptors.ActivityDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DialogDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DialogFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DrawableDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.FragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ObjectDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.SupportDialogFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.SupportFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.TextViewDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ViewDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ViewGroupDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.WindowDescriptor;
 import java.util.HashMap;
 import java.util.Map;
 

android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 /** Marker interface to identify nodes which should not be traversed. */
 public interface HiddenNode {}

android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;

android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Application;
 import android.content.Context;
@@ -15,20 +15,20 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
-import com.facebook.sonar.plugins.console.iface.ConsoleCommandReceiver;
-import com.facebook.sonar.plugins.console.iface.NullScriptingEnvironment;
-import com.facebook.sonar.plugins.console.iface.ScriptingEnvironment;
-import com.facebook.sonar.plugins.inspector.descriptors.ApplicationDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityUtil;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
+import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
+import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
+import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
 
 import java.util.ArrayList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java

@@ -6,10 +6,10 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarValue;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarValue;
 
 public class InspectorValue<T> implements SonarValue {
 

android/src/main/java/com/facebook/sonar/plugins/inspector/LinesDrawable.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Canvas;
 import android.graphics.Color;

android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 public class Named<ValueType> {
   private final String mName;

android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java

@@ -6,12 +6,12 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -88,7 +88,7 @@ public abstract class NodeDescriptor<T> {
   }
 
   protected abstract class ErrorReportingRunnable
-      extends com.facebook.sonar.core.ErrorReportingRunnable {
+      extends com.facebook.flipper.core.ErrorReportingRunnable {
     public ErrorReportingRunnable() {
       super(mConnection);
     }

android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;

android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java

@@ -6,11 +6,11 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.support.annotation.Nullable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
 import java.util.List;
 
 public class SearchResultNode {

android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 public abstract class SelfRegisteringNodeDescriptor<T> extends NodeDescriptor<T> {
 

android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 /**
  * Used to collect the path from the root node to the node at point [x, y]. This is used for

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java

@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Activity;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.FragmentActivityAccessor;
 import com.facebook.stetho.common.android.FragmentCompat;
 import com.facebook.stetho.common.android.FragmentManagerAccessor;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java

@@ -6,19 +6,19 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Activity;
 import android.support.v4.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.ApplicationWrapper;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 
 import java.util.ArrayList;
 import java.util.Collections;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java

@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java

@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.List;
 import javax.annotation.Nullable;
 

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java

@@ -6,19 +6,19 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java

@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.util.Arrays;
 import java.util.Collections;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java

@@ -6,13 +6,13 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java

@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.List;
 import javax.annotation.Nullable;
 

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java

@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.util.Arrays;
 import java.util.Collections;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java

@@ -6,20 +6,20 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Number;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Text;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Number;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Text;
 
 import android.view.View;
 import android.widget.TextView;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java

@@ -6,10 +6,10 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.annotation.TargetApi;
 import android.graphics.Rect;
@@ -29,18 +29,18 @@ import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityEvaluationUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.EnumMapping;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.ViewAccessibilityHelper;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityEvaluationUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.EnumMapping;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.ViewAccessibilityHelper;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.lang.reflect.Field;
 import java.util.ArrayList;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java

@@ -6,24 +6,24 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_CLIP_BOUNDS;
 import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_OPTICAL_BOUNDS;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Boolean;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Boolean;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.flipper.R;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HiddenNode;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HiddenNode;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.FragmentCompatUtil;
 import java.util.ArrayList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java

@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.view.View;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.graphics.Rect;
 import android.support.v4.view.ViewCompat;
@@ -14,7 +14,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityRoleUtil.AccessibilityRole;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil.AccessibilityRole;
 import java.util.List;
 import javax.annotation.Nullable;
 

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import static android.content.Context.ACCESSIBILITY_SERVICE;
 
@@ -21,9 +21,9 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.EditText;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
 import javax.annotation.Nullable;
 
 /**

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import static android.view.WindowManager.LayoutParams;
 

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java

@@ -6,12 +6,12 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.support.v4.util.SimpleArrayMap;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
 
 public class EnumMapping {
   private final SimpleArrayMap<String, Integer> mMapping = new SimpleArrayMap<>();

android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;

android/src/main/java/com/facebook/sonar/plugins/leakcanary/LeakCanarySonarPlugin.java

@@ -6,14 +6,14 @@
  *
  */
 
-package com.facebook.sonar.plugins.leakcanary;
+package com.facebook.flipper.plugins.leakcanary;
 
 import android.util.Log;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.ArrayList;
 import java.util.List;
 import org.json.JSONArray;

android/src/main/java/com/facebook/sonar/plugins/leakcanary/RecordLeakService.java

@@ -5,12 +5,12 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.leakcanary;
+package com.facebook.flipper.plugins.leakcanary;
 
 import static com.squareup.leakcanary.LeakCanary.leakInfo;
 
-import com.facebook.sonar.android.AndroidSonarClient;
-import com.facebook.sonar.core.SonarClient;
+import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.core.SonarClient;
 import com.squareup.leakcanary.AbstractAnalysisResultService;
 import com.squareup.leakcanary.AnalysisResult;
 import com.squareup.leakcanary.HeapDump;

android/src/main/java/com/facebook/sonar/plugins/litho/DebugComponentDescriptor.java

@@ -1,10 +1,10 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Number;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Number;
 
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
@@ -20,14 +20,14 @@ import com.facebook.litho.StateContainer;
 import com.facebook.litho.annotations.Prop;
 import com.facebook.litho.annotations.State;
 import com.facebook.litho.reference.Reference;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
-import com.facebook.sonar.plugins.inspector.descriptors.ObjectDescriptor;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
+import com.facebook.flipper.plugins.inspector.descriptors.ObjectDescriptor;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaEdge;

android/src/main/java/com/facebook/sonar/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java

@@ -1,18 +1,18 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
-import com.facebook.sonar.plugins.inspector.ApplicationWrapper;
-import com.facebook.sonar.plugins.inspector.InspectorSonarPlugin;
-import com.facebook.sonar.plugins.inspector.ObjectTracker;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
+import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
+import com.facebook.flipper.plugins.inspector.ObjectTracker;
 
 import java.util.Stack;
 

android/src/main/java/com/facebook/sonar/plugins/litho/LithoSonarDescriptors.java

@@ -1,10 +1,10 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import com.facebook.litho.DebugComponent;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 
 public final class LithoSonarDescriptors {
 

android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java

@@ -1,16 +1,16 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import android.graphics.Rect;
 import android.view.ViewGroup;
 import com.facebook.litho.DebugComponent;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/litho/PropWithDescription.java

@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 public interface PropWithDescription {
 

android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java

@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import java.util.ArrayList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java

@@ -6,9 +6,9 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
-import com.facebook.sonar.plugins.network.NetworkReporter.ResponseInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo;
 
 public interface NetworkResponseFormatter {
 

android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java

@@ -6,13 +6,13 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import android.util.Base64;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.common.BufferingSonarPlugin;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.common.BufferingSonarPlugin;
 import java.util.List;
 
 public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkReporter {

android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java

@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import android.util.Log;
-import com.facebook.sonar.plugins.network.NetworkReporter.RequestInfo;
-import com.facebook.sonar.plugins.network.NetworkReporter.ResponseInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.RequestInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java

@@ -5,14 +5,14 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.sandbox;
+package com.facebook.flipper.plugins.sandbox;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.Map;
 
 public class SandboxSonarPlugin implements SonarPlugin {

android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.sandbox;
+package com.facebook.flipper.plugins.sandbox;
 
 import java.util.Map;
 import javax.annotation.Nullable;

android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java

@@ -6,17 +6,17 @@
  *
  */
 
-package com.facebook.sonar.plugins.sharedpreferences;
+package com.facebook.flipper.plugins.sharedpreferences;
 
 import static android.content.Context.MODE_PRIVATE;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.Map;
 
 public class SharedPreferencesSonarPlugin implements SonarPlugin {

android/src/main/java/com/facebook/sonar/testing/SonarConnectionMock.java

@@ -5,12 +5,12 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.testing;
+package com.facebook.flipper.testing;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

android/src/main/java/com/facebook/sonar/testing/SonarResponderMock.java

@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.testing;
+package com.facebook.flipper.testing;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.LinkedList;
 import java.util.List;