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

Commit 4bb047fa authored by Michael Kolb's avatar Michael Kolb
Browse files

Fix build after bad merge resolution 

Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
parent 9b3b78bd

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);