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 
am: f702e39156

Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
This commit is contained in:
William Luh
2017-06-06 23:57:31 +00:00
committed by android-build-merger
parent 59b4e5b6c4 f702e39156
commit 5a4603f5b3
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.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import com.android.settings.R;
import com.android.settings.trustagent.TrustAgentManager; import com.android.settings.trustagent.TrustAgentManager;
import com.android.settings.trustagent.TrustAgentManagerImpl; import com.android.settings.trustagent.TrustAgentManagerImpl;
import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.DashboardCategory;
@@ -49,8 +50,6 @@ public class SecurityFeatureProviderImpl implements SecurityFeatureProvider {
@VisibleForTesting @VisibleForTesting
static final Drawable DEFAULT_ICON = null; static final Drawable DEFAULT_ICON = null;
@VisibleForTesting
static final String DEFAULT_SUMMARY = " ";
@VisibleForTesting @VisibleForTesting
static Map<String, Pair<String, Integer>> sIconCache = new TreeMap<>(); 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. // from shifting when the final summary is injected.
final String summaryUri = final String summaryUri =
tile.metaData.getString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, null); 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)) { if ((summaryUri != null) && sSummaryCache.containsKey(summaryUri)) {
summary = sSummaryCache.get(summaryUri); summary = sSummaryCache.get(summaryUri);
} }

3
tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
View File

@@ -28,6 +28,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.util.Pair; import android.util.Pair;
import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.R;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.Tile;
@@ -180,7 +181,7 @@ public class SecurityFeatureProviderImplTest {
mImpl.initPreferences(mContext, screen, dashboardCategory); mImpl.initPreferences(mContext, screen, dashboardCategory);
verify(screen.findPreference(MOCK_KEY)).setIcon(SecurityFeatureProviderImpl.DEFAULT_ICON); verify(screen.findPreference(MOCK_KEY)).setIcon(SecurityFeatureProviderImpl.DEFAULT_ICON);
verify(screen.findPreference(MOCK_KEY)) verify(screen.findPreference(MOCK_KEY))
.setSummary(SecurityFeatureProviderImpl.DEFAULT_SUMMARY); .setSummary(mContext.getString(R.string.summary_placeholder));
} }
@Test @Test