Disable ui component by default, enable it at BlockCanary.install()

blockcanary-android/build.gradle

@@ -21,6 +21,5 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-//    compile project(':blockcanary-core')
-    compile 'com.github.moduth:blockcanary-core:1.2.0'
+    compile project(':blockcanary-core')
 }

blockcanary-android/src/main/AndroidManifest.xml

@@ -1,5 +1,18 @@
-<manifest package="com.github.moduth.blockcanary.android">
-
-    <application/>
+<manifest package="com.github.moduth.blockcanary"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+                android:name=".ui.DisplayBlockActivity"
+                android:icon="@drawable/block_canary_icon"
+                android:enabled="false"
+                android:label="@string/display_activity_label"
+                android:taskAffinity="com.github.moduth.blockcanary"
+                android:theme="@style/block_canary_BlockCanary.Base">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
 
+    </application>
 </manifest>

blockcanary-android/src/main/java/com/github/moduth/blockcanary/BlockCanary.java

@@ -13,12 +13,20 @@
  */
 package com.github.moduth.blockcanary;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
-
+import com.github.moduth.blockcanary.ui.DisplayBlockActivity;
 import java.lang.reflect.Constructor;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+import static android.content.pm.PackageManager.DONT_KILL_APP;
 
 /**
  * Looper thread monitor.
@@ -33,6 +41,42 @@ public final class BlockCanary {
     private BlockCanaryCore mBlockCanaryCore;
     private boolean mLooperLoggingStarted = false;
 
+    // these lines are originally copied from LeakCanary: Copyright (C) 2015 Square, Inc.
+    private static final Executor fileIoExecutor = newSingleThreadExecutor("File-IO");
+
+    public static void executeOnFileIoThread(Runnable runnable) {
+        fileIoExecutor.execute(runnable);
+    }
+
+    public static Executor newSingleThreadExecutor(String threadName) {
+        return Executors.newSingleThreadExecutor(new LeakCanarySingleThreadFactory(threadName));
+    }
+
+    public static void enableDisplayBlockActivity(Context context) {
+        setEnabled(context, DisplayBlockActivity.class, true);
+    }
+
+    public static void setEnabled(Context context, final Class<?> componentClass,
+            final boolean enabled) {
+        final Context appContext = context.getApplicationContext();
+        executeOnFileIoThread(new Runnable() {
+            @Override
+            public void run() {
+                setEnabledBlocking(appContext, componentClass, enabled);
+            }
+        });
+    }
+
+    public static void setEnabledBlocking(Context appContext, Class<?> componentClass,
+            boolean enabled) {
+        ComponentName component = new ComponentName(appContext, componentClass);
+        PackageManager packageManager = appContext.getPackageManager();
+        int newState = enabled ? COMPONENT_ENABLED_STATE_ENABLED : COMPONENT_ENABLED_STATE_DISABLED;
+        // Blocks on IPC.
+        packageManager.setComponentEnabledSetting(component, newState, DONT_KILL_APP);
+    }
+    // end of lines copied from LeakCanary
+
     private BlockCanary() {
         BlockCanaryCore.setIBlockCanaryContext(BlockCanaryContext.get());
         mBlockCanaryCore = BlockCanaryCore.get();
@@ -42,11 +86,12 @@ private BlockCanary() {
     /**
      * Install {@link BlockCanary}
      *
-     * @param context            application context
+     * @param context application context
      * @param blockCanaryContext implementation for {@link BlockCanaryContext}
      * @return {@link BlockCanary}
      */
     public static BlockCanary install(Context context, BlockCanaryContext blockCanaryContext) {
+        enableDisplayBlockActivity(context);
         BlockCanaryContext.init(context, blockCanaryContext);
         return get();
     }
@@ -97,11 +142,14 @@ public void upload() {
     }
 
     /**
-     * Record monitor start time to preference, you may use it when after push which tells start BlockCanary.
+     * Record monitor start time to preference, you may use it when after push which tells start
+     * BlockCanary.
      */
     public void recordStartTime() {
         PreferenceManager.getDefaultSharedPreferences(BlockCanaryContext.get().getContext())
-                .edit().putLong("BlockCanary_StartTime", System.currentTimeMillis()).commit();
+                .edit()
+                .putLong("BlockCanary_StartTime", System.currentTimeMillis())
+                .commit();
     }
 
     /**
@@ -110,11 +158,11 @@ public void recordStartTime() {
      * @return true if ended
      */
     public boolean isMonitorDurationEnd() {
-        long startTime = PreferenceManager.getDefaultSharedPreferences(
-                BlockCanaryContext.get().getContext()).getLong("BlockCanary_StartTime", 0);
-        return startTime != 0 &&
-                System.currentTimeMillis() - startTime >
-                        BlockCanaryContext.get().getConfigDuration() * 3600 * 1000;
+        long startTime =
+                PreferenceManager.getDefaultSharedPreferences(BlockCanaryContext.get().getContext())
+                        .getLong("BlockCanary_StartTime", 0);
+        return startTime != 0 && System.currentTimeMillis() - startTime >
+                BlockCanaryContext.get().getConfigDuration() * 3600 * 1000;
     }
 
     @SuppressWarnings("unchecked")

blockcanary-android/src/main/java/com/github/moduth/blockcanary/LeakCanarySingleThreadFactory.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.moduth.blockcanary;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * This is intended to only be used with a single thread executor.
+ */
+final class LeakCanarySingleThreadFactory implements ThreadFactory {
+
+  private final String threadName;
+
+  LeakCanarySingleThreadFactory(String threadName) {
+    this.threadName = "LeakCanary-" + threadName;
+  }
+
+  @Override public Thread newThread(Runnable runnable) {
+    return new Thread(runnable, threadName);
+  }
+}

blockcanary-ui/src/main/java/com/github/moduth/blockcanary/ui/BlockDetailAdapter.java → blockcanary-android/src/main/java/com/github/moduth/blockcanary/ui/BlockDetailAdapter.java

@@ -22,12 +22,10 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
-
 import com.github.moduth.blockcanary.BlockCanaryCore;
-import com.github.moduth.blockcanary.ui.R;
+import com.github.moduth.blockcanary.R;
 import com.github.moduth.blockcanary.log.Block;
 import com.github.moduth.blockcanary.log.ProcessUtils;
-
 import java.util.Arrays;
 
 final class BlockDetailAdapter extends BaseAdapter {

blockcanary-ui/src/main/java/com/github/moduth/blockcanary/ui/DisplayBlockActivity.java → blockcanary-android/src/main/java/com/github/moduth/blockcanary/ui/DisplayBlockActivity.java

@@ -38,11 +38,10 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-
 import com.github.moduth.blockcanary.LogWriter;
+import com.github.moduth.blockcanary.R;
 import com.github.moduth.blockcanary.log.Block;
 import com.github.moduth.blockcanary.log.BlockCanaryInternals;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;

blockcanary-ui/src/main/java/com/github/moduth/blockcanary/ui/Notifier.java → blockcanary-android/src/main/java/com/github/moduth/blockcanary/ui/Notifier.java

@@ -6,9 +6,8 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-
 import com.github.moduth.blockcanary.OnBlockEventInterceptor;
-import com.github.moduth.blockcanary.ui.R;
+import com.github.moduth.blockcanary.R;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.os.Build.VERSION.SDK_INT;