PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-06 23:52:47 +00:00
committed by Android (Google) Code Review
parent 9fa5e66a66 5264b00d13
commit f702e39156
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/security/SecurityFeatureProviderImpl.java
View File

@@ -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<String, Pair<String, Integer>> 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);
}