diff options
| author | Adam Powell <adamp@google.com> | 2012-05-15 14:56:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-15 14:56:21 -0700 |
| commit | 60d9dfcb7e613c5efbb055c2f666400e7cbad3d4 (patch) | |
| tree | 46608e16b2a8160ac6d8e3d7fe1e1d81c72ce719 /policy | |
| parent | 1fb01d9a48dcb1dcdd6a4feca9f51213f50df94f (diff) | |
| parent | 5ff7efa253486b2b482031ab9a3714fc5cc10f7f (diff) | |
| download | frameworks_base-60d9dfcb7e613c5efbb055c2f666400e7cbad3d4.zip frameworks_base-60d9dfcb7e613c5efbb055c2f666400e7cbad3d4.tar.gz frameworks_base-60d9dfcb7e613c5efbb055c2f666400e7cbad3d4.tar.bz2 | |
am 5ff7efa2: Merge "Appease the simians" into jb-dev
* commit '5ff7efa253486b2b482031ab9a3714fc5cc10f7f':
Appease the simians
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index ba5034e..5f5b5e8 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -79,6 +79,7 @@ import android.view.SurfaceHolder; import android.view.View; import android.view.ViewGroup; import android.view.ViewManager; +import android.view.ViewParent; import android.view.ViewStub; import android.view.Window; import android.view.WindowManager; @@ -582,7 +583,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { st.decorView.setWindowBackground(getContext().getResources().getDrawable( backgroundResId)); - + ViewParent shownPanelParent = st.shownPanelView.getParent(); + if (shownPanelParent != null && shownPanelParent instanceof ViewGroup) { + ((ViewGroup) shownPanelParent).removeView(st.shownPanelView); + } st.decorView.addView(st.shownPanelView, lp); /* |