diff options
author | yanglv <yanglv@codeaurora.org> | 2013-11-14 17:13:08 +0800 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:40:56 +0200 |
commit | 518f760ae7493f09ecab528487c6c81f709dee0a (patch) | |
tree | ccb369257de2c76b86f3062244273fcfa0d9518c | |
parent | e57011d52e5e5bfa9f3b9657b24bcf5e356d8cad (diff) | |
download | android_packages_apps_Gallery2-518f760ae7493f09ecab528487c6c81f709dee0a.tar.gz android_packages_apps_Gallery2-518f760ae7493f09ecab528487c6c81f709dee0a.tar.bz2 android_packages_apps_Gallery2-518f760ae7493f09ecab528487c6c81f709dee0a.zip |
Gallery2: Remove slideshow option if there are only videos
Enter Gallery and open folder whose files are all video, press
menu key should no slideshow option.
Add condition to remove slideshow if the folder are all video
files.
CRs-Fixed: 574984
Change-Id: Ib1603f1609b6490e44039ab64abefb44f14bd477
-rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 0ff76e751..a90f70fe2 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -68,6 +68,7 @@ import com.android.gallery3d.util.Future; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.MediaSetUtils; +import java.util.ArrayList; import java.util.Locale; public class AlbumPage extends ActivityState implements GalleryActionBar.ClusterRunner, @@ -132,6 +133,8 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster private Handler mHandler; private static final int MSG_PICK_PHOTO = 0; + private Menu mActionMenu; + private PhotoFallbackEffect mResumeEffect; private Config.AlbumPage mConfig; @@ -635,6 +638,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster @Override protected boolean onCreateActionBar(Menu menu) { + mActionMenu = menu; //GalleryActionBar actionBar = mActivity.getGalleryActionBar(); MenuInflater inflator = getSupportMenuInflater(); if (mGetContent) { @@ -658,6 +662,26 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } //actionBar.setSubtitle(null); + // remove slideshow if all are videos + if (allVideoFiles() && !mGetContent){ + menu.findItem(R.id.action_slideshow).setVisible(false); + } + return true; + } + + private boolean allVideoFiles() { + if (mMediaSet == null) + return false; + int count = mMediaSet.getMediaItemCount(); + MediaItem item; + for (int i = 0; i < count; i++) { + item = mMediaSet.getMediaItem(i, 1).get(0); + if (item == null) { + continue; + } + if (item.getMimeType().trim().startsWith("image/")) + return false; + } return true; } @@ -774,6 +798,12 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } } + private void updateMenuItem() { + if (allVideoFiles() && !mGetContent) { + mActionMenu.findItem(R.id.action_slideshow).setVisible(false); + } + } + @Override public void onSelectionModeChange(int mode) { switch (mode) { @@ -785,6 +815,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster case SelectionManager.LEAVE_SELECTION_MODE: { mActionModeHandler.finishActionMode(); mRootPane.invalidate(); + updateMenuItem(); break; } case SelectionManager.SELECT_ALL_MODE: { |