Remove actions menu icon (issue #21)

Remove the action menu icon and the default long-click action setting.
Now, long-click always shows the action menu

8 files changed, 7 insertions, 48 deletions

diff --git a/res/drawable-hdpi/ic_holo_light_contextual_action.png b/res/drawable-hdpi/ic_holo_light_contextual_action.png
deleted file mode 100644
index db1b48b6..00000000
--- a/res/drawable-hdpi/ic_holo_light_contextual_action.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_holo_light_contextual_action.png b/res/drawable-mdpi/ic_holo_light_contextual_action.png
deleted file mode 100644
index 49b1e810..00000000
--- a/res/drawable-mdpi/ic_holo_light_contextual_action.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_holo_light_contextual_action.png b/res/drawable-xhdpi/ic_holo_light_contextual_action.png
deleted file mode 100644
index a64798d0..00000000
--- a/res/drawable-xhdpi/ic_holo_light_contextual_action.png
+++ /dev/null
diff --git a/res/layout/navigation_view_details_item.xml b/res/layout/navigation_view_details_item.xml
index 29975205..ee3f5b86 100644
--- a/res/layout/navigation_view_details_item.xml
+++ b/res/layout/navigation_view_details_item.xml
@@ -37,20 +37,12 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
-    android:id="@+id/navigation_view_item_menu"
-    android:layout_width="@dimen/item_menu_row_button_width"
-    android:layout_height="match_parent"
-    android:layout_alignParentRight="true"
-    android:contentDescription="@null"
-    android:src="@drawable/ic_holo_light_contextual_action" />
-
   <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_toLeftOf="@id/navigation_view_item_menu"
+    android:layout_alignParentRight="true"
     android:layout_toRightOf="@id/navigation_view_item_icon"
-    android:layout_alignWithParentIfMissing="true">
+    android:layout_marginRight="@dimen/extra_margin">
 
     <TextView
       android:id="@+id/navigation_view_item_name"
diff --git a/res/layout/navigation_view_icons_item.xml b/res/layout/navigation_view_icons_item.xml
index 422e4da0..36fdc6f1 100644
--- a/res/layout/navigation_view_icons_item.xml
+++ b/res/layout/navigation_view_icons_item.xml
@@ -36,14 +36,6 @@
     android:gravity="center|center_vertical"
     android:src="@null" />
 
-<!--   <com.cyanogenmod.filemanager.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" -->
-<!--     android:layout_toRightOf="@id/navigation_view_item_icon" -->
-<!--     android:contentDescription="@null" -->
-<!--     android:src="@drawable/ic_holo_light_contextual_action" /> -->
-
   <TextView
     android:id="@+id/navigation_view_item_name"
     android:layout_width="match_parent"
diff --git a/res/layout/navigation_view_simple_item.xml b/res/layout/navigation_view_simple_item.xml
index 79fa5913..db2f98d7 100644
--- a/res/layout/navigation_view_simple_item.xml
+++ b/res/layout/navigation_view_simple_item.xml
@@ -37,21 +37,12 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
-    android:id="@+id/navigation_view_item_menu"
-    android:layout_width="@dimen/item_menu_row_button_width"
-    android:layout_height="match_parent"
-    android:layout_alignParentRight="true"
-    android:contentDescription="@null"
-    android:src="@drawable/ic_holo_light_contextual_action" />
-
   <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_toLeftOf="@id/navigation_view_item_menu"
+    android:layout_alignParentRight="true"
     android:layout_toRightOf="@id/navigation_view_item_icon"
-
-    android:layout_alignWithParentIfMissing="true" >
+    android:layout_marginRight="@dimen/extra_margin" >
 
     <TextView
       android:id="@+id/navigation_view_item_name"
diff --git a/res/layout/search_item.xml b/res/layout/search_item.xml
index 6b6ae5b8..3058858f 100644
--- a/res/layout/search_item.xml
+++ b/res/layout/search_item.xml
@@ -27,19 +27,12 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
-    android:id="@+id/search_item_menu"
-    android:layout_width="@dimen/item_menu_row_button_width"
-    android:layout_height="match_parent"
-    android:layout_alignParentRight="true"
-    android:contentDescription="@null"
-    android:src="@drawable/ic_holo_light_contextual_action" />
-
   <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_toLeftOf="@id/search_item_menu"
-    android:layout_toRightOf="@id/search_item_icon" >
+    android:layout_alignParentRight="true"
+    android:layout_toRightOf="@id/search_item_icon"
+    android:layout_marginRight="@dimen/extra_margin" >
 
     <TextView
       android:id="@+id/search_item_name"
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 615a85a9..4fb84679 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -29,15 +29,6 @@
         android:persistent="true"
         android:defaultValue="false" />
 
-      <!-- Default longclick action -->
-      <ListPreference
-        android:key="cm_filemanager_default_longclick_action"
-        android:title="@string/pref_default_longclick_action"
-        android:entries="@array/default_longclick_action_labels"
-        android:entryValues="@array/default_longclick_action_values"
-        android:defaultValue="0"
-        android:persistent="true" />
-
       <!-- Disk usage warning level -->
       <ListPreference
         android:key="cm_filemanager_disk_usage_warning_level"