diff options
| author | Michael Kolb <kolby@google.com> | 2014-04-01 21:47:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 21:47:55 +0000 |
| commit | dd54a9f8672693a7f01fa70bc4d5687c9c64135c (patch) | |
| tree | 391d2ee47dd7ce2f1560950a8a317649a21b83ef /policy/src/com/android | |
| parent | e51f7ed3d8f3667b0f034f760fa07e4f18c08736 (diff) | |
| parent | 4bb047fa5e6d43a027bfe1dfe23b3541e3910a31 (diff) | |
| download | frameworks_base-dd54a9f8672693a7f01fa70bc4d5687c9c64135c.zip frameworks_base-dd54a9f8672693a7f01fa70bc4d5687c9c64135c.tar.gz frameworks_base-dd54a9f8672693a7f01fa70bc4d5687c9c64135c.tar.bz2 | |
am 4bb047fa: Fix build after bad merge resolution
* commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31':
Fix build after bad merge resolution
Diffstat (limited to 'policy/src/com/android')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index fd0c896..f1db904 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -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); |