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

Merge "Update SliceView when slice is null" into qt-dev

Browse Source
This commit is contained in:
Lei Yu
2019-05-30 17:38:59 +00:00
committed by Android (Google) Code Review
parent caa3b34243 798b80e5ad
commit f32025a17d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/slices/SlicePreferenceController.java
View File

@@ -40,7 +40,8 @@ public class SlicePreferenceController extends BasePreferenceController implemen
LifecycleObserver, OnStart, OnStop, Observer<Slice> { LifecycleObserver, OnStart, OnStop, Observer<Slice> {
@VisibleForTesting @VisibleForTesting
LiveData<Slice> mLiveData; LiveData<Slice> mLiveData;
private SlicePreference mSlicePreference; @VisibleForTesting
SlicePreference mSlicePreference;
private Uri mUri; private Uri mUri;
public SlicePreferenceController(Context context, String preferenceKey) { public SlicePreferenceController(Context context, String preferenceKey) {
@@ -82,8 +83,6 @@ public class SlicePreferenceController extends BasePreferenceController implemen
@Override @Override
public void onChanged(Slice slice) { public void onChanged(Slice slice) {
if (slice != null) { mSlicePreference.onSliceUpdated(slice);
mSlicePreference.onSliceUpdated(slice);
}
} }
} }

10
tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java
View File

@@ -41,6 +41,8 @@ public class SlicePreferenceControllerTest {
@Mock @Mock
private LiveData<Slice> mLiveData; private LiveData<Slice> mLiveData;
@Mock
private SlicePreference mSlicePreference;
private Context mContext; private Context mContext;
private SlicePreferenceController mController; private SlicePreferenceController mController;
private Uri mUri; private Uri mUri;
@@ -53,6 +55,7 @@ public class SlicePreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mController = new SlicePreferenceController(mContext, KEY); mController = new SlicePreferenceController(mContext, KEY);
mController.mLiveData = mLiveData; mController.mLiveData = mLiveData;
mController.mSlicePreference = mSlicePreference;
mUri = Uri.EMPTY; mUri = Uri.EMPTY;
} }
@@ -78,4 +81,11 @@ public class SlicePreferenceControllerTest {
mController.onStop(); mController.onStop();
verify(mLiveData).removeObserver(mController); verify(mLiveData).removeObserver(mController);
} }
@Test
public void onChanged_nullSlice_updateSlice() {
mController.onChanged(null);
verify(mController.mSlicePreference).onSliceUpdated(null);
}
} }