Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup on CL 61012"

Browse Source
This commit is contained in:
Adam Powell
2010-08-12 15:08:29 -07:00
committed by Android (Google) Code Review
parent c3deee13a2 b047208b3b
commit 62f2c1f5d3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -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();