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

Commit 17efbe25 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Add config to artificially inflate number of bars" into oc-dr1-dev

am: cfca96d2

Change-Id: Ib95407d2ea4c81e4b0e7284fe96a9dac0bc36897
parents 173dddb9 cfca96d2
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -398,4 +398,8 @@
         it has been expanded to reveal its children. -->
    <bool name="config_showGroupNotificationBgWhenExpanded">false</bool>

    <!-- Whether to artificially interpret all signal strengths as
         one bar higher than they actually are -->
    <bool name="config_inflateSignalStrength">false</bool>

</resources>
+8 −1
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ public class MobileSignalController extends SignalController<
    }

    private int getNumLevels() {
        if (mConfig.inflateSignalStrengths) {
            return SignalStrength.NUM_SIGNAL_STRENGTH_BINS + 1;
        }
        return SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
    }

@@ -243,7 +246,11 @@ public class MobileSignalController extends SignalController<
        if (mCurrentState.iconGroup == TelephonyIcons.CARRIER_NETWORK_CHANGE) {
            return SignalDrawable.getCarrierChangeState(getNumLevels());
        } else if (mCurrentState.connected) {
            return SignalDrawable.getState(mCurrentState.level, getNumLevels(),
            int level = mCurrentState.level;
            if (mConfig.inflateSignalStrengths) {
                level++;
            }
            return SignalDrawable.getState(level, getNumLevels(),
                    mCurrentState.inetCondition == 0);
        } else if (mCurrentState.enabled) {
            return SignalDrawable.getEmptyState(getNumLevels());
+2 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
        boolean show4gForLte = false;
        boolean hideLtePlus = false;
        boolean hspaDataDistinguishable;
        boolean inflateSignalStrengths = false;

        static Config readConfig(Context context) {
            Config config = new Config();
@@ -970,6 +971,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
            config.hspaDataDistinguishable =
                    res.getBoolean(R.bool.config_hspa_data_distinguishable);
            config.hideLtePlus = res.getBoolean(R.bool.config_hideLtePlus);
            config.inflateSignalStrengths = res.getBoolean(R.bool.config_inflateSignalStrength);
            return config;
        }
    }