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

Update summary and title strings for Settings Suggestions

Browse Source 
Setting Suggestion messages have new strings for NDR.

Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes: 30067406
This commit is contained in:
TreeHugger Robot
2016-07-12 21:42:03 +00:00
committed by Matthew Fritze
parent 0fd709bf44 c9ec8c80bc
commit a4e3c14848
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1708,7 +1708,7 @@
<meta-data android:name="com.android.settings.require_feature" <meta-data android:name="com.android.settings.require_feature"
android:value="android.hardware.fingerprint" /> android:value="android.hardware.fingerprint" />
<meta-data android:name="com.android.settings.title" <meta-data android:name="com.android.settings.title"
android:resource="@string/suggested_lock_settings_title" /> android:resource="@string/suggested_fingerprint_lock_settings_title" />
<meta-data android:name="com.android.settings.summary" <meta-data android:name="com.android.settings.summary"
android:resource="@string/suggested_fingerprint_lock_settings_summary" /> android:resource="@string/suggested_fingerprint_lock_settings_summary" />
</activity> </activity>

7
res/values/strings.xml
View File

@@ -988,11 +988,14 @@
<!-- Security Picker --><skip /> <!-- Security Picker --><skip />
<!-- Title for suggested actions for screen lock --> <!-- Title for suggested actions for screen lock -->
<string name="suggested_lock_settings_title">Screen lock</string> <string name="suggested_lock_settings_title">Set screen lock</string>
<!-- Summary for suggested actions for screen lock --> <!-- Summary for suggested actions for screen lock -->
<string name="suggested_lock_settings_summary">Protect your device</string> <string name="suggested_lock_settings_summary">Protect your device</string>
<!-- Title for suggested actions for settings up a fingerprint lock -->
<string name="suggested_fingerprint_lock_settings_title">Use fingerprint</string>
<!-- Summary for suggested actions for settings up a fingerprint lock --> <!-- Summary for suggested actions for settings up a fingerprint lock -->
<string name="suggested_fingerprint_lock_settings_summary">Unlock with your fingerprint</string> <string name="suggested_fingerprint_lock_settings_summary">Unlock with your fingerprint</string>
@@ -7399,7 +7402,7 @@
<string name="suggestion_additional_fingerprints">Add another fingerprint</string> <string name="suggestion_additional_fingerprints">Add another fingerprint</string>
<!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] --> <!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] -->
<string name="suggestion_additional_fingerprints_summary">Unlock with a different fingerprint</string> <string name="suggestion_additional_fingerprints_summary">Unlock with a different finger</string>
<!-- Summary of battery saver when on [CHAR LIMIT=NONE] --> <!-- Summary of battery saver when on [CHAR LIMIT=NONE] -->
<string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string> <string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>

16
src/com/android/settings/dashboard/SuggestionsChecks.java
View File

@@ -21,6 +21,7 @@ import android.app.IWallpaperManagerCallback;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.WallpaperManager; import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
@@ -59,10 +60,11 @@ public class SuggestionsChecks {
} else if (className.equals(WifiCallingSuggestionActivity.class.getName())) { } else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
return isWifiCallingUnavailableOrEnabled(); return isWifiCallingUnavailableOrEnabled();
} else if (className.equals(FingerprintSuggestionActivity.class.getName())) { } else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
return isNotSingleFingerprintEnrolled(); return isNotSingleFingerprintEnrolled() || !isFingerprintEnabled();
} else if (className.equals(ScreenLockSuggestionActivity.class.getName()) } else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
|| className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
return isDeviceSecured(); return isDeviceSecured();
} else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
return isDeviceSecured() || !isFingerprintEnabled();
} }
return false; return false;
} }
@@ -108,6 +110,14 @@ public class SuggestionsChecks {
return false; return false;
} }
private boolean isFingerprintEnabled() {
DevicePolicyManager dpManager =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
final int dpmFlags = dpManager.getKeyguardDisabledFeatures(null, /* admin */
mContext.getUserId());
return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
}
private final IWallpaperManagerCallback mCallback = new IWallpaperManagerCallback.Stub() { private final IWallpaperManagerCallback mCallback = new IWallpaperManagerCallback.Stub() {
@Override @Override
public void onWallpaperChanged() throws RemoteException { public void onWallpaperChanged() throws RemoteException {