From: grecep <grecep@users.noreply.github.com>
Date: Wed, 29 Oct 2014 21:29:38 +0000 (+0100)
Subject: Merge pull request #669 from grecep/master
X-Git-Tag: oc-android-1.7.0_signed~125
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fd7a940deefe91a8e547d99a2054370510b68090?ds=sidebyside;hp=--cc

Merge pull request #669 from grecep/master

Add "select all" option to photo (or other) upload screen
---

fd7a940deefe91a8e547d99a2054370510b68090
diff --cc src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 09185726,9eb5143b..83e7bc07
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@@ -34,9 -34,11 +34,12 @@@ import android.widget.TextView
  
  import com.actionbarsherlock.app.ActionBar;
  import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+ import com.actionbarsherlock.internal.view.menu.ActionMenuItemView;
+ import com.actionbarsherlock.view.Menu;
+ import com.actionbarsherlock.view.MenuInflater;
  import com.actionbarsherlock.view.MenuItem;
  import com.owncloud.android.R;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;