diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-02-28 22:39:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-28 22:39:03 +0000 |
| commit | 1010a6ec6717ba75e2ea1dfe2865d453a98dd1b5 (patch) | |
| tree | b1d2b2deae549de57f1a9de87dadbc8aeea52404 /policy | |
| parent | ea48c442be3d5130cfc6ae4198858b1895ebc415 (diff) | |
| parent | d6a3e485b58e23808b44b8f2374e67e891cfae05 (diff) | |
| download | frameworks_base-1010a6ec6717ba75e2ea1dfe2865d453a98dd1b5.zip frameworks_base-1010a6ec6717ba75e2ea1dfe2865d453a98dd1b5.tar.gz frameworks_base-1010a6ec6717ba75e2ea1dfe2865d453a98dd1b5.tar.bz2 | |
am d6a3e485: Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev
* commit 'd6a3e485b58e23808b44b8f2374e67e891cfae05':
Unify normal and overlay action bar layouts.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index e1d9b73..5ad305c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -33,6 +33,7 @@ import com.android.internal.view.menu.MenuPresenter; import com.android.internal.view.menu.MenuView; import com.android.internal.widget.ActionBarContainer; import com.android.internal.widget.ActionBarContextView; +import com.android.internal.widget.ActionBarOverlayLayout; import com.android.internal.widget.ActionBarView; import android.app.KeyguardManager; @@ -2788,11 +2789,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { com.android.internal.R.attr.dialogTitleDecorLayout, res, true); layoutResource = res.resourceId; } else if ((features & (1 << FEATURE_ACTION_BAR)) != 0) { - if ((features & (1 << FEATURE_ACTION_BAR_OVERLAY)) != 0) { - layoutResource = com.android.internal.R.layout.screen_action_bar_overlay; - } else { - layoutResource = com.android.internal.R.layout.screen_action_bar; - } + layoutResource = com.android.internal.R.layout.screen_action_bar; } else { layoutResource = com.android.internal.R.layout.screen_title; } |