Merge changes I923deb00,Ibb2eff82
* changes:
Add tests for trace categories in Traceur
Update Traceur test (testSuccessfulTracing)
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 49f0291..6361718 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -2,5 +2,5 @@
<resources
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<!-- launcher icon color -->
- <color name="icon_launcher_settings_color">@*android:color/accent_device_default_light</color>
+ <color name="icon_launcher_settings_color">@color/settingslib_accent_device_default_light</color>
</resources>
diff --git a/src/com/android/traceur/MainFragment.java b/src/com/android/traceur/MainFragment.java
index 50d62cb..77fb286 100644
--- a/src/com/android/traceur/MainFragment.java
+++ b/src/com/android/traceur/MainFragment.java
@@ -24,20 +24,17 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.icu.text.MessageFormat;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import androidx.preference.MultiSelectListPreference;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import android.view.LayoutInflater;
import android.view.View;
@@ -49,11 +46,7 @@
import com.android.settingslib.HelpUtils;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
diff --git a/src/com/android/traceur/PerfettoUtils.java b/src/com/android/traceur/PerfettoUtils.java
index aa18e89..c25f1b3 100644
--- a/src/com/android/traceur/PerfettoUtils.java
+++ b/src/com/android/traceur/PerfettoUtils.java
@@ -20,9 +20,7 @@
import android.util.Log;
import java.io.File;
-import java.io.IOException;
import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.List;
diff --git a/src/com/android/traceur/QsService.java b/src/com/android/traceur/QsService.java
index 4eaf741..449598b 100644
--- a/src/com/android/traceur/QsService.java
+++ b/src/com/android/traceur/QsService.java
@@ -16,8 +16,6 @@
package com.android.traceur;
-import android.content.ComponentName;
-import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.drawable.Icon;
import android.preference.PreferenceManager;
diff --git a/src/com/android/traceur/SearchProvider.java b/src/com/android/traceur/SearchProvider.java
index 202d2b0..9586bdb 100644
--- a/src/com/android/traceur/SearchProvider.java
+++ b/src/com/android/traceur/SearchProvider.java
@@ -26,7 +26,6 @@
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
-import android.content.res.Resources;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
diff --git a/src/com/android/traceur/StorageProvider.java b/src/com/android/traceur/StorageProvider.java
index 37cf073..3df07d5 100644
--- a/src/com/android/traceur/StorageProvider.java
+++ b/src/com/android/traceur/StorageProvider.java
@@ -15,7 +15,6 @@
*/
package com.android.traceur;
-import android.annotation.SuppressLint;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
@@ -26,10 +25,8 @@
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.provider.DocumentsContract.Root;
-import android.provider.DocumentsProvider;
import android.provider.Settings;
import android.util.Log;
-import android.webkit.MimeTypeMap;
import com.android.internal.content.FileSystemProvider;
diff --git a/src/com/android/traceur/TraceUtils.java b/src/com/android/traceur/TraceUtils.java
index aaff283..96ad4d3 100644
--- a/src/com/android/traceur/TraceUtils.java
+++ b/src/com/android/traceur/TraceUtils.java
@@ -27,9 +27,6 @@
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@@ -223,7 +220,7 @@
}
/**
- * Streams data from an InputStream to an OutputStream
+ * Redirects an InputStream to logcat.
*/
private static class Logger {
@@ -231,7 +228,6 @@
new Thread(tag) {
@Override
public void run() {
- int read;
String line;
BufferedReader r = new BufferedReader(new InputStreamReader(in));
try {
diff --git a/src/com/android/traceur/UserConsentActivityDialog.java b/src/com/android/traceur/UserConsentActivityDialog.java
index dd2260e..41b68f2 100644
--- a/src/com/android/traceur/UserConsentActivityDialog.java
+++ b/src/com/android/traceur/UserConsentActivityDialog.java
@@ -24,7 +24,6 @@
import android.content.Intent;
import android.content.ActivityNotFoundException;
import android.content.SharedPreferences;
-import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.preference.PreferenceManager;
