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

Fix search highlight

Browse Source 
- Fragments should not have advanced button when coming from search.

Change-Id: I10a192216b7ff702e73b791acbcc1eb1d71cb407
Fixes: 73348428
Test: robotests
This commit is contained in:
Fan Zhang
2018-02-20 11:25:56 -08:00
parent 6f367a79ce
commit 72456a9ea6
6 changed files with 118 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
View File

@@ -27,12 +27,16 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -55,6 +59,9 @@ public class HighlightablePreferenceGroupAdapterTest {
private View mRoot;
@Mock
private PreferenceCategory mPreferenceCatetory;
@Mock
private SettingsPreferenceFragment mFragment;
private Context mContext;
private HighlightablePreferenceGroupAdapter mAdapter;
private PreferenceViewHolder mViewHolder;
@@ -95,6 +102,57 @@ public class HighlightablePreferenceGroupAdapterTest {
verifyZeroInteractions(mRoot);
}
@Test
public void adjustInitialExpandedChildCount_invalidInput_shouldNotadjust() {
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(null /* host */);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
final Bundle args = new Bundle();
when(mFragment.getArguments()).thenReturn(args);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
final PreferenceScreen screen = mock(PreferenceScreen.class);
when(mFragment.getArguments()).thenReturn(null);
when(mFragment.getPreferenceScreen()).thenReturn(screen);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
verifyZeroInteractions(screen);
}
@Test
public void adjustInitialExpandedChildCount_hasHightlightKey_shouldExpandAllChildren() {
final Bundle args = new Bundle();
when(mFragment.getArguments()).thenReturn(args);
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "testkey");
final PreferenceScreen screen = mock(PreferenceScreen.class);
when(mFragment.getPreferenceScreen()).thenReturn(screen);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
verify(screen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
}
@Test
public void adjustInitialExpandedChildCount_noKeyOrChildCountOverride_shouldDoNothing() {
final Bundle args = new Bundle();
when(mFragment.getArguments()).thenReturn(args);
when(mFragment.getInitialExpandedChildCount()).thenReturn(-1);
final PreferenceScreen screen = mock(PreferenceScreen.class);
when(mFragment.getPreferenceScreen()).thenReturn(screen);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
verify(mFragment).getInitialExpandedChildCount();
verifyZeroInteractions(screen);
}
@Test
public void adjustInitialExpandedChildCount_hasCountOverride_shouldDoNothing() {
when(mFragment.getInitialExpandedChildCount()).thenReturn(10);
final PreferenceScreen screen = mock(PreferenceScreen.class);
when(mFragment.getPreferenceScreen()).thenReturn(screen);
HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
verify(mFragment).getInitialExpandedChildCount();
verify(screen).setInitialExpandedChildrenCount(10);
}
@Test
public void updateBackground_notHighlightedRow_shouldNotSetHighlightedTag() {
ReflectionHelpers.setField(mAdapter, "mHighlightPosition", 10);