From 8531d8795f5e6527b3bc675868992aa503d00cfb Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Mon, 3 May 2021 12:09:54 +0800 Subject: [PATCH] Fix the unaligned title of injected items Remove the summary space holder for the injected items that are not assigned a summary or a summary uri. Test: visual, robotest Fixes: 187006845 Bug: 182357397 Change-Id: I7b3d165f0ffd771dd0110962c9e3159c4977d6e3 --- .../settings/dashboard/DashboardFeatureProviderImpl.java | 2 -- .../settings/dashboard/DashboardFeatureProviderImplTest.java | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index a191e685a65..92f078ec88a 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -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; } diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 1e6bc4114eb..fa1aaa8942e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -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