Merge "Send pre-index intent when developer options changed" into tm-qpr-dev am: 18dd9b2307

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307418

Change-Id: I2fbed4ebb333ef8a489dadc24147367754d50384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stanley Wang
2022-10-28 11:19:08 +00:00
committed by Automerger Merge Worker
2 changed files with 9 additions and 4 deletions

View File

@@ -60,6 +60,7 @@ import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferen
import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController; import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;
import com.android.settings.development.qstile.DevelopmentTiles; import com.android.settings.development.qstile.DevelopmentTiles;
import com.android.settings.development.storage.SharedDataPreferenceController; import com.android.settings.development.storage.SharedDataPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.actionbar.SearchMenuController; import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settings.widget.SettingsMainSwitchBar;
@@ -308,6 +309,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
DisableDevSettingsDialogFragment.show(this /* host */); DisableDevSettingsDialogFragment.show(this /* host */);
} }
} }
FeatureFactory.getFactory(
getContext()).getSearchFeatureProvider().sendPreIndexIntent(getContext());
} }
} }
@@ -369,12 +372,12 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
final BluetoothLeAudioHwOffloadPreferenceController leAudioController = final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
getDevelopmentOptionsController( getDevelopmentOptionsController(
BluetoothLeAudioHwOffloadPreferenceController.class); BluetoothLeAudioHwOffloadPreferenceController.class);
leAudioController.onRebootDialogConfirmed(); leAudioController.onRebootDialogConfirmed();
final BluetoothLeAudioPreferenceController leAudioFeatureController = final BluetoothLeAudioPreferenceController leAudioFeatureController =
getDevelopmentOptionsController( getDevelopmentOptionsController(
BluetoothLeAudioPreferenceController.class); BluetoothLeAudioPreferenceController.class);
leAudioFeatureController.onRebootDialogConfirmed(); leAudioFeatureController.onRebootDialogConfirmed();
} }
@@ -386,12 +389,12 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
final BluetoothLeAudioHwOffloadPreferenceController leAudioController = final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
getDevelopmentOptionsController( getDevelopmentOptionsController(
BluetoothLeAudioHwOffloadPreferenceController.class); BluetoothLeAudioHwOffloadPreferenceController.class);
leAudioController.onRebootDialogCanceled(); leAudioController.onRebootDialogCanceled();
final BluetoothLeAudioPreferenceController leAudioFeatureController = final BluetoothLeAudioPreferenceController leAudioFeatureController =
getDevelopmentOptionsController( getDevelopmentOptionsController(
BluetoothLeAudioPreferenceController.class); BluetoothLeAudioPreferenceController.class);
leAudioFeatureController.onRebootDialogCanceled(); leAudioFeatureController.onRebootDialogCanceled();
} }

View File

@@ -240,6 +240,8 @@ public class BuildNumberPreferenceController extends BasePreferenceController im
mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on, mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on,
Toast.LENGTH_LONG); Toast.LENGTH_LONG);
mDevHitToast.show(); mDevHitToast.show();
FeatureFactory.getFactory(mContext).getSearchFeatureProvider().sendPreIndexIntent(mContext);
} }
@VisibleForTesting @VisibleForTesting