Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: b9bb8e88c6
* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
Stop saving ActionMenuItemView state.
Change-Id: Ic8ee0f6d55cae78dd6da72ea8ea269b1ad735753
diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
index 4738f5e..6989654 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
@@ -22,6 +22,7 @@
import android.content.res.TypedArray;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+import android.os.Parcelable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
@@ -30,7 +31,6 @@
import android.view.accessibility.AccessibilityEvent;
import android.widget.ActionMenuView;
import android.widget.ForwardingListener;
-import android.widget.ListPopupWindow;
import android.widget.TextView;
import android.widget.Toast;
@@ -86,6 +86,7 @@
setOnLongClickListener(this);
mSavedPaddingLeft = -1;
+ setSaveEnabled(false);
}
@Override
@@ -348,6 +349,13 @@
}
}
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ // This might get called with the state of ActionView since it shares the same ID with
+ // ActionMenuItemView. Do not restore this state as ActionMenuItemView never saved it.
+ super.onRestoreInstanceState(null);
+ }
+
public static abstract class PopupCallback {
public abstract ShowableListMenu getPopup();
}