Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Appease the simians" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-05-15 14:54:00 -07:00
committed by Android (Google) Code Review
parent 6387c8a9cb a60314c707
commit 5ff7efa253
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -79,6 +79,7 @@ import android.view.SurfaceHolder;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewManager; import android.view.ViewManager;
import android.view.ViewParent;
import android.view.ViewStub; import android.view.ViewStub;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
@@ -582,7 +583,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
st.decorView.setWindowBackground(getContext().getResources().getDrawable( st.decorView.setWindowBackground(getContext().getResources().getDrawable(
backgroundResId)); backgroundResId));
ViewParent shownPanelParent = st.shownPanelView.getParent();
if (shownPanelParent != null && shownPanelParent instanceof ViewGroup) {
((ViewGroup) shownPanelParent).removeView(st.shownPanelView);
}
st.decorView.addView(st.shownPanelView, lp); st.decorView.addView(st.shownPanelView, lp);
/* /*