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

Merge "Ensure search highlight position when scheduled runnable starts"

Browse Source
This commit is contained in:
Treehugger Robot
2022-10-25 07:35:26 +00:00
committed by Gerrit Code Review
parent 8959f0698a bb2fb2ffd6
commit fcd941b4eb
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
View File

@@ -141,6 +141,8 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
return; return;
} }
// Highlight request accepted
mHighlightRequested = true;
// Collapse app bar after 300 milliseconds. // Collapse app bar after 300 milliseconds.
if (appBarLayout != null) { if (appBarLayout != null) {
root.postDelayed(() -> { root.postDelayed(() -> {
@@ -152,17 +154,37 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
recyclerView.setItemAnimator(null); recyclerView.setItemAnimator(null);
// Scroll to correct position after 600 milliseconds. // Scroll to correct position after 600 milliseconds.
root.postDelayed(() -> { root.postDelayed(() -> {
mHighlightRequested = true; if (ensureHighlightPosition()) {
recyclerView.smoothScrollToPosition(position); recyclerView.smoothScrollToPosition(mHighlightPosition);
mHighlightPosition = position; }
}, DELAY_HIGHLIGHT_DURATION_MILLIS); }, DELAY_HIGHLIGHT_DURATION_MILLIS);
// Highlight preference after 900 milliseconds. // Highlight preference after 900 milliseconds.
root.postDelayed(() -> { root.postDelayed(() -> {
notifyItemChanged(position); if (ensureHighlightPosition()) {
notifyItemChanged(mHighlightPosition);
}
}, DELAY_COLLAPSE_DURATION_MILLIS + DELAY_HIGHLIGHT_DURATION_MILLIS); }, DELAY_COLLAPSE_DURATION_MILLIS + DELAY_HIGHLIGHT_DURATION_MILLIS);
} }
/**
* Make sure we highlight the real-wanted position in case of preference position already
* changed when the delay time comes.
*/
private boolean ensureHighlightPosition() {
if (TextUtils.isEmpty(mHighlightKey)) {
return false;
}
final int position = getPreferenceAdapterPosition(mHighlightKey);
final boolean allowHighlight = position >= 0;
if (allowHighlight && mHighlightPosition != position) {
Log.w(TAG, "EnsureHighlight: position has changed since last highlight request");
// Make sure RecyclerView always uses latest correct position to avoid exceptions.
mHighlightPosition = position;
}
return allowHighlight;
}
public boolean isHighlightRequested() { public boolean isHighlightRequested() {
return mHighlightRequested; return mHighlightRequested;
} }

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

@@ -129,7 +129,7 @@ public class HighlightablePreferenceGroupAdapterTest {
} }
@Test @Test
public void adjustInitialExpandedChildCount_hasHightlightKey_shouldExpandAllChildren() { public void adjustInitialExpandedChildCount_hasHighlightKey_shouldExpandAllChildren() {
final Bundle args = new Bundle(); final Bundle args = new Bundle();
when(mFragment.getArguments()).thenReturn(args); when(mFragment.getArguments()).thenReturn(args);
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "testkey"); args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "testkey");
@@ -208,7 +208,7 @@ public class HighlightablePreferenceGroupAdapterTest {
} }
@Test @Test
public void updateBackground_reuseHightlightedRowForNormalRow_shouldResetBackgroundAndTag() { public void updateBackground_reuseHighlightedRowForNormalRow_shouldResetBackgroundAndTag() {
ReflectionHelpers.setField(mAdapter, "mHighlightPosition", 10); ReflectionHelpers.setField(mAdapter, "mHighlightPosition", 10);
mViewHolder.itemView.setTag(R.id.preference_highlighted, true); mViewHolder.itemView.setTag(R.id.preference_highlighted, true);