PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev

Browse Source
This commit is contained in:
Doris Ling
2017-07-28 17:03:49 +00:00
committed by Android (Google) Code Review
parent 129ed98650 d53a3128e8
commit 51fb9ad956
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/widget/ActionBarShadowController.java
View File

@@ -121,7 +121,7 @@ public class ActionBarShadowController implements LifecycleObserver, OnStart, On
final boolean shouldShowShadow = view.canScrollVertically(-1); final boolean shouldShowShadow = view.canScrollVertically(-1);
if (mAnchorView != null) { if (mAnchorView != null) {
mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW); mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
} else { } else if (mActivity != null) { // activity can become null when running monkey
final ActionBar actionBar = mActivity.getActionBar(); final ActionBar actionBar = mActivity.getActionBar();
if (actionBar != null) { if (actionBar != null) {
actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW); actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);

11
tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
View File

@@ -104,4 +104,15 @@ public class ActionBarShadowControllerTest {
verify(mRecyclerView, times(2)).addOnScrollListener(any()); verify(mRecyclerView, times(2)).addOnScrollListener(any());
} }
@Test
public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
final Activity activity = null;
final ActionBarShadowController controller =
ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
// Scroll
controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
// no crash
}
} }