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

This commit is contained in:
TreeHugger Robot
2017-06-22 17:34:09 +00:00
committed by Android (Google) Code Review
3 changed files with 14 additions and 1 deletions

View File

@@ -398,4 +398,8 @@
it has been expanded to reveal its children. --> it has been expanded to reveal its children. -->
<bool name="config_showGroupNotificationBgWhenExpanded">false</bool> <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> </resources>

View File

@@ -235,6 +235,9 @@ public class MobileSignalController extends SignalController<
} }
private int getNumLevels() { private int getNumLevels() {
if (mConfig.inflateSignalStrengths) {
return SignalStrength.NUM_SIGNAL_STRENGTH_BINS + 1;
}
return SignalStrength.NUM_SIGNAL_STRENGTH_BINS; return SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
} }
@@ -243,7 +246,11 @@ public class MobileSignalController extends SignalController<
if (mCurrentState.iconGroup == TelephonyIcons.CARRIER_NETWORK_CHANGE) { if (mCurrentState.iconGroup == TelephonyIcons.CARRIER_NETWORK_CHANGE) {
return SignalDrawable.getCarrierChangeState(getNumLevels()); return SignalDrawable.getCarrierChangeState(getNumLevels());
} else if (mCurrentState.connected) { } 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); mCurrentState.inetCondition == 0);
} else if (mCurrentState.enabled) { } else if (mCurrentState.enabled) {
return SignalDrawable.getEmptyState(getNumLevels()); return SignalDrawable.getEmptyState(getNumLevels());

View File

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