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

Fix the animation issue in DashboardSummary

Browse Source 
1. When condition is inserted, only scroll to top when previous
position is at the top.

2. Clean condition status after it is removed. So the next time
you insert a condition view, it will always be collapsed.

Bug: 33839780
Bug: 34115341
Test: make -j40 RunSettingsRoboTests
Change-Id: I7f48524917c3119ec24b2f67ba506f381573a391
This commit is contained in:
jackqdyulei
2017-01-04 17:48:09 -08:00
parent 3d07ce6d46
commit 0bb598c4d0
4 changed files with 98 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
View File

@@ -18,8 +18,11 @@ package com.android.settings.dashboard;
import android.app.Activity;
import android.support.v7.widget.LinearLayoutManager;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.FocusRecyclerView;
import com.android.settingslib.drawer.CategoryKey;
import org.junit.Before;
@@ -32,6 +35,7 @@ import org.robolectric.util.ReflectionHelpers;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -44,6 +48,12 @@ public class DashboardSummaryTest {
private DashboardAdapter mAdapter;
@Mock
private DashboardFeatureProvider mDashboardFeatureProvider;
@Mock
private FocusRecyclerView mDashboard;
@Mock
private LinearLayoutManager mLayoutManager;
@Mock
private ConditionManager mConditionManager;
private DashboardSummary mSummary;
@@ -54,6 +64,9 @@ public class DashboardSummaryTest {
ReflectionHelpers.setField(mSummary, "mAdapter", mAdapter);
ReflectionHelpers.setField(mSummary, "mDashboardFeatureProvider",
mDashboardFeatureProvider);
ReflectionHelpers.setField(mSummary, "mDashboard", mDashboard);
ReflectionHelpers.setField(mSummary, "mLayoutManager", mLayoutManager);
ReflectionHelpers.setField(mSummary, "mConditionManager", mConditionManager);
}
@Test
@@ -63,4 +76,18 @@ public class DashboardSummaryTest {
mSummary.updateCategoryAndSuggestion(null);
verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
}
}
@Test
public void onConditionChanged_PositionAtTop_ScrollToTop() {
when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(1);
mSummary.onConditionsChanged();
verify(mDashboard).scrollToPosition(0);
}
@Test
public void onConditionChanged_PositionNotTop_RemainPosition() {
when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(2);
mSummary.onConditionsChanged();
verify(mDashboard, never()).scrollToPosition(0);
}
}