Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (88a8c586) · Commits · e / os / android_packages_apps_LineageParts

res/values/arrays.xml

+1 −18

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2012-2015 The CyanogenMod Project
		2017-2022 The LineageOS Project
		2017-2023 The LineageOS Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -199,12 +199,6 @@
		<item>2</item>
		</string-array>

		<string-array name="status_bar_clock_position_values_rtl" translatable="false">
		<item>2</item>
		<item>1</item>
		<item>0</item>
		</string-array>

		<string-array name="status_bar_clock_position_entries_notch" translatable="false">
		<item>@string/status_bar_clock_position_right</item>
		<item>@string/status_bar_clock_position_left</item>
		@@ -220,11 +214,6 @@
		<item>2</item>
		</string-array>

		<string-array name="status_bar_clock_position_values_notch_rtl" translatable="false">
		<item>2</item>
		<item>0</item>
		</string-array>

		<string-array name="status_bar_am_pm_entries" translatable="false">
		<item>@string/status_bar_am_pm_normal</item>
		<item>@string/status_bar_am_pm_small</item>
		@@ -292,12 +281,6 @@
		<item>2</item>
		</string-array>

		<string-array name="status_bar_quick_qs_pulldown_values_rtl" translatable="false">
		<item>2</item>
		<item>1</item>
		<item>0</item>
		</string-array>

		<!-- Gestures - touchscreen gesture actions -->
		<string-array name="touchscreen_gesture_action_entries">
		<item>@string/touchscreen_gesture_action_do_nothing</item>

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

+15 −10

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014-2015 The CyanogenMod Project
		* 2017-2022 The LineageOS Project
		* 2017-2023 The LineageOS Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -133,20 +133,22 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
		if (disallowCenteredClock) {
		mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch_rtl);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch_rtl);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);
		} else {
		mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_rtl);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_rtl);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values);
		}
		mQuickPulldown.setEntries(R.array.status_bar_quick_qs_pulldown_entries_rtl);
		mQuickPulldown.setEntryValues(R.array.status_bar_quick_qs_pulldown_values_rtl);
		} else if (disallowCenteredClock) {
		} else {
		if (disallowCenteredClock) {
		mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);
		} else {
		mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries);
		mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values);
		}
		mQuickPulldown.setEntries(R.array.status_bar_quick_qs_pulldown_entries);
		}

		// Disable network traffic preferences if clock is centered in the status bar
		updateNetworkTrafficStatus(getClockPosition());
		@@ -186,7 +188,10 @@ public class StatusBarSettings extends SettingsPreferenceFragment
		case PULLDOWN_DIR_RIGHT:
		summary = getResources().getString(
		R.string.status_bar_quick_qs_pulldown_summary,
		getResources().getString(value == PULLDOWN_DIR_LEFT
		getResources().getString(
		(value == PULLDOWN_DIR_LEFT) ^
		(getResources().getConfiguration().getLayoutDirection()
		== View.LAYOUT_DIRECTION_RTL)
		? R.string.status_bar_quick_qs_pulldown_summary_left
		: R.string.status_bar_quick_qs_pulldown_summary_right));
		break;