From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 20 Aug 2015 09:39:54 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~67
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/efce517f5ef69ac5a0d7741cdd38188895b41683?hp=6ce558c0333a4763ae11f57549a0a3925a209cf8

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---

diff --git a/src/com/owncloud/android/ui/dialog/FileActionsDialogFragment.java b/src/com/owncloud/android/ui/dialog/FileActionsDialogFragment.java
index 6a023942..cf75cc22 100644
--- a/src/com/owncloud/android/ui/dialog/FileActionsDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/FileActionsDialogFragment.java
@@ -29,9 +29,9 @@ public class FileActionsDialogFragment extends DialogFragment implements
     private static final String ARG_FILE_POSITION = "FILE_POSITION";
     public static final String FTAG_FILE_ACTIONS = "FILE_ACTIONS_FRAGMENT";
 
-    private List<MenuItemParcelable> menuItems;
+    private List<MenuItemParcelable> mMenuItems;
 
-    private int filePosition;
+    private int mFilePosition;
 
     private ListView mListView;
 
@@ -92,13 +92,13 @@ public class FileActionsDialogFragment extends DialogFragment implements
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        filePosition = getArguments().getInt(ARG_FILE_POSITION);
+        mFilePosition = getArguments().getInt(ARG_FILE_POSITION);
 
         MenuParcelable menu = getArguments().getParcelable(ARG_ITEM_LIST);
-        menuItems = menu.getMenuItems();
+        mMenuItems = menu.getMenuItems();
         List<String> stringList = new ArrayList<String>();
-        for (int i = 0; i < menuItems.size(); i++) {
-            stringList.add(menuItems.get(i).getMenuText());
+        for (int i = 0; i < mMenuItems.size(); i++) {
+            stringList.add(mMenuItems.get(i).getMenuText());
         }
 
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
@@ -115,7 +115,8 @@ public class FileActionsDialogFragment extends DialogFragment implements
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         dismiss();
-        ((FileActionsDialogFragmentListener) getTargetFragment()).onFileActionChosen(menuItems.get(position).getMenuItemId(), filePosition);
+        ((FileActionsDialogFragmentListener) getTargetFragment())
+                .onFileActionChosen(mMenuItems.get(position).getMenuItemId(), mFilePosition);
     }
 
     /**