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

Merge changes from topic "fix-expressive-design-preference-group" into main

Browse Source 
* changes:
  [Expressive design] preference group - fix preference highlight
  Fix expressive design preference group
This commit is contained in:
David Liu
2024-11-06 20:47:59 +00:00
committed by Android (Google) Code Review
parent 9d1515e3ca 7e625884e3
commit 7b846bc9ad
3 changed files with 134 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,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);
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder, 10);
}
@Test
@@ -256,14 +256,14 @@ public class HighlightablePreferenceGroupAdapterTest {
// through animation.
assertThat(mAdapter.mFadeInAnimated).isTrue();
// remove highlight should be requested.
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder);
verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder, 10);
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);
verify(mViewHolder.itemView).setBackgroundResource(mAdapter.mHighlightBackgroundRes);
// remove highlight should be requested.
verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder);
verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder, 10);
}
@Test
@@ -273,7 +273,8 @@ public class HighlightablePreferenceGroupAdapterTest {
mAdapter.updateBackground(mViewHolder, 0);
assertThat(mViewHolder.itemView.getBackground()).isNotInstanceOf(ColorDrawable.class);
assertThat(mViewHolder.itemView.getBackground())
.isNotEqualTo(mAdapter.mHighlightBackgroundRes);
assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(false);
}
}