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

Fix build after bad merge resolution

Browse Source 
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
This commit is contained in:
Michael Kolb
2014-04-01 14:38:57 -07:00
parent 9b3b78bdaf
commit 4bb047fa5e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3001,6 +3001,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
} }
if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) { if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) {
requestFeature(FEATURE_CONTENT_TRANSITIONS); requestFeature(FEATURE_CONTENT_TRANSITIONS);
}
if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) { if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {
if (mOutsetBottom == null) mOutsetBottom = new TypedValue(); if (mOutsetBottom == null) mOutsetBottom = new TypedValue();
a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom); a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom);