Fix bug 3167099 and bug 3009490 - GridView choice modes and

getCheckedItemCount after orientation change

Remove the restriction on choice modes for GridView - this is handled
by common code in AbsListView. Persist the checked item count in saved
instance state.

Change-Id: Iebb964bb3c43779c082a458ea3f2754ab694b69d

1 files changed, 0 insertions, 20 deletions

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 936a97d5d60f..b963536076e3 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -107,26 +107,6 @@ public class GridView extends AbsListView {
         a.recycle();
     }
 
-    /**
-     * Set how the user may select items from the grid.
-     *
-     * <p>GridView only supports {@link AbsListView#CHOICE_MODE_NONE} and
-     * {@link AbsListView#CHOICE_MODE_MULTIPLE_MODAL}. Attempting to set an unsupported choice
-     * mode will throw an UnsupportedOperationException.
-     */
-    @Override
-    public void setChoiceMode(int choiceMode) {
-        switch (choiceMode) {
-        case CHOICE_MODE_NONE:
-        case CHOICE_MODE_MULTIPLE_MODAL:
-            super.setChoiceMode(choiceMode);
-            break;
-
-        default:
-            throw new UnsupportedOperationException("Unsupported choice mode " + choiceMode);
-        }
-    }
-
     @Override
     public ListAdapter getAdapter() {
         return mAdapter;