Fix tests am: 59520b028a (ba668a86) · Commits · e / os / android_packages_apps_Settings

tests/robotests/res/xml-mcc998/location_settings.xml

+10 −4

Original line number	Diff line number	Diff line
		@@ -18,14 +18,20 @@
		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="fake_title_key"
		android:title="screen_title"
		settings:controller="com.android.settings.slices.FakePreferenceController">
		android:title="screen_title">

		<Preference
		android:key="key"
		android:key="key1"
		android:title="title"
		android:icon="@drawable/ic_android"
		android:summary="summary"
		android:summary="summary1"
		settings:controller="com.android.settings.core.BadPreferenceController"/>

		<Preference
		android:key="key2"
		android:title="title"
		android:icon="@drawable/ic_android"
		android:summary="summary2"
		settings:controller="com.android.settings.slices.FakePreferenceController"/>

		</PreferenceScreen>
		No newline at end of file

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="fake_title_key"
		android:title="screen_title"
		settings:controller="com.android.settings.slices.FakePreferenceController">
		android:title="screen_title">

		<Preference
		android:key="key"

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ public class BaseSearchIndexProviderTest {
		final List<AbstractPreferenceController> controllers =
		provider.getPreferenceControllers(mContext);

		assertThat(controllers).hasSize(3);
		assertThat(controllers).hasSize(2);
		}

		public static class NotAvailablePreferenceController