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

Commit dd54a9f8 authored by Michael Kolb's avatar Michael Kolb Committed by Android Git Automerger
Browse files

am 4bb047fa: Fix build after bad merge resolution 

* commit '4bb047fa':
  Fix build after bad merge resolution
parents e51f7ed3 4bb047fa

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

+1 −0
Original line number Diff line number Diff line
@@ -3001,6 +3001,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        }

        if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) {

            requestFeature(FEATURE_CONTENT_TRANSITIONS);

        }

        if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {

            if (mOutsetBottom == null) mOutsetBottom = new TypedValue();

            a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom);