summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2013-11-29 18:11:11 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:19 -0700
commit7609565693eeed5cfbdab64eda8d3e451958b37c (patch)
tree9b04eaeb9f2ecfbaac50586439bb6fee402bd1a3
parent6eb045a6fc562a345d4f553ef065e4bf412cf4f6 (diff)
downloadandroid_packages_apps_Gallery2-7609565693eeed5cfbdab64eda8d3e451958b37c.tar.gz
android_packages_apps_Gallery2-7609565693eeed5cfbdab64eda8d3e451958b37c.tar.bz2
android_packages_apps_Gallery2-7609565693eeed5cfbdab64eda8d3e451958b37c.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 dab447337..e5244716b 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;
@@ -682,7 +682,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);
}
}