Fixed regression after merge: removed 'about' entry in menu

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index a3b8d5e..a446469 100644 (file)
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -24,7 +24,6 @@
     <item android:id="@+id/action_create_dir"          android:title="@string/actionbar_mkdir"         android:icon="@drawable/ic_action_create_dir"                   android:orderInCategory="2" />
     <item android:id="@+id/action_upload"                      android:title="@string/actionbar_upload"        android:icon="@drawable/ic_action_upload"                               android:orderInCategory="2" />
     <item android:id="@+id/action_settings"            android:title="@string/actionbar_settings"      android:icon="@android:drawable/ic_menu_preferences"    android:orderInCategory="2" />
     <item android:id="@+id/action_create_dir"          android:title="@string/actionbar_mkdir"         android:icon="@drawable/ic_action_create_dir"                   android:orderInCategory="2" />
     <item android:id="@+id/action_upload"                      android:title="@string/actionbar_upload"        android:icon="@drawable/ic_action_upload"                               android:orderInCategory="2" />
     <item android:id="@+id/action_settings"            android:title="@string/actionbar_settings"      android:icon="@android:drawable/ic_menu_preferences"    android:orderInCategory="2" />

-    <item android:id="@+id/action_about_app"           android:title="@string/about_title"             android:icon="@android:drawable/ic_menu_info_details"   android:orderInCategory="2" />

     
     <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
 </menu>
     
     <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
 </menu>

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index d2545c6..77e8cba 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -38,11 +38,8 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;

-import android.content.pm.PackageManager.NameNotFoundException;

 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;

-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;

 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;


@@ -99,7 +96,6 @@ import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 

-import com.owncloud.android.R;

 import eu.alefzero.webdav.WebdavClient;
 
 /**
 import eu.alefzero.webdav.WebdavClient;
 
 /**


@@ -144,8 +140,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     private static final String TAG = "FileDisplayActivity";
 
     
     private static final String TAG = "FileDisplayActivity";
 

-    private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app};
-    

     private OCFile mWaitingToPreview;
     private Handler mHandler;
 
     private OCFile mWaitingToPreview;
     private Handler mHandler;