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

Merge "Fix search highlight issues" into sc-dev am: 03099c04bd am: 66675b3e50

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: I30cd01bcd5bfde167a7a495b89e8293db642cd0a
This commit is contained in:
TreeHugger Robot
2021-05-20 01:50:48 +00:00
committed by Automerger Merge Worker
parent a988c56a25 66675b3e50
commit 06e5421dbe
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ public class HighlightablePreferenceGroupAdapterTest {
assertThat(mAdapter.mFadeInAnimated).isTrue();
assertThat(mViewHolder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(true);
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder.itemView);
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder);
}
@Test
@@ -197,14 +197,14 @@ public class HighlightablePreferenceGroupAdapterTest {
// through animation.
assertThat(mAdapter.mFadeInAnimated).isTrue();
// remove highlight should be requested.
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder.itemView);
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder);
ReflectionHelpers.setField(mAdapter, "mHighlightPosition", 10);
mAdapter.updateBackground(mViewHolder, 10);
// only sets background color once - if it's animation this would be called many times
verify(mViewHolder.itemView).setBackgroundColor(mAdapter.mHighlightColor);
// remove highlight should be requested.
verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder.itemView);
verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder);
}
@Test