Eleven: Add the context menu items to the 2nd layer

[android-x86/packages-apps-Eleven.git] / src / com / cyngn / eleven / ui / activities / SearchActivity.java

diff --git a/src/com/cyngn/eleven/ui/activities/SearchActivity.java b/src/com/cyngn/eleven/ui/activities/SearchActivity.java
index 64fb620..42949b4 100644 (file)
--- a/src/com/cyngn/eleven/ui/activities/SearchActivity.java
+++ b/src/com/cyngn/eleven/ui/activities/SearchActivity.java
@@ -72,6 +72,7 @@ import com.cyngn.eleven.widgets.NoResultsContainer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.TreeSet;
 
 import static android.view.View.OnTouchListener;
 import static com.cyngn.eleven.utils.MusicUtils.mService;
@@ -91,11 +92,6 @@ public class SearchActivity extends FragmentActivity implements
     private static int LOADING_DELAY = 500;
 
     /**
-     * Used to keep context menu items from bleeding into other fragments
-     */
-    private static final int GROUP_ID = 5;
-
-    /**
      * Identifier for the search loader
      */
     private static int SEARCH_LOADER = 0;
@@ -230,11 +226,11 @@ public class SearchActivity extends FragmentActivity implements
             }
 
             @Override
-            protected void getAdditionalIds(PopupMenuType type, ArrayList<Integer> list) {
-                super.getAdditionalIds(type, list);
+            protected void updateMenuIds(PopupMenuType type, TreeSet<Integer> set) {
+                super.updateMenuIds(type, set);
 
                 if (mSelectedItem.mType == ResultType.Album) {
-                    list.add(FragmentMenuItems.MORE_BY_ARTIST);
+                    set.add(FragmentMenuItems.MORE_BY_ARTIST);
                 }
             }
 
@@ -242,21 +238,6 @@ public class SearchActivity extends FragmentActivity implements
             protected String getArtistName() {
                 return mSelectedItem.mArtist;
             }
-
-            @Override
-            protected int getGroupId() {
-                return GROUP_ID;
-            }
-
-            @Override
-            protected void onDeleteClicked() {
-                // do nothing
-            }
-
-            @Override
-            protected void setShouldRefresh() {
-                // do nothing
-            }
         };
 
         // Fade it in