diff options
| author | Adam Powell <adamp@google.com> | 2010-08-16 15:02:07 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-08-16 17:26:11 -0700 |
| commit | 266b1008cfc570d95d10ce650343765fa6bac7e7 (patch) | |
| tree | 7a19903f9352b37bbc79a6d57cf16b3e70b73cd1 /policy/src | |
| parent | 93af2e48a7af71cee18781b64150abed7b057e2a (diff) | |
| download | frameworks_base-266b1008cfc570d95d10ce650343765fa6bac7e7.zip frameworks_base-266b1008cfc570d95d10ce650343765fa6bac7e7.tar.gz frameworks_base-266b1008cfc570d95d10ce650343765fa6bac7e7.tar.bz2 | |
Fix some ActionBar bugs.
* Fix a bug where the options panel would not open on non-xlarge
screens to show overflow menu items.
* Fix a bug where ActionBarView would try to add a custom nav view
twice.
* Fix a bug where ActionBarView would expand too far in wrap_content mode
Change-Id: I433ea56524aad885d813ae8743fe2fcefa9649fa
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index a410fa4..6be5546 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -643,17 +643,16 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { boolean playSoundEffect = false; final PanelFeatureState st = getPanelState(featureId, true); - if (featureId == FEATURE_OPTIONS_PANEL && mActionBar != null) { - if (mActionBar.isOverflowReserved()) { - if (!mActionBar.isOverflowMenuShowing()) { - final Callback cb = getCallback(); - if (cb != null && - cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { - playSoundEffect = mActionBar.showOverflowMenu(); - } - } else { - playSoundEffect = mActionBar.hideOverflowMenu(); + if (featureId == FEATURE_OPTIONS_PANEL && mActionBar != null && + mActionBar.isOverflowReserved()) { + if (!mActionBar.isOverflowMenuShowing()) { + final Callback cb = getCallback(); + if (cb != null && + cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { + playSoundEffect = mActionBar.showOverflowMenu(); } + } else { + playSoundEffect = mActionBar.hideOverflowMenu(); } } else { if (st.isOpen || st.isHandled) { |