projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24ffdc2
)
Add menu restrictions for not showing move option on the Preview and details fragments
author
jabarros
<jabarros@solidgear.es>
Mon, 1 Sep 2014 07:03:15 +0000
(09:03 +0200)
committer
jabarros
<jabarros@solidgear.es>
Mon, 1 Sep 2014 07:03:15 +0000
(09:03 +0200)
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index
b3d8567
..
3506b6b
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@
-191,6
+191,13
@@
public class FileDetailFragment extends FileFragment implements OnClickListener
item.setVisible(false);
item.setEnabled(false);
}
item.setVisible(false);
item.setEnabled(false);
}
+
+ // additional restriction for this fragment
+ item = menu.findItem(R.id.action_move);
+ if (item != null) {
+ item.setVisible(false);
+ item.setEnabled(false);
+ }
}
}
diff --git
a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index
25eaf38
..
fa3352d
100644
(file)
--- a/
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@
-232,6
+232,13
@@
public class PreviewImageFragment extends FileFragment {
item.setVisible(false);
item.setEnabled(false);
}
item.setVisible(false);
item.setEnabled(false);
}
+
+ // additional restriction for this fragment
+ item = menu.findItem(R.id.action_move);
+ if (item != null) {
+ item.setVisible(false);
+ item.setEnabled(false);
+ }
}
}
diff --git
a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index
03cf250
..
e91e64f
100644
(file)
--- a/
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@
-289,6
+289,13
@@
public class PreviewMediaFragment extends FileFragment implements
item.setVisible(false);
item.setEnabled(false);
}
item.setVisible(false);
item.setEnabled(false);
}
+
+ // additional restriction for this fragment
+ item = menu.findItem(R.id.action_move);
+ if (item != null) {
+ item.setVisible(false);
+ item.setEnabled(false);
+ }
}
}