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

Search results always highlight proper results

Browse Source 
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.

This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.

Instead, we calculate index right before we highlight.

Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes: 62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
This commit is contained in:
Matthew Fritze
2017-06-06 17:14:33 -07:00
parent f702e39156
commit 33f3e3f4f7
2 changed files with 96 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -68,7 +68,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private static final String TAG = "SettingsPreference";
private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
@VisibleForTesting
static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
@@ -86,7 +87,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private ContentResolver mContentResolver;
private String mPreferenceKey;
private boolean mPreferenceHighlighted = false;
private RecyclerView.Adapter mCurrentRootAdapter;
private boolean mIsDataSetObserverRegistered = false;
@@ -130,10 +130,14 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private View mEmptyView;
private LinearLayoutManager mLayoutManager;
private HighlightablePreferenceGroupAdapter mAdapter;
private ArrayMap<String, Preference> mPreferenceCache;
private boolean mAnimationAllowed;
@VisibleForTesting
public HighlightablePreferenceGroupAdapter mAdapter;
@VisibleForTesting
public boolean mPreferenceHighlighted = false;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -268,7 +272,12 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public void highlightPreferenceIfNeeded() {
if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
highlightPreference(mPreferenceKey);
getView().postDelayed(new Runnable() {
@Override
public void run() {
highlightPreference(mPreferenceKey);
}
}, DELAY_HIGHLIGHT_DURATION_MILLIS);
}
}
@@ -399,17 +408,13 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private void highlightPreference(String key) {
final int position = canUseListViewForHighLighting(key);
if (position >= 0) {
mPreferenceHighlighted = true;
mLayoutManager.scrollToPosition(position);
getView().postDelayed(new Runnable() {
@Override
public void run() {
mAdapter.highlight(position);
}
}, DELAY_HIGHLIGHT_DURATION_MILLIS);
if (position < 0) {
return;
}
mPreferenceHighlighted = true;
mLayoutManager.scrollToPosition(position);
mAdapter.highlight(position);
}
private int findListPositionFromKey(PreferenceGroupAdapter adapter, String key) {
@@ -765,6 +770,9 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public static class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
@VisibleForTesting(otherwise=VisibleForTesting.NONE)
int initialHighlightedPosition = -1;
private int mHighlightPosition = -1;
public HighlightablePreferenceGroupAdapter(PreferenceGroup preferenceGroup) {
@@ -773,6 +781,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public void highlight(int position) {
mHighlightPosition = position;
initialHighlightedPosition = position;
notifyDataSetChanged();
}