Merge "Fix the unaligned title of injected items" into sc-dev (d32e0cf8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -280,8 +280,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		METHOD_GET_DYNAMIC_SUMMARY);
		refreshSummary(uri, preference);
		return createDynamicDataObserver(METHOD_GET_DYNAMIC_SUMMARY, uri, preference);
		} else {
		preference.setSummary(R.string.summary_placeholder);
		}
		return null;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ public class DashboardFeatureProviderImplTest {
		}

		@Test
		public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() {
		public void bindPreference_noSummary_shouldSetNullSummary() {
		final Preference preference = new Preference(RuntimeEnvironment.application);
		mActivityInfo.metaData.remove(META_DATA_PREFERENCE_SUMMARY);

		@@ -295,8 +295,7 @@ public class DashboardFeatureProviderImplTest {
		MetricsEvent.VIEW_UNKNOWN, preference, tile, null /key /,
		Preference.DEFAULT_ORDER);

		assertThat(preference.getSummary())
		.isEqualTo(RuntimeEnvironment.application.getString(R.string.summary_placeholder));
		assertThat(preference.getSummary()).isNull();
		}

		@Test