Don't use resource ID in switch
This makes Eclipse unhappy when the code is used
as a library project.
Change-Id: I75949ebd36fabcdc88914150dc3a21aecc3357d8
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index a0b9e6e..fe7525a 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -306,27 +306,27 @@
// Called when the user selects a contextual menu item
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_delete:
- int childCount = mWallpapersView.getChildCount();
- ArrayList<View> viewsToRemove = new ArrayList<View>();
- for (int i = 0; i < childCount; i++) {
- CheckableFrameLayout c =
- (CheckableFrameLayout) mWallpapersView.getChildAt(i);
- if (c.isChecked()) {
- ThumbnailMetaData meta = (ThumbnailMetaData) c.getTag();
- mSavedImages.deleteImage(meta.mSavedWallpaperDbId);
- viewsToRemove.add(c);
- }
+ int itemId = item.getItemId();
+ if (itemId == R.id.menu_delete) {
+ int childCount = mWallpapersView.getChildCount();
+ ArrayList<View> viewsToRemove = new ArrayList<View>();
+ for (int i = 0; i < childCount; i++) {
+ CheckableFrameLayout c =
+ (CheckableFrameLayout) mWallpapersView.getChildAt(i);
+ if (c.isChecked()) {
+ ThumbnailMetaData meta = (ThumbnailMetaData) c.getTag();
+ mSavedImages.deleteImage(meta.mSavedWallpaperDbId);
+ viewsToRemove.add(c);
}
- for (View v : viewsToRemove) {
- mWallpapersView.removeView(v);
- }
- ///xxxxx DESTROYING
- mode.finish(); // Action picked, so close the CAB
- return true;
- default:
- return false;
+ }
+ for (View v : viewsToRemove) {
+ mWallpapersView.removeView(v);
+ }
+ ///xxxxx DESTROYING
+ mode.finish(); // Action picked, so close the CAB
+ return true;
+ } else {
+ return false;
}
}