fixed bug #1297

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

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index b2d0c8c..3dafb9d 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;

+import android.graphics.drawable.ColorDrawable;

 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;


@@ -40,6 +41,7 @@ import android.view.View;
 import android.view.Window;
 
 import com.ortiz.touch.ExtendedViewPager;
 import android.view.Window;
 
 import com.ortiz.touch.ExtendedViewPager;

+import com.owncloud.android.MainApp;

 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;


@@ -104,7 +106,6 @@ public class PreviewImageActivity extends FileActivity implements
 
         // ActionBar
         ActionBar actionBar = getSupportActionBar();
 
         // ActionBar
         ActionBar actionBar = getSupportActionBar();

-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());

         updateActionBarTitleAndHomeButton(null);
         actionBar.hide();
 
         updateActionBarTitleAndHomeButton(null);
         actionBar.hide();
 


@@ -133,6 +134,9 @@ public class PreviewImageActivity extends FileActivity implements
                 }
             });
 
                 }
             });
 

+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                getWindow().setStatusBarColor(getResources().getColor(R.color.owncloud_blue_dark_transparent));
+            }

         }
             
         if (savedInstanceState != null) {
         }
             
         if (savedInstanceState != null) {


@@ -153,9 +157,8 @@ public class PreviewImageActivity extends FileActivity implements
             parentFolder = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
         }
 
             parentFolder = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
         }
 

-        // TODO Enable when "On Device" is recovered ?

         mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(),
         mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(),

-                parentFolder, getAccount(), getStorageManager()/*, MainApp.getOnlyOnDevice()*/);
+                parentFolder, getAccount(), getStorageManager(), MainApp.getOnlyOnDevice());

 
         mViewPager = (ExtendedViewPager) findViewById(R.id.fragmentPager);
         int position = mHasSavedPosition ? mSavedPosition :
 
         mViewPager = (ExtendedViewPager) findViewById(R.id.fragmentPager);
         int position = mHasSavedPosition ? mSavedPosition :


@@ -610,7 +613,7 @@ public class PreviewImageActivity extends FileActivity implements
 
     /**
      * Checks if OS version is Honeycomb one or higher
 
     /**
      * Checks if OS version is Honeycomb one or higher

-     * 
+     *

      * @return boolean
      */
     private boolean isHoneycombOrHigher() {
      * @return boolean
      */
     private boolean isHoneycombOrHigher() {