summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2013-11-29 18:11:11 +0800
committerSteve Kondik <shade@chemlab.org>2013-12-10 10:35:46 -0800
commit892f5b761f00d9600ceb882d8c7e270e0fc4c6f5 (patch)
treee1162dd0ed8ab45eb85571aa6ddc399036a684c4
parent8ef301b55f2a3ac38313e2faea4dd319548b1f46 (diff)
downloadandroid_packages_apps_Gallery2-892f5b761f00d9600ceb882d8c7e270e0fc4c6f5.tar.gz
android_packages_apps_Gallery2-892f5b761f00d9600ceb882d8c7e270e0fc4c6f5.tar.bz2
android_packages_apps_Gallery2-892f5b761f00d9600ceb882d8c7e270e0fc4c6f5.zip
Gallery2: fix FC when try to open video folder as MMS attachment
If there are too many videos in the folder, it will takes some time to check if all the items are videos, then the application may not responding. If it is get content from other apps, it do not display option menu, no need to check all items. CRs-Fixed: 581769 Change-Id: Ie59830c8756e3a2ece7fcaa526d8f09212b20d6f
-rwxr-xr-xsrc/com/android/gallery3d/app/AlbumPage.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 01bf29e51..1d38d9727 100755
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -565,7 +565,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
}
actionBar.setSubtitle(null);
// remove slideshow if all are videos
- if (allVideoFiles() && !mGetContent){
+ if (!mGetContent && allVideoFiles()) {
menu.findItem(R.id.action_slideshow).setVisible(false);
}
return true;
@@ -677,7 +677,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
}
private void updateMenuItem() {
- if (allVideoFiles() && !mGetContent) {
+ if (!mGetContent && allVideoFiles()) {
mActionMenu.findItem(R.id.action_slideshow).setVisible(false);
}
}