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

This commit is contained in:
David A. Velasco 2013-04-15 13:48:04 +02:00
parent 7052e3b5b8
commit be51b2c4aa
2 changed files with 0 additions and 7 deletions

View file

@ -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_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>

View file

@ -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.pm.PackageManager.NameNotFoundException;
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;
@ -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.R;
import eu.alefzero.webdav.WebdavClient;
/**
@ -144,8 +140,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
private static final String TAG = "FileDisplayActivity";
private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app};
private OCFile mWaitingToPreview;
private Handler mHandler;