Some renames

10 files changed, 34 insertions, 34 deletions

diff --git a/res/drawable/holo_selector_nofocusable.xml b/res/drawable/holo_selector_nonfocusable.xml
index e5ea90e4..e5ea90e4 100644
--- a/res/drawable/holo_selector_nofocusable.xml
+++ b/res/drawable/holo_selector_nonfocusable.xml
diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml
index 3625f4d6..5e879afe 100644
--- a/res/layout/bookmarks_item.xml
+++ b/res/layout/bookmarks_item.xml
@@ -28,7 +28,7 @@
     android:paddingLeft="@dimen/extra_margin"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
     android:id="@+id/bookmarks_item_action"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_details_item.xml b/res/layout/navigation_view_details_item.xml
index 74be09fb..6d0e953f 100644
--- a/res/layout/navigation_view_details_item.xml
+++ b/res/layout/navigation_view_details_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -36,7 +36,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_icons_item.xml b/res/layout/navigation_view_icons_item.xml
index bd8da554..1e5bca85 100644
--- a/res/layout/navigation_view_icons_item.xml
+++ b/res/layout/navigation_view_icons_item.xml
@@ -18,7 +18,7 @@
   android:layout_width="@dimen/navigation_grid_width"
   android:layout_height="@dimen/navigation_grid_height" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/navigation_grid_item_width"
     android:layout_height="@dimen/navigation_grid_item_height"
@@ -27,7 +27,7 @@
     android:gravity="center|center_vertical"
     android:src="@drawable/btn_holo_light_check_off_normal" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/navigation_grid_item_width"
     android:layout_height="@dimen/navigation_grid_item_height"
diff --git a/res/layout/navigation_view_simple_item.xml b/res/layout/navigation_view_simple_item.xml
index 564720aa..dc6f9be5 100644
--- a/res/layout/navigation_view_simple_item.xml
+++ b/res/layout/navigation_view_simple_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -54,7 +54,7 @@
       android:textAppearance="@style/primary_text_appearance" />
   </RelativeLayout>
 
-  <com.cyanogenmod.explorer.ui.widgets.NoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/search_item.xml b/res/layout/search_item.xml
index c64ec2a3..6cc645d1 100644
--- a/res/layout/search_item.xml
+++ b/res/layout/search_item.xml
@@ -27,7 +27,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NoFocusableButtonItem
+  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
     android:id="@+id/search_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -61,7 +61,7 @@
       android:layout_marginLeft="@dimen/default_margin"
       android:orientation="horizontal" >
 
-      <com.cyanogenmod.explorer.ui.widgets.RelevanceWidget
+      <com.cyanogenmod.explorer.ui.widgets.RelevanceView
         android:id="@+id/search_item_relevance"
         android:layout_width="@dimen/relevance_item_width"
         android:layout_height="@dimen/relevance_item_height"
diff --git a/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java b/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java
index d19f86c2..fd06688c 100644
--- a/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java
+++ b/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java
@@ -32,7 +32,7 @@ import com.cyanogenmod.explorer.model.FileSystemObject;
 import com.cyanogenmod.explorer.model.Query;
 import com.cyanogenmod.explorer.model.SearchResult;
 import com.cyanogenmod.explorer.ui.IconHolder;
-import com.cyanogenmod.explorer.ui.widgets.RelevanceWidget;
+import com.cyanogenmod.explorer.ui.widgets.RelevanceView;
 import com.cyanogenmod.explorer.util.MimeTypeHelper;
 import com.cyanogenmod.explorer.util.SearchHelper;
 
@@ -74,7 +74,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> implements O
         TextView mTvName;
         TextView mTvParentDir;
         ImageButton mBtMenu;
-        RelevanceWidget mWgRelevance;
+        RelevanceView mWgRelevance;
     }
 
     /**
@@ -222,7 +222,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> implements O
             viewHolder.mTvParentDir = (TextView)v.findViewById(RESOURCE_ITEM_PARENT_DIR);
             viewHolder.mBtMenu = (ImageButton)v.findViewById(RESOURCE_ITEM_MENU);
             viewHolder.mBtMenu.setOnClickListener(this);
-            viewHolder.mWgRelevance = (RelevanceWidget)v.findViewById(RESOURCE_ITEM_RELEVANCE);
+            viewHolder.mWgRelevance = (RelevanceView)v.findViewById(RESOURCE_ITEM_RELEVANCE);
             v.setTag(viewHolder);
         }
 
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/NoFocusableButtonItem.java b/src/com/cyanogenmod/explorer/ui/widgets/NonFocusableButtonItem.java
index eca59b2d..ab91677f 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/NoFocusableButtonItem.java
+++ b/src/com/cyanogenmod/explorer/ui/widgets/NonFocusableButtonItem.java
@@ -24,31 +24,31 @@ import com.cyanogenmod.explorer.R;
 /**
  * A class that represents a button from an action bar that can't gain focus.
  */
