From: tobiasKaminsky Date: Fri, 13 Nov 2015 16:42:02 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta X-Git-Tag: beta-20151122~25 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d67b1990b2e31749eac83c37301847256fd4f6cf?hp=423b208d68690f482c735f16ad73f721506e7c8b Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta --- diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index c19fb4a1..39649ef4 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -323,11 +323,7 @@ public class FileDisplayActivity extends HookActivity startTextPreview(file); } - if (DisplayUtils.isGridView(getFile(), getStorageManager())){ - switchToGridView(); - } else { - switchToListView(); - } + switchLayout(getFile()); } else { Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!"); @@ -340,6 +336,14 @@ public class FileDisplayActivity extends HookActivity } } + private void switchLayout(OCFile file){ + if (DisplayUtils.isGridView(file, getStorageManager())){ + switchToGridView(); + } else { + switchToListView(); + } + } + private Fragment chooseInitialSecondFragment(OCFile file) { Fragment secondFragment = null; if (file != null && !file.isFolder()) { @@ -1304,11 +1308,7 @@ public class FileDisplayActivity extends HookActivity MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view); changeGridIcon(); - if (DisplayUtils.isGridView(directory, getStorageManager())){ - switchToGridView(); - } else { - switchToListView(); - } + switchLayout(directory); } /** diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 543378f5..1362a125 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -217,6 +217,24 @@ public class FileDetailFragment extends FileFragment implements OnClickListener item.setVisible(false); item.setEnabled(false); } + + item = menu.findItem(R.id.action_switch_view); + if (item != null){ + item.setVisible(false); + item.setEnabled(false); + } + + item = menu.findItem(R.id.action_sync_account); + if (item != null) { + item.setVisible(false); + item.setEnabled(false); + } + + item = menu.findItem(R.id.action_sort); + if (item != null) { + item.setVisible(false); + item.setEnabled(false); + } } diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java index a07d3dff..a37a1bb3 100644 --- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java @@ -290,6 +290,18 @@ public class PreviewTextFragment extends FileFragment { item.setVisible(false); item.setEnabled(false); } + + item = menu.findItem(R.id.action_switch_view); + if (item != null){ + item.setVisible(false); + item.setEnabled(false); + } + + item = menu.findItem(R.id.action_sort); + if (item != null) { + item.setVisible(false); + item.setEnabled(false); + } } /**