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 (from parent 1:
bdd46fd
)
linewrap
author
tobiasKaminsky
<tobias@kaminsky.me>
Wed, 19 Nov 2014 08:19:04 +0000
(09:19 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Wed, 19 Nov 2014 08:19:04 +0000
(09:19 +0100)
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index
c2f70e8
..
9d054bc
100644
(file)
--- a/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@
-527,7
+527,8
@@
public class FileListListAdapter extends BaseAdapter implements ListAdapter {
public int compare(OCFile o1, OCFile o2) {
\r
if (o1.isFolder() && o2.isFolder()) {
\r
Long obj1 = getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1)));
\r
public int compare(OCFile o1, OCFile o2) {
\r
if (o1.isFolder() && o2.isFolder()) {
\r
Long obj1 = getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1)));
\r
- return val * obj1.compareTo(getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2))));
\r
+ return val * obj1.compareTo(getFolderSize(
\r
+ new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2))));
\r
}
\r
else if (o1.isFolder()) {
\r
return -1;
\r
}
\r
else if (o1.isFolder()) {
\r
return -1;
\r
diff --git
a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index
8fcec5c
..
7f4d7d5
100644
(file)
--- a/
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@
-133,7
+133,8
@@
public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.length()));
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.length()));
- view.findViewById(R.id.localFileIndicator).setVisibility(View.INVISIBLE); // not GONE; the alignment changes; ugly way to keep it
+ // not GONE; the alignment changes; ugly way to keep it
+ view.findViewById(R.id.localFileIndicator).setVisibility(View.INVISIBLE);
view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);
view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);
view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
diff --git
a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index
99d90c3
..
b48456f
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@
-151,8
+151,8
@@
implements OnItemClickListener, OnEnforceableRefreshListener {
/**
/**
- * Calculates the position of the item that will be used as a reference to reposition the visible items
in the list when
- * the device is turned to other position.
+ * Calculates the position of the item that will be used as a reference to reposition the visible items
+ *
in the list when
the device is turned to other position.
*
* THe current policy is take as a reference the visible item in the center of the screen.
*
*
* THe current policy is take as a reference the visible item in the center of the screen.
*
@@
-170,7
+170,8
@@
implements OnItemClickListener, OnEnforceableRefreshListener {
/**
* Sets the visible part of the list from the reference position.
*
/**
* Sets the visible part of the list from the reference position.
*
- * @param position Reference position previously returned by {@link LocalFileListFragment#getReferencePosition()}
+ * @param position Reference position previously
+ * returned by {@link LocalFileListFragment#getReferencePosition()}
*/
protected void setReferencePosition(int position) {
if (imageView != null) {
*/
protected void setReferencePosition(int position) {
if (imageView != null) {