diff --git a/src/com/android/settings/security/SecurityFeatureProviderImpl.java b/src/com/android/settings/security/SecurityFeatureProviderImpl.java index 5a2ff2e2581..8c6d3437d7d 100644 --- a/src/com/android/settings/security/SecurityFeatureProviderImpl.java +++ b/src/com/android/settings/security/SecurityFeatureProviderImpl.java @@ -24,6 +24,7 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; +import com.android.settings.R; import com.android.settings.trustagent.TrustAgentManager; import com.android.settings.trustagent.TrustAgentManagerImpl; import com.android.settingslib.drawer.DashboardCategory; @@ -49,8 +50,6 @@ public class SecurityFeatureProviderImpl implements SecurityFeatureProvider { @VisibleForTesting static final Drawable DEFAULT_ICON = null; - @VisibleForTesting - static final String DEFAULT_SUMMARY = " "; @VisibleForTesting static Map> sIconCache = new TreeMap<>(); @@ -118,7 +117,7 @@ public class SecurityFeatureProviderImpl implements SecurityFeatureProvider { // from shifting when the final summary is injected. final String summaryUri = tile.metaData.getString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, null); - String summary = DEFAULT_SUMMARY; + String summary = context.getString(R.string.summary_placeholder); if ((summaryUri != null) && sSummaryCache.containsKey(summaryUri)) { summary = sSummaryCache.get(summaryUri); } diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java index 77f5ecc2ea2..9cc33a36d65 100644 --- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java @@ -28,6 +28,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Pair; import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.R; import com.android.settings.TestConfig; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -180,7 +181,7 @@ public class SecurityFeatureProviderImplTest { mImpl.initPreferences(mContext, screen, dashboardCategory); verify(screen.findPreference(MOCK_KEY)).setIcon(SecurityFeatureProviderImpl.DEFAULT_ICON); verify(screen.findPreference(MOCK_KEY)) - .setSummary(SecurityFeatureProviderImpl.DEFAULT_SUMMARY); + .setSummary(mContext.getString(R.string.summary_placeholder)); } @Test