X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c1d4106c713f1cedf7829ff92a2196f475145ff8..1fbc44b5743380523af7999c072299aad79fb65b:/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 b2d0c8cf..4326ce27 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -59,8 +59,8 @@ import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.operations.UnshareLinkOperation; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.activity.ShareActivity; import com.owncloud.android.ui.fragment.FileFragment; -import com.owncloud.android.utils.DisplayUtils; /** @@ -104,7 +104,6 @@ public class PreviewImageActivity extends FileActivity implements // ActionBar ActionBar actionBar = getSupportActionBar(); - actionBar.setIcon(DisplayUtils.getSeasonalIconId()); updateActionBarTitleAndHomeButton(null); actionBar.hide(); @@ -133,6 +132,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) { @@ -397,7 +399,19 @@ public class PreviewImageActivity extends FileActivity implements } - + /** + * Shows the share view for sharing {@link OCFile} received as a + * parameter in the second fragment. + * + * @param file {@link OCFile} File to share with + */ + @Override + public void showShareFile(OCFile file) { + Intent intent = new Intent(this, ShareActivity.class); + intent.putExtra(EXTRA_FILE, file); + intent.putExtra(EXTRA_ACCOUNT, getAccount()); + startActivity(intent); + } private void requestForDownload(OCFile file) { if (mDownloaderBinder == null) { Log_OC.d(TAG, "requestForDownload called without binder to download service"); @@ -610,7 +624,7 @@ public class PreviewImageActivity extends FileActivity implements /** * Checks if OS version is Honeycomb one or higher - * + * * @return boolean */ private boolean isHoneycombOrHigher() {