Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use updated DeviceConfig API's new getters to simplify invocations."

Browse Source
This commit is contained in:
Stanislav Zholnin
2019-03-25 10:03:55 +00:00
committed by Android (Google) Code Review
parent 9fed029655 134115a5ef
commit 7de5f2a8f4
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java
View File

@@ -118,7 +118,8 @@ public final class SmartReplyConstants {
mRequiresTargetingP = readDeviceConfigBooleanOrDefaultIfEmpty(
SystemUiDeviceConfigFlags.SSIN_REQUIRES_TARGETING_P,
mDefaultRequiresP);
mMaxSqueezeRemeasureAttempts = readDeviceConfigIntegerOrDefaultIfEmpty(
mMaxSqueezeRemeasureAttempts = DeviceConfig.getInt(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.SSIN_MAX_SQUEEZE_REMEASURE_ATTEMPTS,
mDefaultMaxSqueezeRemeasureAttempts);
mEditChoicesBeforeSending = readDeviceConfigBooleanOrDefaultIfEmpty(
@@ -127,10 +128,12 @@ public final class SmartReplyConstants {
mShowInHeadsUp = readDeviceConfigBooleanOrDefaultIfEmpty(
SystemUiDeviceConfigFlags.SSIN_SHOW_IN_HEADS_UP,
mDefaultShowInHeadsUp);
mMinNumSystemGeneratedReplies = readDeviceConfigIntegerOrDefaultIfEmpty(
mMinNumSystemGeneratedReplies = DeviceConfig.getInt(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.SSIN_MIN_NUM_SYSTEM_GENERATED_REPLIES,
mDefaultMinNumSystemGeneratedReplies);
mMaxNumActions = readDeviceConfigIntegerOrDefaultIfEmpty(
mMaxNumActions = DeviceConfig.getInt(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.SSIN_MAX_NUM_ACTIONS,
mDefaultMaxNumActions);
}
@@ -152,21 +155,6 @@ public final class SmartReplyConstants {
return defaultValue;
}
private static int readDeviceConfigIntegerOrDefaultIfEmpty(String propertyName,
int defaultValue) {
String value = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_SYSTEMUI, propertyName);
if (TextUtils.isEmpty(value)) {
return defaultValue;
}
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) {
Log.e(TAG, "Tried to read an integer flag, property name="
+ propertyName + ", value=" + value);
return defaultValue;
}
}
/** Returns whether smart replies in notifications are enabled. */
public boolean isEnabled() {
return mEnabled;