diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-03 18:47:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 18:47:38 +0000 |
commit | bbfd5b3fd86057595b9e314b2f71f1960be88d38 (patch) | |
tree | 52e5a309a3bf1127d7b1b86def973adbe75ae6d1 | |
parent | ec2b8bdde7bc22217d23165117378049ab41247f (diff) | |
parent | f614f6fbe3351316af5a6119a866bdf25cb0d7e4 (diff) |
Merge "Fix NPE in onListFragmentScrollStateChange" into lmp-dev
-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); } } |