Merge "Add animation to button navigation settings page" into tm-dev am: 77c4aab5d5

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

Change-Id: I70681bf6cca0e8cdf3e4d164b72e6029a19d0d4e
This commit is contained in:
Jernej Virag
2022-03-08 20:09:08 +00:00
committed by Automerger Merge Worker
4 changed files with 21 additions and 17 deletions

View File

@@ -43,19 +43,21 @@ public class ButtonNavigationSettingsFragmentTest {
}
@Test
public void getNonIndexableKeys_twoButtonNavigationAvailable_allKeysIndexable() {
public void getNonIndexableKeys_twoButtonNavigationAvailable_allKeysExceptAnimIndexable() {
addPackageToPackageManager(ApplicationProvider.getApplicationContext(),
NAV_BAR_MODE_2BUTTON_OVERLAY);
assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
ApplicationProvider.getApplicationContext())).isEmpty();
ApplicationProvider.getApplicationContext())).containsExactly(
"gesture_power_menu_video");
}
@Test
public void getNonIndexableKeys_threeButtonNavigationAvailable_allKeysIndexable() {
public void getNonIndexableKeys_threeButtonNavigationAvailable_allKeysExceptAnimIndexable() {
addPackageToPackageManager(ApplicationProvider.getApplicationContext(),
NAV_BAR_MODE_3BUTTON_OVERLAY);
assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
ApplicationProvider.getApplicationContext())).isEmpty();
ApplicationProvider.getApplicationContext())).containsExactly(
"gesture_power_menu_video");
}
private static void addPackageToPackageManager(Context context, String pkg) {