Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a751ca authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Focusing on item highlighted coming from search result" into main

parents f403dc9c ef696934

src/com/android/settings/SettingsPreferenceFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
                mDialogFragment.dismiss();

                mDialogFragment = null;

            }

            getListView().clearOnScrollListeners();

        }

        super.onDetach();

    }

src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java

+25 −6
Original line number Diff line number Diff line
@@ -29,12 +29,14 @@ import android.util.Log; 
import android.util.TypedValue;

import android.view.View;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceGroup;

import androidx.preference.PreferenceGroupAdapter;

import androidx.preference.PreferenceScreen;

import androidx.preference.PreferenceViewHolder;

import androidx.recyclerview.widget.RecyclerView;

import androidx.recyclerview.widget.RecyclerView.ViewHolder;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -159,15 +161,32 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter 
        root.postDelayed(() -> {

            if (ensureHighlightPosition()) {

                recyclerView.smoothScrollToPosition(mHighlightPosition);

                highlightAndFocusTargetItem(recyclerView, mHighlightPosition);

            }

        }, DELAY_HIGHLIGHT_DURATION_MILLIS);

    }



        // Highlight preference after 900 milliseconds.

        root.postDelayed(() -> {

            if (ensureHighlightPosition()) {

    private void highlightAndFocusTargetItem(RecyclerView recyclerView, int highlightPosition) {

        ViewHolder target = recyclerView.findViewHolderForAdapterPosition(highlightPosition);

        if (target != null) { // view already visible

            notifyItemChanged(mHighlightPosition);

            target.itemView.requestFocus();

        } else { // otherwise we're about to scroll to that view (but we might not be scrolling yet)

            recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {

                @Override

                public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {

                    if (newState == RecyclerView.SCROLL_STATE_IDLE) {

                        notifyItemChanged(mHighlightPosition);

                        ViewHolder target = recyclerView

                                .findViewHolderForAdapterPosition(highlightPosition);

                        if (target != null) {

                            target.itemView.requestFocus();

                        }

                        recyclerView.removeOnScrollListener(this);

                    }

                }

            });

        }

        }, DELAY_COLLAPSE_DURATION_MILLIS + DELAY_HIGHLIGHT_DURATION_MILLIS);

    }



    /**