-public class NoFocusableButtonItem extends ButtonItem {
+public class NonFocusableButtonItem extends ButtonItem {
 
     /**
-     * Constructor of <code>NoFocusableButtonItem</code>.
+     * Constructor of <code>NonFocusableButtonItem</code>.
      *
      * @param context The current context
      */
-    public NoFocusableButtonItem(Context context) {
+    public NonFocusableButtonItem(Context context) {
         super(context);
         init();
     }
 
     /**
-     * Constructor of <code>NoFocusableButtonItem</code>.
+     * Constructor of <code>NonFocusableButtonItem</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
      */
-    public NoFocusableButtonItem(Context context, AttributeSet attrs) {
+    public NonFocusableButtonItem(Context context, AttributeSet attrs) {
         super(context, attrs);
         init();
     }
 
     /**
-     * Constructor of <code>NoFocusableButtonItem</code>.
+     * Constructor of <code>NonFocusableButtonItem</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
@@ -57,7 +57,7 @@ public class NoFocusableButtonItem extends ButtonItem {
      *        either be an attribute resource, whose value will be retrieved
      *        from the current theme, or an explicit style resource.
      */
-    public NoFocusableButtonItem(Context context, AttributeSet attrs, int defStyle) {
+    public NonFocusableButtonItem(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         init();
     }
@@ -67,7 +67,7 @@ public class NoFocusableButtonItem extends ButtonItem {
      */
     private void init() {
         //Remove focus
-        setBackgroundResource(R.drawable.holo_selector_nofocusable);
+        setBackgroundResource(R.drawable.holo_selector_nonfocusable);
         setFocusable(false);
         setFocusableInTouchMode(false);
     }
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/RelevanceWidget.java b/src/com/cyanogenmod/explorer/ui/widgets/RelevanceView.java
index dcb108a0..89cb9a10 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/RelevanceWidget.java
+++ b/src/com/cyanogenmod/explorer/ui/widgets/RelevanceView.java
@@ -33,7 +33,7 @@ import java.util.TreeMap;
 /**
  * A widget for display a relevance widget.
  */
-public class RelevanceWidget extends View {
+public class RelevanceView extends View {
 
     private final Paint mBorderPaint = new Paint();
     private final Paint mRelevancePaint = new Paint();
@@ -42,28 +42,28 @@ public class RelevanceWidget extends View {
     private Map<Integer, Integer> mColors;
 
     /**
-     * Constructor of <code>RelevanceWidget</code>.
+     * Constructor of <code>RelevanceView</code>.
      *
      * @param context The current context
      */
-    public RelevanceWidget(Context context) {
+    public RelevanceView(Context context) {
         super(context);
         init();
     }
 
     /**
-     * Constructor of <code>RelevanceWidget</code>.
+     * Constructor of <code>RelevanceView</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
      */
-    public RelevanceWidget(Context context, AttributeSet attrs) {
+    public RelevanceView(Context context, AttributeSet attrs) {
         super(context, attrs);
         init();
     }
 
     /**
-     * Constructor of <code>RelevanceWidget</code>.
+     * Constructor of <code>RelevanceView</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
@@ -72,7 +72,7 @@ public class RelevanceWidget extends View {
      *        either be an attribute resource, whose value will be retrieved
      *        from the current theme, or an explicit style resource.
      */
-    public RelevanceWidget(Context context, AttributeSet attrs, int defStyle) {
+    public RelevanceView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         init();
     }
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/TransparentNoFocusableButtonItem.java b/src/com/cyanogenmod/explorer/ui/widgets/TransparentNonFocusableButtonItem.java
index 894394c3..bb099d7a 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/TransparentNoFocusableButtonItem.java
+++ b/src/com/cyanogenmod/explorer/ui/widgets/TransparentNonFocusableButtonItem.java
@@ -23,31 +23,31 @@ import android.util.AttributeSet;
  * A class that represents a button from an action bar that can't gain focus
  * without background.
  */
-public class TransparentNoFocusableButtonItem extends NoFocusableButtonItem {
+public class TransparentNonFocusableButtonItem extends NonFocusableButtonItem {
 
     /**
-     * Constructor of <code>TransparentNoFocusableButtonItem</code>.
+     * Constructor of <code>TransparentNonFocusableButtonItem</code>.
      *
      * @param context The current context
      */
-    public TransparentNoFocusableButtonItem(Context context) {
+    public TransparentNonFocusableButtonItem(Context context) {
         super(context);
         init();
     }
 
     /**
-     * Constructor of <code>TransparentNoFocusableButtonItem</code>.
+     * Constructor of <code>TransparentNonFocusableButtonItem</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
      */
-    public TransparentNoFocusableButtonItem(Context context, AttributeSet attrs) {
+    public TransparentNonFocusableButtonItem(Context context, AttributeSet attrs) {
         super(context, attrs);
         init();
     }
 
     /**
-     * Constructor of <code>TransparentNoFocusableButtonItem</code>.
+     * Constructor of <code>TransparentNonFocusableButtonItem</code>.
      *
      * @param context The current context
      * @param attrs The attributes of the XML tag that is inflating the view.
@@ -56,7 +56,7 @@ public class TransparentNoFocusableButtonItem extends NoFocusableButtonItem {
      *        either be an attribute resource, whose value will be retrieved
      *        from the current theme, or an explicit style resource.
      */
-    public TransparentNoFocusableButtonItem(Context context, AttributeSet attrs, int defStyle) {
+    public TransparentNonFocusableButtonItem(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         init();
     }