Merge "Send pre-index intent at Settings first started" into tm-qpr-dev am: 5ba309c5ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307417 Change-Id: I849c03cd70a2e5598d6b95cbaf2b4fcae5316831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -43,6 +43,7 @@ import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
|
|||||||
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
|
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
|
||||||
import com.android.settings.core.SubSettingLauncher;
|
import com.android.settings.core.SubSettingLauncher;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.support.SupportPreferenceController;
|
import com.android.settings.support.SupportPreferenceController;
|
||||||
import com.android.settings.widget.HomepagePreference;
|
import com.android.settings.widget.HomepagePreference;
|
||||||
@@ -157,6 +158,8 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
|
|||||||
public void onStart() {
|
public void onStart() {
|
||||||
if (mFirstStarted) {
|
if (mFirstStarted) {
|
||||||
mFirstStarted = false;
|
mFirstStarted = false;
|
||||||
|
FeatureFactory.getFactory(getContext()).getSearchFeatureProvider().sendPreIndexIntent(
|
||||||
|
getContext());
|
||||||
} else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask()
|
} else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask()
|
||||||
&& !SplitController.getInstance().isActivityEmbedded(getActivity())) {
|
&& !SplitController.getInstance().isActivityEmbedded(getActivity())) {
|
||||||
// Set default highlight menu key for 1-pane homepage since it will show the placeholder
|
// Set default highlight menu key for 1-pane homepage since it will show the placeholder
|
||||||
@@ -346,7 +349,9 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
|
|||||||
}
|
}
|
||||||
|
|
||||||
private interface PreferenceJob {
|
private interface PreferenceJob {
|
||||||
default void init() {}
|
default void init() {
|
||||||
|
}
|
||||||
|
|
||||||
void doForEach(Preference preference);
|
void doForEach(Preference preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user