Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / FileDownloadFragment.java

diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index 631a836..dd78a03 100644 (file)
--- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -38,6 +38,7 @@ import android.widget.TextView;
 
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;

+import com.owncloud.android.utils.DisplayUtils;

 
 
 /**
 
 
 /**


@@ -133,12 +134,11 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
                 mIgnoreFirstSavedState = false;
             }
         }
                 mIgnoreFirstSavedState = false;
             }
         }

-        
-        View view = null;
-        view = inflater.inflate(R.layout.file_download_fragment, container, false);
-        mView = view;
+
+        mView = inflater.inflate(R.layout.file_download_fragment, container, false);

         
         ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.progressBar);
         
         ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.progressBar);

+        DisplayUtils.colorPreLollipopHorizontalProgressBar(progressBar);

         mProgressListener = new ProgressListener(progressBar);
         
         (mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);
         mProgressListener = new ProgressListener(progressBar);
         
         (mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);


@@ -156,7 +156,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
             setButtonsForTransferring();
         }
         
             setButtonsForTransferring();
         }
         

-        return view;
+        return mView;

     }
     
 
     }