diff options
| author | Adam Powell <adamp@google.com> | 2010-08-12 15:08:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-12 15:08:29 -0700 |
| commit | 62f2c1f5d3312e36d43418d72a816a42181aa84c (patch) | |
| tree | b29ec157a90e637f4b82f166a217663f55b5ec3c | |
| parent | c3deee13a2c7666b62952e8583222d780fc61f45 (diff) | |
| parent | b047208b3b3391d5c9b0114b0906341240f48368 (diff) | |
| download | frameworks_base-62f2c1f5d3312e36d43418d72a816a42181aa84c.zip frameworks_base-62f2c1f5d3312e36d43418d72a816a42181aa84c.tar.gz frameworks_base-62f2c1f5d3312e36d43418d72a816a42181aa84c.tar.bz2 | |
Merge "Cleanup on CL 61012"
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 546c0f4..a410fa4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -647,10 +647,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (mActionBar.isOverflowReserved()) { if (!mActionBar.isOverflowMenuShowing()) { final Callback cb = getCallback(); - if (cb != null) { - if (cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { - playSoundEffect = mActionBar.showOverflowMenu(); - } + if (cb != null && + cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { + playSoundEffect = mActionBar.showOverflowMenu(); } } else { playSoundEffect = mActionBar.hideOverflowMenu(); |