Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 134115a5 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

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

Test: manual verification
Change-Id: Icb42ea25b71b3e1d09e91a2fea12a2bc18cfd80a
parent 3b1056d2
Loading
Loading
Loading
Loading
+6 −18
Original line number Diff line number Diff line
@@ -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;