diff options
| author | Adam Powell <adamp@google.com> | 2010-08-11 17:26:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-11 17:26:10 -0700 |
| commit | 943fbb4f4006273ae5983da42143d721ae05dfd4 (patch) | |
| tree | d51436252fab6758c38ac10c1ae2f52c35223df8 /policy | |
| parent | 73b77af86131cd4dad16c32ba1898028ce08da36 (diff) | |
| parent | 6b336f835d637853800b94689375a03f337139a4 (diff) | |
| download | frameworks_base-943fbb4f4006273ae5983da42143d721ae05dfd4.zip frameworks_base-943fbb4f4006273ae5983da42143d721ae05dfd4.tar.gz frameworks_base-943fbb4f4006273ae5983da42143d721ae05dfd4.tar.bz2 | |
Merge "ActionBar overlay mode, height fetching, show/hide"
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 8a6428b..9e4015b 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2247,6 +2247,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { requestFeature(FEATURE_ACTION_BAR); } + if (a.getBoolean(com.android.internal.R.styleable.Window_windowActionBarOverlay, false)) { + requestFeature(FEATURE_ACTION_BAR_OVERLAY); + } + if (a.getBoolean(com.android.internal.R.styleable.Window_windowActionModeOverlay, false)) { requestFeature(FEATURE_ACTION_MODE_OVERLAY); } @@ -2333,7 +2337,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (mIsFloating) { layoutResource = com.android.internal.R.layout.dialog_title; } else if ((features & (1 << FEATURE_ACTION_BAR)) != 0) { - layoutResource = com.android.internal.R.layout.screen_action_bar; + 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; + } } else { layoutResource = com.android.internal.R.layout.screen_title; } |