Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60d9dfcb authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 5ff7efa2: Merge "Appease the simians" into jb-dev 

* commit '5ff7efa2':
  Appease the simians
parents 1fb01d9a 5ff7efa2

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+5 −1
Original line number Diff line number Diff line
@@ -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);



            /*