Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (a2aab5f7) · Commits · e / os / android_packages_apps_LineageParts

res/values/arrays.xml

+1 −5

Original line number	Diff line number	Diff line
		@@ -268,18 +268,14 @@

		<string-array name="status_bar_battery_style_entries" translatable="false">
		<item>@string/status_bar_battery_style_icon_portrait</item>
		<item>@string/status_bar_battery_style_icon_landscape</item>
		<item>@string/status_bar_battery_style_circle</item>
		<item>@string/status_bar_battery_style_text</item>
		<item>@string/status_bar_battery_style_hidden</item>
		</string-array>

		<string-array name="status_bar_battery_style_values" translatable="false">
		<item>0</item>
		<item>5</item>
		<item>1</item>
		<item>2</item>
		<item>6</item>
		<item>4</item>
		</string-array>

		<string-array name="status_bar_battery_percentage_entries" translatable="false">

res/values/strings.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -482,10 +482,8 @@
		<string name="status_bar_battery_title">Battery indicator</string>
		<string name="status_bar_battery_style_title">Battery status style</string>
		<string name="status_bar_battery_style_icon_portrait">Icon portrait</string>
		<string name="status_bar_battery_style_icon_landscape">Icon landscape</string>
		<string name="status_bar_battery_style_circle">Circle</string>
		<string name="status_bar_battery_style_text">Text</string>
		<string name="status_bar_battery_style_hidden">Hidden</string>

		<!-- Status bar - Battery percentage -->
		<string name="status_bar_battery_percentage_title">Battery percentage</string>

res/xml/status_bar_settings.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@
		android:defaultValue="2" />
		</PreferenceCategory>

		<!--
		<PreferenceCategory
		android:key="status_bar_battery_key"
		android:title="@string/status_bar_battery_title">

		<lineageos.preference.LineageSystemSettingListPreference
		@@ -94,7 +94,7 @@
		android:dialogTitle="@string/status_bar_battery_style_title"
		android:entries="@array/status_bar_battery_style_entries"
		android:entryValues="@array/status_bar_battery_style_values"
		android:defaultValue="2" />
		android:defaultValue="0" />

		<lineageos.preference.LineageSystemSettingListPreference
		android:key="status_bar_show_battery_percent"
		@@ -106,7 +106,6 @@
		android:defaultValue="0" />

		</PreferenceCategory>
		-->

		<PreferenceCategory
		android:title="@string/status_bar_brightness_category">

src/org/lineageos/lineageparts/statusbar/StatusBarSettings.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import java.util.Set;
		public class StatusBarSettings extends SettingsPreferenceFragment
		implements OnPreferenceChangeListener, Searchable {

		private static final String CATEGORY_BATTERY = "status_bar_battery_key";
		private static final String CATEGORY_CLOCK = "status_bar_clock_key";

		private static final String ICON_BLACKLIST = "icon_blacklist";
		@@ -51,8 +52,8 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
		private static final String STATUS_BAR_QUICK_QS_PULLDOWN = "qs_quick_pulldown";

		private static final int STATUS_BAR_BATTERY_STYLE_HIDDEN = 4;
		private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 6;
		private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 2;

		private static final int PULLDOWN_DIR_NONE = 0;
		private static final int PULLDOWN_DIR_RIGHT = 1;
		private static final int PULLDOWN_DIR_LEFT = 2;
		@@ -65,6 +66,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		private LineageSystemSettingListPreference mStatusBarBattery;
		private LineageSystemSettingListPreference mStatusBarBatteryShowPercent;

		private PreferenceCategory mStatusBarBatteryCategory;
		private PreferenceCategory mStatusBarClockCategory;
		private PreferenceScreen mNetworkTrafficPref;

		@@ -93,14 +95,15 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		mStatusBarClockCategory =
		(PreferenceCategory) getPreferenceScreen().findPreference(CATEGORY_CLOCK);

		/*
		mStatusBarBatteryShowPercent =
		(LineageSystemSettingListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
		mStatusBarBattery =
		(LineageSystemSettingListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
		mStatusBarBattery.setOnPreferenceChangeListener(this);
		enableStatusBarBatteryDependents(mStatusBarBattery.getIntValue(2));
		*/

		mStatusBarBatteryCategory =
		(PreferenceCategory) getPreferenceScreen().findPreference(CATEGORY_BATTERY);

		mQuickPulldown =
		(LineageSystemSettingListPreference) findPreference(STATUS_BAR_QUICK_QS_PULLDOWN);
		@@ -121,6 +124,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		getPreferenceScreen().addPreference(mStatusBarClockCategory);
		}

		if (TextUtils.delimitedStringContains(curIconBlacklist, ',', "battery")) {
		getPreferenceScreen().removePreference(mStatusBarBatteryCategory);
		} else {
		getPreferenceScreen().addPreference(mStatusBarBatteryCategory);
		}

		if (DateFormat.is24HourFormat(getActivity())) {
		mStatusBarAmPm.setEnabled(false);
		mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);
		@@ -162,19 +171,15 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		case STATUS_BAR_CLOCK_STYLE:
		updateNetworkTrafficStatus(value);
		break;
		/*
		case STATUS_BAR_BATTERY_STYLE:
		enableStatusBarBatteryDependents(value);
		break;
		*/
		}
		return true;
		}

		private void enableStatusBarBatteryDependents(int batteryIconStyle) {
		mStatusBarBatteryShowPercent.setEnabled(
		batteryIconStyle != STATUS_BAR_BATTERY_STYLE_HIDDEN
		&& batteryIconStyle != STATUS_BAR_BATTERY_STYLE_TEXT);
		mStatusBarBatteryShowPercent.setEnabled(batteryIconStyle != STATUS_BAR_BATTERY_STYLE_TEXT);
		}

		private void updateQuickPulldownSummary(int value) {