diff options
| author | Adam Powell <adamp@google.com> | 2010-10-04 12:15:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-04 12:15:34 -0700 |
| commit | d29e6861717a4e762050eb5a30169729e205d651 (patch) | |
| tree | 6e7d4c3e1c49e1bcb10629064c2eb6fb187fb01c /core/java/android | |
| parent | 4d3baaf5308ddee43c1cd742497a38806cec6320 (diff) | |
| parent | c3808b5dc7d5873d04e8a0a247b179b2757764ba (diff) | |
Merge "Fix bug 3058324" into gingerbread
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index ed15e2530b6a..055ba875f904 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -167,7 +167,10 @@ public class PopupWindow { attrs, com.android.internal.R.styleable.PopupWindow, defStyle, 0); mBackground = a.getDrawable(R.styleable.PopupWindow_popupBackground); - mAnimationStyle = a.getResourceId(R.styleable.PopupWindow_windowAnimationStyle, -1); + + final int animStyle = a.getResourceId(R.styleable.PopupWindow_popupAnimationStyle, -1); + mAnimationStyle = animStyle == com.android.internal.R.style.Animation_PopupWindow ? -1 : + animStyle; // If this is a StateListDrawable, try to find and store the drawable to be // used when the drop-down is placed above its anchor view, and the one to be |