diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-10-03 10:44:19 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2014-10-03 10:44:19 -0700 |
| commit | f614f6fbe3351316af5a6119a866bdf25cb0d7e4 (patch) | |
| tree | 96e5fa761668513461b3984fe61faa8d4d0a9296 /src | |
| parent | bb8cc37eade1b1906e94171476e4a6420ba156d4 (diff) | |
Fix NPE in onListFragmentScrollStateChange
Ensure that view passed into DialerUtils.hideInputMethod is
never null (since mParentLayout refers to the main content view, it
should never be null)
Also rename parentLayout to mParentLayout
Bug: 17797827
Change-Id: I2ac9864138776fcdaea5b7d2df52a82d31911039
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 8c5b9c58e..7071e5137 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -135,7 +135,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private static final int ACTIVITY_REQUEST_CODE_VOICE_SEARCH = 1; - private FrameLayout parentLayout; + private FrameLayout mParentLayout; /** * Fragment containing the dialpad that slides into view @@ -421,8 +421,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mSlideOut.setAnimationListener(mSlideOutListener); - parentLayout = (FrameLayout) findViewById(R.id.dialtacts_mainlayout); - parentLayout.setOnDragListener(new LayoutOnDragListener()); + mParentLayout = (FrameLayout) findViewById(R.id.dialtacts_mainlayout); + mParentLayout.setOnDragListener(new LayoutOnDragListener()); floatingActionButtonContainer.getViewTreeObserver().addOnGlobalLayoutListener( new ViewTreeObserver.OnGlobalLayoutListener() { @Override @@ -433,7 +433,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O return; } observer.removeOnGlobalLayoutListener(this); - int screenWidth = parentLayout.getWidth(); + int screenWidth = mParentLayout.getWidth(); mFloatingActionButtonController.setScreenWidth(screenWidth); updateFloatingActionButtonControllerAlignment(false /* animate */); } @@ -933,7 +933,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O hideDialpadFragment(true, false); } else if (isInSearchUi()) { exitSearchUi(); - DialerUtils.hideInputMethod(parentLayout); + DialerUtils.hideInputMethod(mParentLayout); } else { super.onBackPressed(); } @@ -945,7 +945,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private boolean maybeExitSearchUi() { if (isInSearchUi() && TextUtils.isEmpty(mSearchQuery)) { exitSearchUi(); - DialerUtils.hideInputMethod(parentLayout); + DialerUtils.hideInputMethod(mParentLayout); return true; } return false; @@ -982,7 +982,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O public void onListFragmentScrollStateChange(int scrollState) { if (scrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) { hideDialpadFragment(true, false); - DialerUtils.hideInputMethod(getCurrentFocus()); + DialerUtils.hideInputMethod(mParentLayout); } } |