diff options
author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-23 13:14:08 -0700 |
---|---|---|
committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-23 13:36:09 -0700 |
commit | 5f5b6adf23aaf9d39a106a187bb4c1a7f60b03d8 (patch) | |
tree | 138a05d54d84e7f0d0446527ae2e221cec29dbba /src | |
parent | 9bee3a3a41f666d185ee329ddadeae31ad46e9b4 (diff) | |
download | android_packages_apps_Dialer-5f5b6adf23aaf9d39a106a187bb4c1a7f60b03d8.tar.gz android_packages_apps_Dialer-5f5b6adf23aaf9d39a106a187bb4c1a7f60b03d8.tar.bz2 android_packages_apps_Dialer-5f5b6adf23aaf9d39a106a187bb4c1a7f60b03d8.zip |
Overflow popup menu may be null when overflow menu button is not null
When updating options menu, if mOverflowMenuButton was not null, we
skip intialization of mOverflowPopupMenu, causing mOverflowPopupMenu to
stay null. This caused issues on rotation.
Ticket FEIJ-241
Change-Id: I3dc050ffdc3c85e8ccca08ed99943f15ec915856
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 1c8e02761..0b2c901d4 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -806,10 +806,13 @@ public class DialpadFragment extends Fragment if (mOverflowMenuButton == null) { return; } + } + if (mOverflowPopupMenu == null) { mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton); - mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener()); - mOverflowMenuButton.setOnClickListener(this); } + + mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener()); + mOverflowMenuButton.setOnClickListener(this); mOverflowMenuButton.setVisibility(isDigitsEmpty() || (mCurrentCallMethodInfo != null && mCurrentCallMethodInfo.mIsInCallProvider) ? View.INVISIBLE : View.VISIBLE); |