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

Merge "Update security screen summary text when no fingerprint"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-15 00:50:38 +00:00
committed by Android (Google) Code Review
parent 55d2eb6d95 2cab298f13
commit 1f52676019
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/SecuritySettings.java
View File

@@ -1300,8 +1300,13 @@ public class SecuritySettings extends SettingsPreferenceFragment
dashboardFeatureProvider.getTilesForCategory(CategoryKey.CATEGORY_SECURITY);
mSummaryLoader.setSummary(this, getPackageVerifierSummary(dashboardCategory));
} else {
mSummaryLoader.setSummary(this,
mContext.getString(R.string.security_dashboard_summary));
final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(mContext);
if (fpm != null && fpm.isHardwareDetected()) {
mSummaryLoader.setSummary(this,
mContext.getString(R.string.security_dashboard_summary));
} else {
mSummaryLoader.setSummary(this, null);
}
}
}
@@ -1319,8 +1324,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
String summaryUri = tile.metaData.getString(
TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, null);
return TileUtils.getTextFromUri(mContext, summaryUri,
new ArrayMap<String, IContentProvider>(),
TileUtils.META_DATA_PREFERENCE_SUMMARY);
new ArrayMap<>(), TileUtils.META_DATA_PREFERENCE_SUMMARY);
}
return null;
}