diff options
| author | Michael Kolb <kolby@google.com> | 2014-04-01 14:38:57 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2014-04-01 14:38:57 -0700 |
| commit | 4bb047fa5e6d43a027bfe1dfe23b3541e3910a31 (patch) | |
| tree | 126f0a2586fd5f97e3305a8837979b930c9a8d76 /policy/src/com/android | |
| parent | 9b3b78bdaf48d8199c42068e0f2a91d4b107b3a5 (diff) | |
| download | frameworks_base-4bb047fa5e6d43a027bfe1dfe23b3541e3910a31.zip frameworks_base-4bb047fa5e6d43a027bfe1dfe23b3541e3910a31.tar.gz frameworks_base-4bb047fa5e6d43a027bfe1dfe23b3541e3910a31.tar.bz2 | |
Fix build after bad merge resolution
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
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); |