Evolver: Option to Display Data Disabled Indicator Icon [2/2]
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Signed-off-by: AnierinB <anierin@evolution-x.org>
This commit is contained in:
@@ -99,6 +99,8 @@
|
||||
<string name="status_bar_icons_category">Icons</string>
|
||||
<string name="status_bar_tuner_title">Status bar tuner</string>
|
||||
<string name="status_bar_tuner_summary">Choose which system icons can be shown</string>
|
||||
<string name="status_bar_data_disabled_icon_title">Data disabled indicator</string>
|
||||
<string name="status_bar_data_disabled_icon_summary">Display an indicator next to signal icon when data is disabled</string>
|
||||
<string name="status_bar_bluetooth_battery_title">Bluetooth battery status</string>
|
||||
<string name="status_bar_bluetooth_battery_summary">Display battery status for the connected Bluetooth device, if available</string>
|
||||
<string name="status_bar_colored_icons_title">Colored icons</string>
|
||||
|
||||
@@ -41,6 +41,13 @@
|
||||
<intent android:action="com.android.settings.action.STATUS_BAR_TUNER" />
|
||||
</Preference>
|
||||
|
||||
<!-- Data disabled icon -->
|
||||
<org.evolution.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="data_disabled_icon"
|
||||
android:title="@string/status_bar_data_disabled_icon_title"
|
||||
android:summary="@string/status_bar_data_disabled_icon_summary"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<!-- Bluetooth battery status -->
|
||||
<org.evolution.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="bluetooth_show_battery"
|
||||
|
||||
@@ -38,6 +38,7 @@ public class StatusBar extends SettingsPreferenceFragment implements
|
||||
private static final String KEY_QUICK_PULLDOWN = "qs_quick_pulldown";
|
||||
|
||||
private static final String KEY_ICONS_CATEGORY = "status_bar_icons_category";
|
||||
private static final String KEY_DATA_DISABLED_ICON = "data_disabled_icon";
|
||||
private static final String KEY_BLUETOOTH_BATTERY_STATUS = "bluetooth_show_battery";
|
||||
|
||||
private static final int PULLDOWN_DIR_NONE = 0;
|
||||
@@ -48,6 +49,7 @@ public class StatusBar extends SettingsPreferenceFragment implements
|
||||
private LineageSystemSettingListPreference mQuickPulldown;
|
||||
|
||||
private PreferenceCategory mIconsCategory;
|
||||
private SystemSettingSwitchPreference mDataDisabledIcon;
|
||||
private SystemSettingSwitchPreference mBluetoothBatteryStatus;
|
||||
|
||||
@Override
|
||||
@@ -66,6 +68,7 @@ public class StatusBar extends SettingsPreferenceFragment implements
|
||||
updateQuickPulldownSummary(mQuickPulldown.getIntValue(0));
|
||||
|
||||
mIconsCategory = (PreferenceCategory) findPreference(KEY_ICONS_CATEGORY);
|
||||
mDataDisabledIcon = (SystemSettingSwitchPreference) findPreference(KEY_DATA_DISABLED_ICON);
|
||||
mBluetoothBatteryStatus = (SystemSettingSwitchPreference) findPreference(KEY_BLUETOOTH_BATTERY_STATUS);
|
||||
|
||||
if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
|
||||
@@ -73,6 +76,10 @@ public class StatusBar extends SettingsPreferenceFragment implements
|
||||
mQuickPulldown.setEntryValues(R.array.status_bar_quick_pull_down_values_rtl);
|
||||
}
|
||||
|
||||
if (!DeviceUtils.deviceSupportsMobileData(context)) {
|
||||
mIconsCategory.removePreference(mDataDisabledIcon);
|
||||
}
|
||||
|
||||
if (!DeviceUtils.deviceSupportsBluetooth(context)) {
|
||||
mIconsCategory.removePreference(mBluetoothBatteryStatus);
|
||||
}
|
||||
@@ -128,6 +135,9 @@ public class StatusBar extends SettingsPreferenceFragment implements
|
||||
List<String> keys = super.getNonIndexableKeys(context);
|
||||
final Resources resources = context.getResources();
|
||||
|
||||
if (!DeviceUtils.deviceSupportsMobileData(context)) {
|
||||
keys.add(KEY_DATA_DISABLED_ICON);
|
||||
}
|
||||
if (!DeviceUtils.deviceSupportsBluetooth(context)) {
|
||||
keys.add(KEY_BLUETOOTH_BATTERY_STATUS);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user