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:
689199a
)
wip
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 31 Jul 2015 16:40:49 +0000
(18:40 +0200)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 31 Jul 2015 16:40:49 +0000
(18:40 +0200)
owncloud-android-library
patch
|
blob
|
blame
|
history
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/owncloud-android-library
b/owncloud-android-library
index
f5fbca2
..
02c24c8
160000
(submodule)
--- a/
owncloud-android-library
+++ b/
owncloud-android-library
@@
-1
+1
@@
-Subproject commit
f5fbca24becbb01660abe2a7013c1b536ea8a301
+Subproject commit
02c24c8a3bd87382590ece0e0744ad430718b51a
diff --git
a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index
e3144a4
..
5dc6337
100644
(file)
--- a/
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@
-413,8
+413,8
@@
public class ThumbnailsCacheManager {
Paint p = new Paint();
p.setAlpha(230);
- c.drawBitmap(resizedPlayButton, (float) ((thumbnail.getWidth() / 2)
-
ox),
- (float) ((thumbnail.getHeight() / 2)
+
ym), p);
+ c.drawBitmap(resizedPlayButton, (float) ((thumbnail.getWidth() / 2)
+
ox),
+ (float) ((thumbnail.getHeight() / 2)
-
ym), p);
return resultBitmap;
}
diff --git
a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index
68deb03
..
158d046
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@
-421,7
+421,7
@@
public class OCFileListFragment extends ExtendedListFragment {
foldersCount++;
} else {
filesCount++;
- if (file.isImage()){
+ if (file.isImage()
|| file.isVideo()
){
imagesCount++;
}
}
@@
-437,6
+437,7
@@
public class OCFileListFragment extends ExtendedListFragment {
switchToGridView();
} else {
switchToListView();
+// switchToGridView();
}
}
}