changes according to CR

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -78,7 +78,8 @@ public class ExtendedListFragment extends Fragment
 
     private ScaleGestureDetector SGD = null;
 
-    protected SwipeRefreshLayout mRefreshListLayout;
+    private ScaleGestureDetector mScaleGestureDetector = null;
+    private SwipeRefreshLayout mRefreshListLayout;
     private SwipeRefreshLayout mRefreshGridLayout;
     protected SwipeRefreshLayout mRefreshEmptyLayout;
     protected LinearLayout mEmptyListContainer;
@@ -108,7 +109,7 @@ public class ExtendedListFragment extends Fragment
 
     private FilterableListAdapter mAdapter;
 
-p   private float scale = -1f;
+    private float mScale = -1f;
 
     protected void setListAdapter(FilterableListAdapter listAdapter) {
         mAdapter = listAdapter;
@@ -196,18 +197,13 @@ p   private float scale = -1f;
 
         mGridFooterView = inflater.inflate(R.layout.list_footer, null, false);
 
-        SGD = new ScaleGestureDetector(MainApp.getAppContext(),new ScaleListener());
+        mScaleGestureDetector = new ScaleGestureDetector(MainApp.getAppContext(),new ScaleListener());
 //        gestureDetector = new GestureDetector(MainApp.getAppContext(), new SingleTapConfirm());
 
         mGridView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
-//                if (SGD.onTouchEvent(motionEvent)) {
-//                    return false;
-//                }
-//                return false;
-
-                SGD.onTouchEvent(motionEvent);
+                mScaleGestureDetector.onTouchEvent(motionEvent);
                 return false;
             }
         });
@@ -268,13 +264,13 @@ p   private float scale = -1f;
     private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
         @Override
         public boolean onScale(ScaleGestureDetector detector) {
-            if (scale == -1f){
+            if (mScale == -1f) {
                 mGridView.setNumColumns(GridView.AUTO_FIT);
-                scale = mGridView.getNumColumns();
+                mScale = mGridView.getNumColumns();
             }
-            scale *= 1-(detector.getScaleFactor()- 1);
-            scale = Math.max(2.0f, Math.min(scale, 10.0f));
-            Integer scaleInt = Math.round(scale);
+            mScale *= 1.f - (detector.getScaleFactor() - 1.f);
+            mScale = Math.max(2.0f, Math.min(mScale, 10.0f));
+            Integer scaleInt = Math.round(mScale);
             mGridView.setNumColumns(scaleInt);
             mGridView.invalidateViews();
 
@@ -313,7 +309,7 @@ p   private float scale = -1f;
 
         SharedPreferences appPreferences = PreferenceManager
                 .getDefaultSharedPreferences(MainApp.getAppContext());
-        scale = appPreferences.getFloat(GRID_COLUMNS, -1.0f);
+        mScale = appPreferences.getFloat(GRID_COLUMNS, -1.0f);
     }    
     
     
@@ -329,11 +325,9 @@ p   private float scale = -1f;
         savedInstanceState.putInt(KEY_HEIGHT_CELL, mHeightCell);
         savedInstanceState.putString(KEY_EMPTY_LIST_MESSAGE, getEmptyViewText());
 
-        SharedPreferences appPreferences = PreferenceManager
-                .getDefaultSharedPreferences(MainApp.getAppContext());
-        SharedPreferences.Editor editor = appPreferences.edit();
-        editor.putFloat(GRID_COLUMNS, scale);
-        editor.apply();
+        SharedPreferences.Editor editor = PreferenceManager
+                .getDefaultSharedPreferences(MainApp.getAppContext()).edit();
+        editor.putFloat(GRID_COLUMNS, mScale).apply();
     }
 
     /**