Clean up imports.

diff --git a/res/layout/dictionary_manager_activity.xml b/res/layout/dictionary_manager_activity.xml
index 790f7f8a3471f8497592ea0d35582a59e3a135d1..ca1f66f57df35a796d7d19d0d625cf26704738fb 100644 (file)
--- a/res/layout/dictionary_manager_activity.xml
+++ b/res/layout/dictionary_manager_activity.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ListView
         android:id="@id/android:list"

diff --git a/res/layout/dictionary_manager_header_row_downloadable.xml b/res/layout/dictionary_manager_header_row_downloadable.xml
index 6f34c84cc124324301226ad45589c64ed66aba77..56ca56286fab27ad8fd56ff5a15acee9a0327c8a 100644 (file)
--- a/res/layout/dictionary_manager_header_row_downloadable.xml
+++ b/res/layout/dictionary_manager_header_row_downloadable.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/onDeviceHeaderLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/gray"
     android:orientation="horizontal"
-    android:padding="10dip" >
+    android:padding="10dip">
 
     <LinearLayout
         android:id="@+id/downloadableHeaderLayout"

diff --git a/res/layout/dictionary_manager_header_row_on_device.xml b/res/layout/dictionary_manager_header_row_on_device.xml
index eb60d4e6a9f80c1981c544ca37b035f9d05c863d..45776856faa13d17765ab47fd3d62afa9b5ff15a 100644 (file)
--- a/res/layout/dictionary_manager_header_row_on_device.xml
+++ b/res/layout/dictionary_manager_header_row_on_device.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/onDeviceHeaderLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/gray"
     android:orientation="horizontal"
-    android:padding="10dip" >
+    android:padding="10dip">
 
     <TextView
         android:id="@+id/onDeviceTextId"

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 74d170a810228ca0028f524467c4b2fdfdaf21bc..cd238f355eb3a64d04794cc7b24b2f879cb2b4d5 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -28,6 +28,11 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.text.ClipboardManager;
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
@@ -39,6 +44,9 @@ import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -65,21 +73,12 @@ import android.widget.TextView;
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.SearchView.OnQueryTextListener;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.EntrySource;
 import com.hughes.android.dictionary.engine.HtmlEntry;
 import com.hughes.android.dictionary.engine.Index;
 import com.hughes.android.dictionary.engine.Index.IndexEntry;
-import com.hughes.android.dictionary.engine.Language;
 import com.hughes.android.dictionary.engine.Language.LanguageResources;
 import com.hughes.android.dictionary.engine.PairEntry;
 import com.hughes.android.dictionary.engine.PairEntry.Pair;

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index b38e4bbe2117034fde3798a30887a40134451fd0..5d6bab88580743a77a55a907cc8fabd9b92c465e 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -22,17 +22,17 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
 import android.os.Environment;
 import android.preference.PreferenceManager;
+import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView.ScaleType;
 
-import android.support.v4.view.MenuItemCompat;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.Language;

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 3070af161c80f0b3cf623adc8e652a82d0482698..8afe62519b3f9ea4b1217462259200ea4349a27a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -29,11 +29,16 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -45,17 +50,12 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.SearchView.OnQueryTextListener;
-import android.view.Menu;
-import android.widget.ListAdapter;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
 

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index 1a304876e2b003adf5820f1e7093e2503aa7c9fe..913827756891b969852e2685787d8f1809ac31b6 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -16,13 +16,13 @@ package com.hughes.android.dictionary;
 \r
 import android.content.Intent;\r
 import android.os.Bundle;\r
+import android.support.v7.app.ActionBar;\r
+import android.support.v7.app.ActionBarActivity;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.widget.Button;\r
 \r
-import android.support.v7.app.ActionBar;\r
-import android.support.v7.app.ActionBarActivity;\r
 import com.hughes.util.StringUtil;\r
 \r
 public final class HtmlDisplayActivity extends ActionBarActivity {\r

diff --git a/src/com/hughes/android/dictionary/MyWebView.java b/src/com/hughes/android/dictionary/MyWebView.java
index abb7fdc9b6ed37b41673afd7ca9b32772266b5d3..b89cafe4e5816ee115988f93e71791b923446fa1 100644 (file)
--- a/src/com/hughes/android/dictionary/MyWebView.java
+++ b/src/com/hughes/android/dictionary/MyWebView.java
@@ -1,8 +1,6 @@
 
 package com.hughes.android.dictionary;
 
-import com.hughes.util.StringUtil;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -13,6 +11,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import com.hughes.android.dictionary.engine.HtmlEntry;
+import com.hughes.util.StringUtil;
 
 public class MyWebView extends WebView {
 

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index ac41a864afb86e1d25a3f90a73f34e5e37b5995a..c7132e63cffdcdbae878cdedfbee4381ad374635 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -14,13 +14,13 @@
 
 package com.hughes.android.dictionary;
 
-import java.util.List;
-
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.PreferenceManager;
 
+import java.util.List;
+
 public class PreferenceActivity extends android.preference.PreferenceActivity {
 
     static boolean prefsMightHaveChanged = false;

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index ca582073fe3eafe8330ab6f46018d1ca4d20a0a9..ae1f9f8755864a693e9c52b0652e8aa6ba039c26 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -1,7 +1,6 @@
 
 package com.hughes.android.dictionary.engine;
 
-import com.hughes.android.dictionary.C;
 import com.hughes.util.StringUtil;
 import com.hughes.util.raf.RAFListSerializer;
 import com.hughes.util.raf.RAFSerializable;

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 9e729a8655c448241dd53e54164f9a599fc9779a..eaa11b622424a3f26efc5ac2f87f2bd168c1b8c3 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -14,10 +14,8 @@
 \r
 package com.hughes.android.dictionary.engine;\r
 \r
-import com.hughes.android.dictionary.R;\r
 import com.ibm.icu.text.Collator;\r
 \r
-import java.util.ArrayList;\r
 import java.util.LinkedHashMap;\r
 import java.util.Locale;\r
 import java.util.Map;\r