From 7609565693eeed5cfbdab64eda8d3e451958b37c Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Fri, 29 Nov 2013 18:11:11 +0800 Subject: 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 --- src/com/android/gallery3d/app/AlbumPage.java | 4 ++-- 1 file 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); } } -- cgit v1.2.3